From 515ed5dff353a2d23c2970a9d89c700605f69e79 Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gmail.com>
Date: Tue, 12 May 2026 17:44:49 -0400
Subject: [PATCH 01/17] =?UTF-8?q?WIP:=20T-Cluster-F-=CE=B1=20S1=20#81=20pa?=
 =?UTF-8?q?rallelism=20walker=20port=20(src/v3/compiler/src/workfl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/v3-lens-capability-register.md           |   6 +-
 src/v3/compiler/build.rs                      |   1 +
 src/v3/compiler/regen.dag                     |   6 +
 .../lens_register_correspondence_test.rs      |   2 +-
 .../tests/integration/sg0_census_test.rs      |   1 -
 .../sg6_hand_authored_census_test.rs          |   5 +
 src/v3/lenses/parallelism.dag                 | 269 ++++++++++++++++--
 src/v3/std/verification.dag                   |   4 +-
 8 files changed, 269 insertions(+), 25 deletions(-)

diff --git a/docs/v3-lens-capability-register.md b/docs/v3-lens-capability-register.md
index 42ddbe42a7c..1c67635bdf3 100644
--- a/docs/v3-lens-capability-register.md
+++ b/docs/v3-lens-capability-register.md
@@ -42,7 +42,7 @@ A lens is only "done" when **both** axes are at their strongest grade for the sc
 | `cost_target_realization.dag` | TERMINAL | **N/A** | None (v3-native; ε path consumer of `declaration_by_name` substrate accessor introduced by Slice 1a.0 / PR #2194) | Per-category meta-type `Declaration?` resolvers — `type_realization_meta(d)` / `callable_realization_meta(d)` / `operator_realization_meta(d)` / `behavior_realization_meta(d)` / `type_instantiation_realization_meta(d)` / `pattern_realization_meta(d)` (six total, covering all `*Realization` carriers in `src/v3/std/emit_model.dag`) — using `declaration_by_name` for name-keyed lookup. Slice 1a.1 of T-CostLens-Composition follow-on (#2141 ε scope per gunbc#2181 ratification): minimum-viable consumer-proof per INVARIANTS P2 closure of codex BLOCKING surfaced post-merge on Slice 1a.0. Slice 1a.2 adds Rust-side `v3_compiler::realization_cost::RealizationCostTable`, which filters realization declarations by `meta_tag`, requires `ValueBody.Structural.fields`, matches the active `language`, and extracts typed `target` / `op` keys plus `cost: Int`. Generated consumer: `src/v3/compiler/src/lens_cost_target_realization_generated.rs`. | N/A — ε path consumer-evidence-only; not a v2 mirror. ε composition (abstract `SymbolicCost` × per-target realization-cost) deferred to Slice 1a.3+. |
 | `effect_enumeration.dag` | TERMINAL | **PARTIAL** | None (v3-native) | `EffectEnumerationReport { facts, coverage_gaps, redundant_reads, transaction }` derived from the five `Behavior` variants and callable type-signature shape; generated consumer target: `src/v3/compiler/src/lens_effect_enumeration_generated.rs` via `regen_lens` / `emit_rust_module` | Audit verdict is path (ii): live primitives still require ambient resource/transport metadata rather than returned-modified-resource signatures (`dsl/std/resources.dag`, `dsl/std/primitives.dag`, `dsl/extdeps/shell.dag`, `dsl/extdeps/github/auth.dag`). Full `OperationEffect` retirement, resource-threading migration, and caller-side effect-set pinning are follow-up work. |
 | `idempotency.dag` | TERMINAL | **COMPLETE** | None (v3-native) | `WorkflowIdempotencyReport` via `lane2_workflow_at` + `std.effects::lane2_workflow_idempotency_report` | — (behavioral authority for the `WorkflowEffect` walk is `lane2_workflow_idempotency_report` in `src/v3/std/effects.dag`. `workflow_idempotency.rs` is still **parallel staging** for native `Dag` entry — same projection, hand mirror until an explicit dissolution removes it or routes through generated-only code; INVARIANTS P2 cleanup, not “two competing semantics.”) |
-| `parallelism.dag` | PARTIAL | **STUB** | None (v3-native) | Unconditional `report_parallelism_unsupported(LensSurfacePending, …)` | — (real analysis in `src/v3/compiler/src/workflow_parallelism.rs`. **STUB reason:** Stage 2e parallelism walk not yet ported to `.dag` / `lane2_workflow_at` / `std.effects` — the `.dag` stub’s pending reason matches that gap, not the old “cannot emit `match` on imported user sums” era. `emit_rust_module` already lowers that match path; parallelism stays pending until the lens is rewired like `idempotency.dag`.) |
+| `parallelism.dag` | TERMINAL | **COMPLETE** | None (v3-native) | `WorkflowParallelismReport` via `lane2_workflow_at` plus the Stage 2e branch-order flattening / pairwise commutativity walk; generated consumer target: `src/v3/compiler/src/lens_parallelism_generated.rs` via `regen_lens` / `emit_rust_module` | — (behavioral authority ported from retired `src/v3/compiler/src/workflow_parallelism.rs`: `ParallelEffect` roots require linear branches; first breaking operation returns `CompositionVerdict::BrokenBy`; otherwise cross-branch `Read×Read` and same-key `Delete×Delete` commute, while `Upsert×Upsert`, read/write clashes, and unproven disjointness fail closed as `PairwiseNonCommute`.) |
 | `provenance.dag` | TERMINAL | COMPLETE | None (v3-native) | `Origin = NoProducer \| MissingPort \| MissingBehavior \| Source(NodeId) \| Computed(NodeId) \| Selected(NodeId) \| Accumulated(NodeId)` | N/A |
 | `unused_parameters.dag` | TERMINAL | COMPLETE | None (v3-native) | `List<UnusedParameter>` | N/A |
 | `variant_payload.dag` | TERMINAL | COMPLETE | None (v3-native) | `VariantPayloadShapeLookup` | N/A (see `DeclarationLookup` parallel-authority debt — ROADMAP 2026-04-21 wave, line 170 — which is an internal cleanup, not a behavioral gap) |
@@ -53,7 +53,7 @@ A lens is only "done" when **both** axes are at their strongest grade for the sc
 
 ## Common root causes
 
-The former shared complexity/cost behavioral gap is now split: **complexity** is COMPLETE via the `ComplexitySummary` cementing receipt, and **cost** is COMPLETE for the abstract `SymbolicCost` scope via the gate #80 receipt. Remaining T-CostLens target-realization composition (#37/#40/#70) is tracked outside the `cost.dag` row because it composes target-specific realization rows with the abstract-cost lens. The remaining “not done” rows are now distinct: **parallelism** stays **STUB** until the Stage 2e `.dag` surface is wired (see table — distinct from the resolved imported-sum `match` emit lane), and **effect_enumeration** stays **PARTIAL** until the Operation/resource-threading migration retires the ambient-resource gap. **idempotency** is COMPLETE (see table). Keeping this section aligned with the table is part of the register’s P2 single-authority role.
+The former shared complexity/cost behavioral gap is now split: **complexity** is COMPLETE via the `ComplexitySummary` cementing receipt, and **cost** is COMPLETE for the abstract `SymbolicCost` scope via the gate #80 receipt. Remaining T-CostLens target-realization composition (#37/#40/#70) is tracked outside the `cost.dag` row because it composes target-specific realization rows with the abstract-cost lens. The remaining non-complete row is now distinct: **effect_enumeration** stays **PARTIAL** until the Operation/resource-threading migration retires the ambient-resource gap. **idempotency** and **parallelism** are COMPLETE (see table). Keeping this section aligned with the table is part of the register’s P2 single-authority role.
 
 ### Substrate carriers vs per-call producers (complexity, cost)
 
@@ -88,7 +88,7 @@ The v3 `emit_rust_module` path historically failed `match` on some user-defined
 
 `idempotency.dag` was not blocked on this emit gap in practice (it matches `Option` and delegates `WorkflowEffect` work to `std.effects::lane2_workflow_idempotency_report`, which already lowered). The register row is updated to **COMPLETE** on that basis — meaning the **shipped lens + std.effects** path is emit-faithful for the named analysis, not that parallel Rust staging has already been deleted (see table note).
 
-`parallelism.dag` remains a **STUB** until the Stage 2e walk is authored under `std.effects` (or the lens) and the lens stops returning `LensSurfacePending` — **not** because match-on-`WorkflowEffect` cannot emit anymore.
+`parallelism.dag` now exercises this resolved path directly: it matches imported `WorkflowEffect` values, reads `lane2_workflow_at`, and emits the generated Stage 2e consumer without a Rust oracle.
 
 This is the same class of gap recorded in `ROADMAP.md` under the 2026-04-21 receipt-closure wave ("emit_rust_module gap: SurfaceLiteral → LiteralBits rename", "emit_rust_module gap: render_variant_constructor fails on external tuple variants"). Those are different emit gaps; the user-sum-match gap belonged alongside them and is now closed for the imported-sum / specialized-disj case above.
 
diff --git a/src/v3/compiler/build.rs b/src/v3/compiler/build.rs
index 6957b9e1438..5610b5fe813 100644
--- a/src/v3/compiler/build.rs
+++ b/src/v3/compiler/build.rs
@@ -500,6 +500,7 @@ fn main() {
         "src/v3/compiler/src/lens_cost_symbolic_generated.rs",
         "src/v3/compiler/src/lens_cost_target_realization_generated.rs",
         "src/v3/compiler/src/lens_effect_enumeration_generated.rs",
+        "src/v3/compiler/src/lens_parallelism_generated.rs",
         "src/v3/compiler/src/lens_provenance_generated.rs",
         "src/v3/compiler/src/lens_structural_resolution_generated.rs",
         "src/v3/compiler/src/lens_unused_parameters_generated.rs",
diff --git a/src/v3/compiler/regen.dag b/src/v3/compiler/regen.dag
index b837a066098..d7c08d73c11 100644
--- a/src/v3/compiler/regen.dag
+++ b/src/v3/compiler/regen.dag
@@ -66,6 +66,12 @@ data lens_effect_enumeration_entry: LensRegistryEntry = {
   generated_file: "src/v3/compiler/src/lens_effect_enumeration_generated.rs"
 }
 
+data lens_parallelism_entry: LensRegistryEntry = {
+  name: "parallelism"
+  lens_file: "src/v3/lenses/parallelism.dag"
+  generated_file: "src/v3/compiler/src/lens_parallelism_generated.rs"
+}
+
 data lens_provenance_entry: LensRegistryEntry = {
   name: "provenance"
   lens_file: "src/v3/lenses/provenance.dag"
diff --git a/src/v3/compiler/tests/integration/lens_register_correspondence_test.rs b/src/v3/compiler/tests/integration/lens_register_correspondence_test.rs
index 6b7d2c04b31..84689667c62 100644
--- a/src/v3/compiler/tests/integration/lens_register_correspondence_test.rs
+++ b/src/v3/compiler/tests/integration/lens_register_correspondence_test.rs
@@ -348,7 +348,7 @@ fn r3_gate_83_current_register_blockers_are_explicit() {
         .collect();
     assert_eq!(
         blockers,
-        vec!["parallelism.dag: **STUB**"],
+        Vec::<String>::new(),
         "Gate #83 is not ready to strict-fire until sibling lens-completion slices \
          remove all PROXY/STUB statuses. If this changed, update the strict-fire \
          posture in `r3_gate_83_lens_capability_register_has_zero_proxy_zero_stub`."
diff --git a/src/v3/compiler/tests/integration/sg0_census_test.rs b/src/v3/compiler/tests/integration/sg0_census_test.rs
index 83782dd40ee..fbcbc78c4e5 100644
--- a/src/v3/compiler/tests/integration/sg0_census_test.rs
+++ b/src/v3/compiler/tests/integration/sg0_census_test.rs
@@ -313,7 +313,6 @@ const EXPECTED_HAND_AUTHORED_NON_TEST: &[&str] = &[
     "src/v3/compiler/src/regen_tokenize.rs",
     "src/v3/compiler/src/self_host_receipt_p0.rs",
     "src/v3/compiler/src/test_runner.rs",
-    "src/v3/compiler/src/workflow_parallelism.rs",
 ];
 
 // All test .rs files under `src/v3/compiler` that are currently
diff --git a/src/v3/compiler/tests/integration/sg6_hand_authored_census_test.rs b/src/v3/compiler/tests/integration/sg6_hand_authored_census_test.rs
index a745339a95f..520fde7b658 100644
--- a/src/v3/compiler/tests/integration/sg6_hand_authored_census_test.rs
+++ b/src/v3/compiler/tests/integration/sg6_hand_authored_census_test.rs
@@ -348,6 +348,11 @@ fn sg6_regen_dag_registry_triples_are_pinned() {
             "src/v3/lenses/effect_enumeration.dag",
             "src/v3/compiler/src/lens_effect_enumeration_generated.rs",
         ),
+        (
+            "parallelism",
+            "src/v3/lenses/parallelism.dag",
+            "src/v3/compiler/src/lens_parallelism_generated.rs",
+        ),
         (
             "infer_helpers",
             "src/v3/lenses/infer_helpers.dag",
diff --git a/src/v3/lenses/parallelism.dag b/src/v3/lenses/parallelism.dag
index 13499dc7510..5f70a3ab242 100644
--- a/src/v3/lenses/parallelism.dag
+++ b/src/v3/lenses/parallelism.dag
@@ -1,25 +1,258 @@
-// lenses.parallelism — Lane 2 Stage 2e parallel composition safety (hard stub).
+// lenses.parallelism — Lane 2 Stage 2e parallel composition safety.
 //
-// Status: STRUCTURALLY PARTIAL; BEHAVIORALLY STUB.
+// Status: STRUCTURALLY TERMINAL; BEHAVIORALLY COMPLETE.
 // See docs/v3-lens-capability-register.md.
 //
-// This file is not an analysis — `analyze_parallelism` unconditionally returns
-// `report_parallelism_unsupported(LensSurfacePending, …)`. The authoritative
-// analysis lives in `src/v3/compiler/src/workflow_parallelism.rs` (`v3_compiler::
-// analyze_parallelism`). **Emit note:** `emit_rust_module` can now lower `match`
-// on imported user-defined sums such as `WorkflowEffect` in lens modules (see
-// `docs/v3-lens-capability-register.md`); this lens stays a placeholder until
-// the Stage 2e walk is ported to `.dag` / `std.effects` and wired through
-// `lane2_workflow_at` like `lenses/idempotency.dag`. See ROADMAP Lane 2 Stage 2b
-// “Reflection boundary.”
+// Port authority: retired hand-Rust `src/v3/compiler/src/workflow_parallelism.rs`
+// (2026-05-12), specifically:
+//   - `idempotent_operations_commute`
+//   - `first_breaking_across_branches`
+//   - `extract_linear_branches`
+//   - `pairwise_cross_branch_commutes`
+//   - `analyze_parallelism`
+//   - `loop_iteration_parallel_emission_indicator`
+//
+// The breaker witness deliberately uses branch-order flattening, matching the
+// retired Rust bridge and `WorkflowEffect::operation_at`.
 
 module lenses.parallelism
 
-import v3.std.substrate { Dag, NodeId }
-import std.effects { LensSurfacePending, WorkflowParallelismReport, report_parallelism_unsupported }
+import std.list { List, Empty, Cons, empty, cons, concat }
+import v3.std.substrate { Dag, NodeId, ElementRef, NonSingletonList, lane2_workflow_at }
+import std.effects {
+  EffectShape,
+  IdempotentShape,
+  OperationEffect,
+  WorkflowEffect,
+  WorkflowParallelismReport,
+  CompositionVerdict,
+  ParallelismUnsupportedKind,
+  report_parallelism_unsupported
+}
+
+type LinearBranchesLookup
+  = LinearBranchesFound { branches: List<List<OperationEffect>> }
+  | NonLinearBranchFound
+
+type NonCommutingPairLookup
+  = NonCommutingPairFound { left: OperationEffect, right: OperationEffect }
+  | AllPairsCommute
+
+fn nsl_to_workflow_list(branches: NonSingletonList<WorkflowEffect>) -> List<WorkflowEffect> =
+  cons(branches.first, cons(branches.second, branches.rest))
+
+fn idempotent_shapes_commute(a: IdempotentShape, b: IdempotentShape) -> Bool =
+  match a {
+    ReadEffect =>
+      match b {
+        ReadEffect => true
+        UpsertEffect { .. } => false
+        DeleteEffect { .. } => false
+      }
+    UpsertEffect { .. } => false
+    DeleteEffect { key_source: ka } =>
+      match b {
+        ReadEffect => false
+        UpsertEffect { .. } => false
+        DeleteEffect { key_source: kb } => ka == kb
+      }
+  }
+
+fn operations_commute(a: OperationEffect, b: OperationEffect) -> Bool =
+  match a.shape {
+    IsIdempotent(ia) =>
+      match b.shape {
+        IsIdempotent(ib) => idempotent_shapes_commute(ia, ib)
+        IsBreaking(_) => false
+      }
+    IsBreaking(_) => false
+  }
+
+fn extract_linear_branches_from_list(
+  branches: List<WorkflowEffect>
+) -> LinearBranchesLookup =
+  match branches {
+    Empty => LinearBranchesFound { branches: empty() }
+    Cons(payload) =>
+      match payload.head {
+        LinearEffect { ops } =>
+          match extract_linear_branches_from_list(payload.tail) {
+            LinearBranchesFound { branches: tail_branches } =>
+              LinearBranchesFound { branches: cons(ops, tail_branches) }
+            NonLinearBranchFound => NonLinearBranchFound
+          }
+        BranchEffect { .. } => NonLinearBranchFound
+        LoopEffect { .. } => NonLinearBranchFound
+        ParallelEffect { .. } => NonLinearBranchFound
+      }
+  }
+
+fn extract_linear_branches(
+  branches: NonSingletonList<WorkflowEffect>
+) -> LinearBranchesLookup =
+  extract_linear_branches_from_list(nsl_to_workflow_list(branches))
+
+fn flatten_branch_ops(branch_ops: List<List<OperationEffect>>) -> List<OperationEffect> =
+  match branch_ops {
+    Empty => empty()
+    Cons(payload) => concat(payload.head, flatten_branch_ops(payload.tail))
+  }
+
+fn breaker_ref(index: Int) -> ElementRef<OperationEffect> =
+  { index: index }
+
+fn first_breaker_ref_at(
+  ops: List<OperationEffect>,
+  index: Int
+) -> ElementRef<OperationEffect>? =
+  match ops {
+    Empty => None
+    Cons(payload) =>
+      match payload.head.shape {
+        IsBreaking(_) => Some(breaker_ref(index))
+        IsIdempotent(_) => first_breaker_ref_at(payload.tail, index + 1)
+      }
+  }
+
+fn first_breaking_across_branches(
+  branch_ops: List<List<OperationEffect>>
+) -> ElementRef<OperationEffect>? =
+  first_breaker_ref_at(flatten_branch_ops(branch_ops), 0)
+
+fn first_non_commuting_op(
+  left: OperationEffect,
+  right_branch: List<OperationEffect>
+) -> NonCommutingPairLookup =
+  match right_branch {
+    Empty => AllPairsCommute
+    Cons(payload) =>
+      if operations_commute(left, payload.head) then
+        first_non_commuting_op(left, payload.tail)
+      else
+        NonCommutingPairFound { left: left, right: payload.head }
+  }
+
+fn first_non_commuting_branch_pair(
+  left_branch: List<OperationEffect>,
+  right_branch: List<OperationEffect>
+) -> NonCommutingPairLookup =
+  match left_branch {
+    Empty => AllPairsCommute
+    Cons(payload) =>
+      match first_non_commuting_op(payload.head, right_branch) {
+        AllPairsCommute => first_non_commuting_branch_pair(payload.tail, right_branch)
+        NonCommutingPairFound { left, right } =>
+          NonCommutingPairFound { left: left, right: right }
+      }
+  }
+
+fn first_non_commuting_against_tail(
+  left_branch: List<OperationEffect>,
+  tail_branches: List<List<OperationEffect>>
+) -> NonCommutingPairLookup =
+  match tail_branches {
+    Empty => AllPairsCommute
+    Cons(payload) =>
+      match first_non_commuting_branch_pair(left_branch, payload.head) {
+        AllPairsCommute => first_non_commuting_against_tail(left_branch, payload.tail)
+        NonCommutingPairFound { left, right } =>
+          NonCommutingPairFound { left: left, right: right }
+      }
+  }
+
+fn pairwise_cross_branch_commutes(
+  branch_ops: List<List<OperationEffect>>
+) -> NonCommutingPairLookup =
+  match branch_ops {
+    Empty => AllPairsCommute
+    Cons(payload) =>
+      match first_non_commuting_against_tail(payload.head, payload.tail) {
+        AllPairsCommute => pairwise_cross_branch_commutes(payload.tail)
+        NonCommutingPairFound { left, right } =>
+          NonCommutingPairFound { left: left, right: right }
+      }
+  }
+
+fn parallelism_report_for_workflow(wf: WorkflowEffect) -> WorkflowParallelismReport =
+  match wf {
+    ParallelEffect { branches } =>
+      match extract_linear_branches(branches) {
+        NonLinearBranchFound =>
+          report_parallelism_unsupported(
+            NonLinearParallelBranch,
+            "Stage 2e v1 requires every parallel branch to be `LinearEffect`"
+          )
+        LinearBranchesFound { branches: branch_ops } =>
+          match first_breaking_across_branches(branch_ops) {
+            Some(b) => ParallelCompositionVerdict(BrokenBy { first_breaker: b })
+            None =>
+              match pairwise_cross_branch_commutes(branch_ops) {
+                AllPairsCommute => ParallelCompositionVerdict(IdempotentComposition)
+                NonCommutingPairFound { .. } =>
+                  report_parallelism_unsupported(
+                    PairwiseNonCommute,
+                    "parallel branch operations do not commute under parallel scheduling"
+                  )
+              }
+          }
+      }
+    LinearEffect { .. } =>
+      report_parallelism_unsupported(
+        NotParallelEffectRoot,
+        "parallelism lens analyzes `ParallelEffect` roots only"
+      )
+    BranchEffect { .. } =>
+      report_parallelism_unsupported(
+        NotParallelEffectRoot,
+        "parallelism lens analyzes `ParallelEffect` roots only"
+      )
+    LoopEffect { .. } =>
+      report_parallelism_unsupported(
+        NotParallelEffectRoot,
+        "parallelism lens analyzes `ParallelEffect` roots only"
+      )
+  }
+
+fn analyze_parallelism(d: Dag, workflow_root: NodeId) -> WorkflowParallelismReport =
+  match lane2_workflow_at(d, workflow_root) {
+    None =>
+      report_parallelism_unsupported(
+        NoWorkflowProjection,
+        "no WorkflowEffect projection on this substrate node - analysis reads only `Value`/`Bind` fields set by lowering or `try_register_lane2_workflow_effect`"
+      )
+    Some(wf) => parallelism_report_for_workflow(wf)
+  }
+
+fn read_only_ops(ops: List<OperationEffect>) -> Bool =
+  match ops {
+    Empty => true
+    Cons(payload) =>
+      match payload.head.shape {
+        IsIdempotent(ReadEffect) => read_only_ops(payload.tail)
+        IsIdempotent(_) => false
+        IsBreaking(_) => false
+      }
+  }
 
-fn analyze_parallelism(_d: Dag, _workflow_root: NodeId) -> WorkflowParallelismReport =
-  report_parallelism_unsupported(
-    LensSurfacePending,
-    "lens surface pending: Stage 2e parallelism walk not yet ported to .dag / lane2_workflow_at; use v3_compiler::analyze_parallelism"
-  )
+fn loop_iteration_parallel_emission_indicator(d: Dag, workflow_root: NodeId) -> Int =
+  match lane2_workflow_at(d, workflow_root) {
+    None => 0
+    Some(wf) =>
+      match wf {
+        LoopEffect { body } =>
+          match body {
+            LinearEffect { ops } =>
+              match ops {
+                Empty => 0
+                Cons(_) =>
+                  if read_only_ops(ops) then 1 else 0
+              }
+            BranchEffect { .. } => 0
+            LoopEffect { .. } => 0
+            ParallelEffect { .. } => 0
+          }
+        LinearEffect { .. } => 0
+        BranchEffect { .. } => 0
+        ParallelEffect { .. } => 0
+      }
+  }
diff --git a/src/v3/std/verification.dag b/src/v3/std/verification.dag
index 1688d708cea..c1deb1ed547 100644
--- a/src/v3/std/verification.dag
+++ b/src/v3/std/verification.dag
@@ -206,8 +206,8 @@ data lens_capability_register_rows: List<LensCapabilityRegisterRow> = [
   },
   {
     lens_basename: "parallelism.dag"
-    structural: LensCapabilityStructuralPartial
-    behavioral: LensCapabilityBehavioralStub
+    structural: LensCapabilityStructuralTerminal
+    behavioral: LensCapabilityBehavioralComplete
     v2_counterpart: LensCapabilityV2NoneV3Native
   },
   {

From 3847a4946b7bcc850163f97afb4534b3338115fd Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gmail.com>
Date: Tue, 12 May 2026 17:47:33 -0400
Subject: [PATCH 02/17] =?UTF-8?q?WIP:=20T-Cluster-F-=CE=B1=20S1=20#81=20pa?=
 =?UTF-8?q?rallelism=20walker=20port=20(src/v3/compiler/src/workfl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/v3/compiler/src/bootstrap_generated.rs    | 9092 +++++++++--------
 ...otstrap_generated_without_parse_surface.rs | 7654 +++++++-------
 src/v3/compiler/src/lens_apply.rs             |    4 +-
 .../src/lens_parallelism_generated.rs         |   14 +
 src/v3/compiler/src/lib.rs                    |   26 +-
 .../compiler/src/r3_fc_lane2_loop_witness.rs  |    8 +-
 src/v3/lenses/parallelism.dag                 |    7 +-
 7 files changed, 8456 insertions(+), 8349 deletions(-)
 create mode 100644 src/v3/compiler/src/lens_parallelism_generated.rs

diff --git a/src/v3/compiler/src/bootstrap_generated.rs b/src/v3/compiler/src/bootstrap_generated.rs
index 9688331d5ff..693eaeea8b7 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: 854,
-        next_declaration_id: 3341,
+        next_declaration_id: 3342,
         next_port_id: 1021,
         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: 3341,
+        declaration_append_begin_after_bootstrap: 3342,
     }
 }
 
@@ -1402,21 +1402,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(182),
-            target: TransformTarget::Callable(DeclarationId(2061)),
+            target: TransformTarget::Callable(DeclarationId(2062)),
             inputs: vec![PortId(185)],
             output: PortId(187),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11495, 11507),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(183),
-            target: TransformTarget::Callable(DeclarationId(2063)),
+            target: TransformTarget::Callable(DeclarationId(2064)),
             inputs: vec![PortId(187)],
             output: PortId(188),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11488, 11535),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(184),
-            target: TransformTarget::Callable(DeclarationId(2007)),
+            target: TransformTarget::Callable(DeclarationId(2008)),
             inputs: vec![PortId(185), PortId(186), PortId(188)],
             output: PortId(189),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11149, 11539),
@@ -1432,7 +1432,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(186),
-            target: TransformTarget::Callable(DeclarationId(2009)),
+            target: TransformTarget::Callable(DeclarationId(2010)),
             inputs: vec![PortId(190), PortId(191), PortId(192)],
             output: PortId(193),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11670, 11726),
@@ -1448,7 +1448,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(188),
-            target: TransformTarget::Callable(DeclarationId(2064)),
+            target: TransformTarget::Callable(DeclarationId(2065)),
             inputs: vec![PortId(194)],
             output: PortId(195),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11795, 11810),
@@ -1600,7 +1600,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(202),
-            target: TransformTarget::Callable(DeclarationId(2048)),
+            target: TransformTarget::Callable(DeclarationId(2049)),
             inputs: vec![PortId(211)],
             output: PortId(212),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12325, 12349),
@@ -1630,7 +1630,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(206),
-            target: TransformTarget::Callable(DeclarationId(2046)),
+            target: TransformTarget::Callable(DeclarationId(2047)),
             inputs: vec![PortId(216)],
             output: PortId(217),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12618, 12653),
@@ -1760,14 +1760,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(218),
-            target: TransformTarget::Callable(DeclarationId(2042)),
+            target: TransformTarget::Callable(DeclarationId(2043)),
             inputs: vec![PortId(230)],
             output: PortId(231),
             span: SourceSpan::new("src/v3/std/algebra.dag", 14214, 14229),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(219),
-            target: TransformTarget::Callable(DeclarationId(2066)),
+            target: TransformTarget::Callable(DeclarationId(2067)),
             inputs: vec![PortId(229), PortId(231)],
             output: PortId(232),
             span: SourceSpan::new("src/v3/std/algebra.dag", 14202, 14245),
@@ -2472,7 +2472,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(266),
-            target: TransformTarget::Callable(DeclarationId(2068)),
+            target: TransformTarget::Callable(DeclarationId(2069)),
             inputs: vec![PortId(312), PortId(313)],
             output: PortId(314),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16911, 17021),
@@ -2500,7 +2500,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(270),
-            target: TransformTarget::Callable(DeclarationId(2070)),
+            target: TransformTarget::Callable(DeclarationId(2071)),
             inputs: vec![PortId(317), PortId(318)],
             output: PortId(319),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17076, 17186),
@@ -3993,14 +3993,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(364),
-            target: TransformTarget::Callable(DeclarationId(2071)),
+            target: TransformTarget::Callable(DeclarationId(2072)),
             inputs: vec![PortId(425), PortId(426)],
             output: PortId(427),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22293, 22323),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(365),
-            target: TransformTarget::Callable(DeclarationId(2072)),
+            target: TransformTarget::Callable(DeclarationId(2073)),
             inputs: vec![PortId(424), PortId(427)],
             output: PortId(428),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22275, 22324),
@@ -4016,7 +4016,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(367),
-            target: TransformTarget::Callable(DeclarationId(2073)),
+            target: TransformTarget::Callable(DeclarationId(2074)),
             inputs: vec![],
             output: PortId(430),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22603, 22610),
@@ -4080,7 +4080,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(375),
-            target: TransformTarget::Callable(DeclarationId(2074)),
+            target: TransformTarget::Callable(DeclarationId(2075)),
             inputs: vec![PortId(436), PortId(438)],
             output: PortId(439),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22737, 22789),
@@ -4176,21 +4176,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(382),
-            target: TransformTarget::Callable(DeclarationId(2042)),
+            target: TransformTarget::Callable(DeclarationId(2043)),
             inputs: vec![PortId(445)],
             output: PortId(446),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23123, 23138),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(383),
-            target: TransformTarget::Callable(DeclarationId(2075)),
+            target: TransformTarget::Callable(DeclarationId(2076)),
             inputs: vec![],
             output: PortId(447),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23140, 23147),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(384),
-            target: TransformTarget::Callable(DeclarationId(2076)),
+            target: TransformTarget::Callable(DeclarationId(2077)),
             inputs: vec![PortId(446), PortId(447)],
             output: PortId(448),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23118, 23148),
@@ -4327,7 +4327,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(396),
-            target: TransformTarget::Callable(DeclarationId(2077)),
+            target: TransformTarget::Callable(DeclarationId(2078)),
             inputs: vec![],
             output: PortId(461),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23597, 23604),
@@ -4391,7 +4391,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(404),
-            target: TransformTarget::Callable(DeclarationId(2078)),
+            target: TransformTarget::Callable(DeclarationId(2079)),
             inputs: vec![PortId(467), PortId(469)],
             output: PortId(470),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23735, 23792),
@@ -4796,7 +4796,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(430),
-            target: TransformTarget::Callable(DeclarationId(2042)),
+            target: TransformTarget::Callable(DeclarationId(2043)),
             inputs: vec![PortId(509)],
             output: PortId(510),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25180, 25195),
@@ -4839,7 +4839,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(435),
-            target: TransformTarget::Callable(DeclarationId(2079)),
+            target: TransformTarget::Callable(DeclarationId(2080)),
             inputs: vec![PortId(515), PortId(516)],
             output: PortId(517),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25317, 25349),
@@ -4936,7 +4936,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(442),
-            target: TransformTarget::Callable(DeclarationId(2042)),
+            target: TransformTarget::Callable(DeclarationId(2043)),
             inputs: vec![PortId(523)],
             output: PortId(524),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25451, 25466),
@@ -4995,7 +4995,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(449),
-            target: TransformTarget::Callable(DeclarationId(2048)),
+            target: TransformTarget::Callable(DeclarationId(2049)),
             inputs: vec![PortId(532)],
             output: PortId(533),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25569, 25628),
@@ -5078,7 +5078,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(454),
-            target: TransformTarget::Callable(DeclarationId(2042)),
+            target: TransformTarget::Callable(DeclarationId(2043)),
             inputs: vec![PortId(537)],
             output: PortId(538),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25917, 25932),
@@ -5171,7 +5171,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(465),
-            target: TransformTarget::Callable(DeclarationId(2046)),
+            target: TransformTarget::Callable(DeclarationId(2047)),
             inputs: vec![PortId(551)],
             output: PortId(552),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26159, 26222),
@@ -5643,7 +5643,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(494),
-            target: TransformTarget::Callable(DeclarationId(2046)),
+            target: TransformTarget::Callable(DeclarationId(2047)),
             inputs: vec![PortId(601)],
             output: PortId(602),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27605, 27633),
@@ -5734,7 +5734,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(505),
-            target: TransformTarget::Callable(DeclarationId(2080)),
+            target: TransformTarget::Callable(DeclarationId(2081)),
             inputs: vec![],
             output: PortId(615),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27988, 27995),
@@ -5798,7 +5798,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(513),
-            target: TransformTarget::Callable(DeclarationId(2081)),
+            target: TransformTarget::Callable(DeclarationId(2082)),
             inputs: vec![PortId(621), PortId(623)],
             output: PortId(624),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28136, 28201),
@@ -5887,7 +5887,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(519),
-            target: TransformTarget::Callable(DeclarationId(2083)),
+            target: TransformTarget::Callable(DeclarationId(2084)),
             inputs: vec![PortId(628), PortId(630)],
             output: PortId(631),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28319, 28377),
@@ -5908,7 +5908,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(522),
-            target: TransformTarget::Callable(DeclarationId(2084)),
+            target: TransformTarget::Callable(DeclarationId(2085)),
             inputs: vec![PortId(629), PortId(633)],
             output: PortId(634),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28403, 28449),
@@ -5951,14 +5951,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(525),
-            target: TransformTarget::Callable(DeclarationId(2085)),
+            target: TransformTarget::Callable(DeclarationId(2086)),
             inputs: vec![],
             output: PortId(637),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28720, 28727),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(526),
-            target: TransformTarget::Callable(DeclarationId(2087)),
+            target: TransformTarget::Callable(DeclarationId(2088)),
             inputs: vec![PortId(636), PortId(637)],
             output: PortId(638),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28708, 28749),
@@ -5981,7 +5981,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(529),
-            target: TransformTarget::Callable(DeclarationId(2042)),
+            target: TransformTarget::Callable(DeclarationId(2043)),
             inputs: vec![PortId(640)],
             output: PortId(641),
             span: SourceSpan::new("src/v3/std/induction.dag", 29099, 29114),
@@ -6054,7 +6054,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(538),
-            target: TransformTarget::Callable(DeclarationId(2050)),
+            target: TransformTarget::Callable(DeclarationId(2051)),
             inputs: vec![PortId(653)],
             output: PortId(654),
             span: SourceSpan::new("src/v3/std/induction.dag", 29338, 29412),
@@ -6068,7 +6068,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(540),
-            target: TransformTarget::Callable(DeclarationId(2050)),
+            target: TransformTarget::Callable(DeclarationId(2051)),
             inputs: vec![PortId(655)],
             output: PortId(656),
             span: SourceSpan::new("src/v3/std/induction.dag", 29433, 29461),
@@ -6082,7 +6082,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(542),
-            target: TransformTarget::Callable(DeclarationId(2050)),
+            target: TransformTarget::Callable(DeclarationId(2051)),
             inputs: vec![PortId(657)],
             output: PortId(658),
             span: SourceSpan::new("src/v3/std/induction.dag", 29480, 29513),
@@ -6209,7 +6209,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(548),
-            target: TransformTarget::Callable(DeclarationId(2050)),
+            target: TransformTarget::Callable(DeclarationId(2051)),
             inputs: vec![PortId(664)],
             output: PortId(665),
             span: SourceSpan::new("src/v3/std/induction.dag", 29645, 29726),
@@ -6234,7 +6234,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(551),
-            target: TransformTarget::Callable(DeclarationId(2050)),
+            target: TransformTarget::Callable(DeclarationId(2051)),
             inputs: vec![PortId(668)],
             output: PortId(669),
             span: SourceSpan::new("src/v3/std/induction.dag", 29761, 29835),
@@ -6320,7 +6320,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(559),
-            target: TransformTarget::Callable(DeclarationId(2525)),
+            target: TransformTarget::Callable(DeclarationId(2526)),
             inputs: vec![PortId(678)],
             output: PortId(679),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3171, 3209),
@@ -6343,7 +6343,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(562),
-            target: TransformTarget::Callable(DeclarationId(2526)),
+            target: TransformTarget::Callable(DeclarationId(2527)),
             inputs: vec![PortId(682)],
             output: PortId(683),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3249, 3287),
@@ -6409,7 +6409,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(567),
-            target: TransformTarget::Callable(DeclarationId(2527)),
+            target: TransformTarget::Callable(DeclarationId(2528)),
             inputs: vec![PortId(688)],
             output: PortId(689),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3408, 3446),
@@ -6432,7 +6432,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(570),
-            target: TransformTarget::Callable(DeclarationId(2528)),
+            target: TransformTarget::Callable(DeclarationId(2529)),
             inputs: vec![PortId(692)],
             output: PortId(693),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3486, 3524),
@@ -6498,7 +6498,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(575),
-            target: TransformTarget::Callable(DeclarationId(2529)),
+            target: TransformTarget::Callable(DeclarationId(2530)),
             inputs: vec![PortId(698)],
             output: PortId(699),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3642, 3680),
@@ -6521,7 +6521,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(578),
-            target: TransformTarget::Callable(DeclarationId(2530)),
+            target: TransformTarget::Callable(DeclarationId(2531)),
             inputs: vec![PortId(702)],
             output: PortId(703),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3720, 3758),
@@ -6587,7 +6587,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(583),
-            target: TransformTarget::Callable(DeclarationId(2531)),
+            target: TransformTarget::Callable(DeclarationId(2532)),
             inputs: vec![PortId(708)],
             output: PortId(709),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3874, 3912),
@@ -6610,7 +6610,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(586),
-            target: TransformTarget::Callable(DeclarationId(2532)),
+            target: TransformTarget::Callable(DeclarationId(2533)),
             inputs: vec![PortId(712)],
             output: PortId(713),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3952, 3990),
@@ -6676,7 +6676,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(591),
-            target: TransformTarget::Callable(DeclarationId(2533)),
+            target: TransformTarget::Callable(DeclarationId(2534)),
             inputs: vec![PortId(718)],
             output: PortId(719),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4106, 4144),
@@ -6699,7 +6699,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(594),
-            target: TransformTarget::Callable(DeclarationId(2534)),
+            target: TransformTarget::Callable(DeclarationId(2535)),
             inputs: vec![PortId(722)],
             output: PortId(723),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4184, 4222),
@@ -6858,7 +6858,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(600),
-            target: TransformTarget::Callable(DeclarationId(2535)),
+            target: TransformTarget::Callable(DeclarationId(2536)),
             inputs: vec![],
             output: PortId(729),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4908, 4913),
@@ -6874,7 +6874,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(602),
-            target: TransformTarget::Callable(DeclarationId(2536)),
+            target: TransformTarget::Callable(DeclarationId(2537)),
             inputs: vec![],
             output: PortId(730),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4973, 4978),
@@ -6890,7 +6890,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(604),
-            target: TransformTarget::Callable(DeclarationId(2537)),
+            target: TransformTarget::Callable(DeclarationId(2538)),
             inputs: vec![],
             output: PortId(731),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5036, 5041),
@@ -6906,7 +6906,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(606),
-            target: TransformTarget::Callable(DeclarationId(2538)),
+            target: TransformTarget::Callable(DeclarationId(2539)),
             inputs: vec![],
             output: PortId(732),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5099, 5104),
@@ -6922,7 +6922,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(608),
-            target: TransformTarget::Callable(DeclarationId(2539)),
+            target: TransformTarget::Callable(DeclarationId(2540)),
             inputs: vec![],
             output: PortId(733),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5163, 5168),
@@ -6938,7 +6938,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(610),
-            target: TransformTarget::Callable(DeclarationId(2540)),
+            target: TransformTarget::Callable(DeclarationId(2541)),
             inputs: vec![],
             output: PortId(734),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5243, 5248),
@@ -6954,7 +6954,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(612),
-            target: TransformTarget::Callable(DeclarationId(2542)),
+            target: TransformTarget::Callable(DeclarationId(2543)),
             inputs: vec![PortId(735)],
             output: PortId(736),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5359, 5370),
@@ -6968,7 +6968,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(614),
-            target: TransformTarget::Callable(DeclarationId(2541)),
+            target: TransformTarget::Callable(DeclarationId(2542)),
             inputs: vec![PortId(736), PortId(737)],
             output: PortId(738),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5346, 5411),
@@ -6991,7 +6991,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(617),
-            target: TransformTarget::Callable(DeclarationId(2543)),
+            target: TransformTarget::Callable(DeclarationId(2544)),
             inputs: vec![PortId(739), PortId(740)],
             output: PortId(741),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5487, 5545),
@@ -7021,7 +7021,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(621),
-            target: TransformTarget::Callable(DeclarationId(2544)),
+            target: TransformTarget::Callable(DeclarationId(2545)),
             inputs: vec![PortId(743), PortId(742), PortId(744)],
             output: PortId(745),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5646, 5771),
@@ -7058,7 +7058,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(626),
-            target: TransformTarget::Callable(DeclarationId(2545)),
+            target: TransformTarget::Callable(DeclarationId(2546)),
             inputs: vec![PortId(748), PortId(749), PortId(750)],
             output: PortId(751),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5892, 6054),
@@ -7528,7 +7528,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(667),
-            target: TransformTarget::Callable(DeclarationId(2584)),
+            target: TransformTarget::Callable(DeclarationId(2585)),
             inputs: vec![],
             output: PortId(802),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6612, 6622),
@@ -7544,28 +7544,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(669),
-            target: TransformTarget::Callable(DeclarationId(2584)),
+            target: TransformTarget::Callable(DeclarationId(2585)),
             inputs: vec![],
             output: PortId(806),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6930, 6940),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(670),
-            target: TransformTarget::Callable(DeclarationId(2584)),
+            target: TransformTarget::Callable(DeclarationId(2585)),
             inputs: vec![],
             output: PortId(807),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6992, 7002),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(671),
-            target: TransformTarget::Callable(DeclarationId(2586)),
+            target: TransformTarget::Callable(DeclarationId(2587)),
             inputs: vec![],
             output: PortId(808),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7020, 7025),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(672),
-            target: TransformTarget::Callable(DeclarationId(2586)),
+            target: TransformTarget::Callable(DeclarationId(2587)),
             inputs: vec![],
             output: PortId(809),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7047, 7052),
@@ -7581,7 +7581,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(674),
-            target: TransformTarget::Callable(DeclarationId(2586)),
+            target: TransformTarget::Callable(DeclarationId(2587)),
             inputs: vec![],
             output: PortId(812),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7089, 7094),
@@ -7636,21 +7636,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(676),
-            target: TransformTarget::Callable(DeclarationId(2584)),
+            target: TransformTarget::Callable(DeclarationId(2585)),
             inputs: vec![],
             output: PortId(814),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7158, 7168),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(677),
-            target: TransformTarget::Callable(DeclarationId(2586)),
+            target: TransformTarget::Callable(DeclarationId(2587)),
             inputs: vec![],
             output: PortId(815),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7186, 7191),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(678),
-            target: TransformTarget::Callable(DeclarationId(2585)),
+            target: TransformTarget::Callable(DeclarationId(2586)),
             inputs: vec![],
             output: PortId(816),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7213, 7222),
@@ -7666,7 +7666,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(680),
-            target: TransformTarget::Callable(DeclarationId(2585)),
+            target: TransformTarget::Callable(DeclarationId(2586)),
             inputs: vec![],
             output: PortId(819),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7259, 7268),
@@ -7730,21 +7730,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(683),
-            target: TransformTarget::Callable(DeclarationId(2584)),
+            target: TransformTarget::Callable(DeclarationId(2585)),
             inputs: vec![],
             output: PortId(823),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7348, 7358),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(684),
-            target: TransformTarget::Callable(DeclarationId(2586)),
+            target: TransformTarget::Callable(DeclarationId(2587)),
             inputs: vec![],
             output: PortId(824),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7376, 7381),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(685),
-            target: TransformTarget::Callable(DeclarationId(2585)),
+            target: TransformTarget::Callable(DeclarationId(2586)),
             inputs: vec![],
             output: PortId(825),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7403, 7412),
@@ -7792,7 +7792,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(691),
-            target: TransformTarget::Callable(DeclarationId(2583)),
+            target: TransformTarget::Callable(DeclarationId(2584)),
             inputs: vec![PortId(831)],
             output: PortId(832),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7491, 7544),
@@ -7851,7 +7851,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(696),
-            target: TransformTarget::Callable(DeclarationId(2583)),
+            target: TransformTarget::Callable(DeclarationId(2584)),
             inputs: vec![PortId(836)],
             output: PortId(837),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7572, 7660),
@@ -8043,7 +8043,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(708),
-            target: TransformTarget::Callable(DeclarationId(2583)),
+            target: TransformTarget::Callable(DeclarationId(2584)),
             inputs: vec![PortId(847)],
             output: PortId(848),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7997, 8038),
@@ -8082,7 +8082,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(713),
-            target: TransformTarget::Callable(DeclarationId(2588)),
+            target: TransformTarget::Callable(DeclarationId(2589)),
             inputs: vec![],
             output: PortId(853),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8292, 8297),
@@ -8221,14 +8221,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(722),
-            target: TransformTarget::Callable(DeclarationId(2270)),
+            target: TransformTarget::Callable(DeclarationId(2271)),
             inputs: vec![],
             output: PortId(868),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9047, 9059),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(723),
-            target: TransformTarget::Callable(DeclarationId(2276)),
+            target: TransformTarget::Callable(DeclarationId(2277)),
             inputs: vec![PortId(868)],
             output: PortId(869),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9034, 9060),
@@ -8336,7 +8336,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(737),
-            target: TransformTarget::Callable(DeclarationId(2304)),
+            target: TransformTarget::Callable(DeclarationId(2305)),
             inputs: vec![PortId(883)],
             output: PortId(884),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10151, 10263),
@@ -8357,7 +8357,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(740),
-            target: TransformTarget::Callable(DeclarationId(2304)),
+            target: TransformTarget::Callable(DeclarationId(2305)),
             inputs: vec![PortId(886)],
             output: PortId(887),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10291, 10472),
@@ -8417,7 +8417,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(745),
-            target: TransformTarget::Callable(DeclarationId(2304)),
+            target: TransformTarget::Callable(DeclarationId(2305)),
             inputs: vec![PortId(892)],
             output: PortId(893),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10508, 10669),
@@ -8519,21 +8519,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(752),
-            target: TransformTarget::Callable(DeclarationId(2584)),
+            target: TransformTarget::Callable(DeclarationId(2585)),
             inputs: vec![],
             output: PortId(904),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11299, 11309),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(753),
-            target: TransformTarget::Callable(DeclarationId(2585)),
+            target: TransformTarget::Callable(DeclarationId(2586)),
             inputs: vec![],
             output: PortId(905),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11327, 11336),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(754),
-            target: TransformTarget::Callable(DeclarationId(2586)),
+            target: TransformTarget::Callable(DeclarationId(2587)),
             inputs: vec![],
             output: PortId(906),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11350, 11355),
@@ -8618,7 +8618,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(760),
-            target: TransformTarget::Callable(DeclarationId(2589)),
+            target: TransformTarget::Callable(DeclarationId(2590)),
             inputs: vec![PortId(913)],
             output: PortId(914),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12279, 12320),
@@ -8632,7 +8632,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(762),
-            target: TransformTarget::Callable(DeclarationId(2590)),
+            target: TransformTarget::Callable(DeclarationId(2591)),
             inputs: vec![PortId(915)],
             output: PortId(916),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12326, 12367),
@@ -8687,7 +8687,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(767),
-            target: TransformTarget::Callable(DeclarationId(2591)),
+            target: TransformTarget::Callable(DeclarationId(2592)),
             inputs: vec![PortId(921)],
             output: PortId(922),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12430, 12471),
@@ -8701,7 +8701,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(769),
-            target: TransformTarget::Callable(DeclarationId(2592)),
+            target: TransformTarget::Callable(DeclarationId(2593)),
             inputs: vec![PortId(923)],
             output: PortId(924),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12477, 12518),
@@ -8756,7 +8756,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(774),
-            target: TransformTarget::Callable(DeclarationId(2593)),
+            target: TransformTarget::Callable(DeclarationId(2594)),
             inputs: vec![PortId(929)],
             output: PortId(930),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12578, 12619),
@@ -8770,7 +8770,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(776),
-            target: TransformTarget::Callable(DeclarationId(2594)),
+            target: TransformTarget::Callable(DeclarationId(2595)),
             inputs: vec![PortId(931)],
             output: PortId(932),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12625, 12666),
@@ -8825,7 +8825,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(781),
-            target: TransformTarget::Callable(DeclarationId(2595)),
+            target: TransformTarget::Callable(DeclarationId(2596)),
             inputs: vec![PortId(937)],
             output: PortId(938),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12724, 12765),
@@ -8839,7 +8839,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(783),
-            target: TransformTarget::Callable(DeclarationId(2596)),
+            target: TransformTarget::Callable(DeclarationId(2597)),
             inputs: vec![PortId(939)],
             output: PortId(940),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12771, 12812),
@@ -8894,7 +8894,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(788),
-            target: TransformTarget::Callable(DeclarationId(2597)),
+            target: TransformTarget::Callable(DeclarationId(2598)),
             inputs: vec![PortId(945)],
             output: PortId(946),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12870, 12911),
@@ -8908,7 +8908,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(790),
-            target: TransformTarget::Callable(DeclarationId(2598)),
+            target: TransformTarget::Callable(DeclarationId(2599)),
             inputs: vec![PortId(947)],
             output: PortId(948),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12917, 12958),
@@ -9043,14 +9043,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(797),
-            target: TransformTarget::Callable(DeclarationId(2303)),
+            target: TransformTarget::Callable(DeclarationId(2304)),
             inputs: vec![],
             output: PortId(957),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13142, 13154),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(798),
-            target: TransformTarget::Callable(DeclarationId(2303)),
+            target: TransformTarget::Callable(DeclarationId(2304)),
             inputs: vec![],
             output: PortId(958),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13160, 13172),
@@ -9168,14 +9168,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
             target: TransformTarget::Callable(DeclarationId(1300)),
             inputs: vec![PortId(968)],
             output: PortId(969),
-            span: SourceSpan::new("src/v3/std/verification.dag", 27853, 27876),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27858, 27881),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(809),
             target: TransformTarget::Callable(DeclarationId(1301)),
             inputs: vec![PortId(970)],
             output: PortId(971),
-            span: SourceSpan::new("src/v3/std/verification.dag", 27898, 27932),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27903, 27937),
         }));
         nodes.push(Behavior::Branch(BranchNode {
             id: NodeId(810),
@@ -9186,7 +9186,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     output: PortId(969),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Enumerated".to_string(),
-                        span: SourceSpan::new("src/v3/std/verification.dag", 27836, 27849),
+                        span: SourceSpan::new("src/v3/std/verification.dag", 27841, 27854),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "c".to_string(),
@@ -9198,7 +9198,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     output: PortId(971),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Quantified".to_string(),
-                        span: SourceSpan::new("src/v3/std/verification.dag", 27881, 27894),
+                        span: SourceSpan::new("src/v3/std/verification.dag", 27886, 27899),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "q".to_string(),
@@ -9207,7 +9207,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                 },
             ],
             output: PortId(972),
-            span: SourceSpan::new("src/v3/std/verification.dag", 27818, 27936),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27823, 27941),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Bind(BindNode {
@@ -9215,7 +9215,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
             name: "obligation_for_suite_claim".to_string(),
             value: PortId(972),
             params: vec![PortId(967)],
-            span: SourceSpan::new("src/v3/std/verification.dag", 27818, 27936),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27823, 27941),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
@@ -9834,7 +9834,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(3341);
+        let mut declarations = Vec::with_capacity(3342);
         declarations.push(Declaration {
             id: DeclarationId(0),
             name: Some("Classical".to_string()),
@@ -24042,11 +24042,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Empty".to_string(),
-                        ty: DeclarationId(1813),
+                        ty: DeclarationId(1814),
                     },
                     Field {
                         label: "Cons".to_string(),
-                        ty: DeclarationId(1815),
+                        ty: DeclarationId(1816),
                     },
                 ],
             },
@@ -24079,7 +24079,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1783),
+                output: DeclarationId(1784),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3273, 3284)),
             },
             type_params: vec![DeclarationId(688)],
@@ -24110,8 +24110,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(689),
             name: Some("cons".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(690), DeclarationId(1784)],
-                output: DeclarationId(1785),
+                inputs: vec![DeclarationId(690), DeclarationId(1785)],
+                output: DeclarationId(1786),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3453, 3475)),
             },
             type_params: vec![DeclarationId(690)],
@@ -24143,7 +24143,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("singleton".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(692)],
-                output: DeclarationId(1786),
+                output: DeclarationId(1787),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3570, 3590)),
             },
             type_params: vec![DeclarationId(692)],
@@ -24174,7 +24174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(693),
             name: Some("fold".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1787), DeclarationId(695), DeclarationId(1788)],
+                inputs: vec![DeclarationId(1788), DeclarationId(695), DeclarationId(1789)],
                 output: DeclarationId(695),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4203, 4307)),
             },
@@ -24220,7 +24220,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(696),
             name: Some("fold_right".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1789), DeclarationId(698), DeclarationId(1790)],
+                inputs: vec![DeclarationId(1790), DeclarationId(698), DeclarationId(1791)],
                 output: DeclarationId(698),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4658, 4768)),
             },
@@ -24266,8 +24266,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(699),
             name: Some("concat".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1791), DeclarationId(1792)],
-                output: DeclarationId(1793),
+                inputs: vec![DeclarationId(1792), DeclarationId(1793)],
+                output: DeclarationId(1794),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5386, 5414)),
             },
             type_params: vec![DeclarationId(700)],
@@ -24298,8 +24298,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(701),
             name: Some("map".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1794), DeclarationId(1795)],
-                output: DeclarationId(1796),
+                inputs: vec![DeclarationId(1795), DeclarationId(1796)],
+                output: DeclarationId(1797),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5721, 5778)),
             },
             type_params: vec![DeclarationId(702), DeclarationId(703)],
@@ -24344,8 +24344,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(704),
             name: Some("filter".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1797), DeclarationId(1798)],
-                output: DeclarationId(1799),
+                inputs: vec![DeclarationId(1798), DeclarationId(1799)],
+                output: DeclarationId(1800),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5905, 5988)),
             },
             type_params: vec![DeclarationId(705)],
@@ -24376,8 +24376,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(706),
             name: Some("flat_map".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1800), DeclarationId(1802)],
-                output: DeclarationId(1803),
+                inputs: vec![DeclarationId(1801), DeclarationId(1803)],
+                output: DeclarationId(1804),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6171, 6230)),
             },
             type_params: vec![DeclarationId(707), DeclarationId(708)],
@@ -24422,7 +24422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(709),
             name: Some("length".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1804)],
+                inputs: vec![DeclarationId(1805)],
                 output: DeclarationId(93),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6372, 6409)),
             },
@@ -24454,7 +24454,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(711),
             name: Some("is_empty".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1805)],
+                inputs: vec![DeclarationId(1806)],
                 output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6605, 6671)),
             },
@@ -24525,8 +24525,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(715),
             name: Some("enumerate".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1806)],
-                output: DeclarationId(1808),
+                inputs: vec![DeclarationId(1807)],
+                output: DeclarationId(1809),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7238, 7269)),
             },
             type_params: vec![DeclarationId(716)],
@@ -24557,8 +24557,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(717),
             name: Some("enumerate_helper".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1809), DeclarationId(93)],
-                output: DeclarationId(1811),
+                inputs: vec![DeclarationId(1810), DeclarationId(93)],
+                output: DeclarationId(1812),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7463, 7644)),
             },
             type_params: vec![DeclarationId(718)],
@@ -24589,7 +24589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(719),
             name: Some("contains".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1812), DeclarationId(720)],
+                inputs: vec![DeclarationId(1813), DeclarationId(720)],
                 output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 8205, 8332)),
             },
@@ -24684,7 +24684,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "rest".to_string(),
-                        ty: DeclarationId(1816),
+                        ty: DeclarationId(1817),
                     },
                 ],
             },
@@ -24727,7 +24727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "rest".to_string(),
-                        ty: DeclarationId(1817),
+                        ty: DeclarationId(1818),
                     },
                 ],
             },
@@ -24762,11 +24762,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LiteralToken".to_string(),
-                        ty: DeclarationId(1832),
+                        ty: DeclarationId(1833),
                     },
                     Field {
                         label: "ParamToken".to_string(),
-                        ty: DeclarationId(1833),
+                        ty: DeclarationId(1834),
                     },
                 ],
             },
@@ -24786,7 +24786,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tokens".to_string(),
-                    ty: DeclarationId(1834),
+                    ty: DeclarationId(1835),
                 }],
             },
             type_params: vec![],
@@ -24806,11 +24806,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ParsedSegmentTokens".to_string(),
-                        ty: DeclarationId(1836),
+                        ty: DeclarationId(1837),
                     },
                     Field {
                         label: "MalformedPathSegment".to_string(),
-                        ty: DeclarationId(1837),
+                        ty: DeclarationId(1838),
                     },
                 ],
             },
@@ -24831,11 +24831,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ParsedPathTemplate".to_string(),
-                        ty: DeclarationId(1838),
+                        ty: DeclarationId(1839),
                     },
                     Field {
                         label: "MalformedPathTemplate".to_string(),
-                        ty: DeclarationId(1839),
+                        ty: DeclarationId(1840),
                     },
                 ],
             },
@@ -24890,7 +24890,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("last_path_param".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(730)],
-                output: DeclarationId(1818),
+                output: DeclarationId(1819),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 11761, 12044)),
             },
             type_params: vec![],
@@ -24910,15 +24910,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ReadEffect".to_string(),
-                        ty: DeclarationId(1840),
+                        ty: DeclarationId(1841),
                     },
                     Field {
                         label: "UpsertEffect".to_string(),
-                        ty: DeclarationId(1841),
+                        ty: DeclarationId(1842),
                     },
                     Field {
                         label: "DeleteEffect".to_string(),
-                        ty: DeclarationId(1842),
+                        ty: DeclarationId(1843),
                     },
                 ],
             },
@@ -24939,11 +24939,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "CreateEffect".to_string(),
-                        ty: DeclarationId(1843),
+                        ty: DeclarationId(1844),
                     },
                     Field {
                         label: "AppendEffect".to_string(),
-                        ty: DeclarationId(1844),
+                        ty: DeclarationId(1845),
                     },
                 ],
             },
@@ -24964,11 +24964,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IsIdempotent".to_string(),
-                        ty: DeclarationId(1845),
+                        ty: DeclarationId(1846),
                     },
                     Field {
                         label: "IsBreaking".to_string(),
-                        ty: DeclarationId(1846),
+                        ty: DeclarationId(1847),
                     },
                 ],
             },
@@ -24989,11 +24989,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "PostAlways".to_string(),
-                        ty: DeclarationId(1847),
+                        ty: DeclarationId(1848),
                     },
                     Field {
                         label: "KeylessFallback".to_string(),
-                        ty: DeclarationId(1848),
+                        ty: DeclarationId(1849),
                     },
                 ],
             },
@@ -25014,15 +25014,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "PathParam".to_string(),
-                        ty: DeclarationId(1849),
+                        ty: DeclarationId(1850),
                     },
                     Field {
                         label: "InputField".to_string(),
-                        ty: DeclarationId(1850),
+                        ty: DeclarationId(1851),
                     },
                     Field {
                         label: "CompositeKey".to_string(),
-                        ty: DeclarationId(1852),
+                        ty: DeclarationId(1853),
                     },
                 ],
             },
@@ -25043,15 +25043,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LatticeEffect".to_string(),
-                        ty: DeclarationId(1853),
+                        ty: DeclarationId(1854),
                     },
                     Field {
                         label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(1854),
+                        ty: DeclarationId(1855),
                     },
                     Field {
                         label: "NonIdempotent".to_string(),
-                        ty: DeclarationId(1855),
+                        ty: DeclarationId(1856),
                     },
                 ],
             },
@@ -25133,15 +25133,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DerivedEffect".to_string(),
-                        ty: DeclarationId(1856),
+                        ty: DeclarationId(1857),
                     },
                     Field {
                         label: "UnknownHttpMethodInput".to_string(),
-                        ty: DeclarationId(1857),
+                        ty: DeclarationId(1858),
                     },
                     Field {
                         label: "MalformedPathInput".to_string(),
-                        ty: DeclarationId(1858),
+                        ty: DeclarationId(1859),
                     },
                 ],
             },
@@ -25162,11 +25162,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IdempotentComposition".to_string(),
-                        ty: DeclarationId(1859),
+                        ty: DeclarationId(1860),
                     },
                     Field {
                         label: "BrokenBy".to_string(),
-                        ty: DeclarationId(1861),
+                        ty: DeclarationId(1862),
                     },
                 ],
             },
@@ -25203,7 +25203,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(1819),
+                output: DeclarationId(1820),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20944, 20966)),
             },
             type_params: vec![],
@@ -25220,8 +25220,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(749),
             name: Some("indexed_breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1820)],
-                output: DeclarationId(1822),
+                inputs: vec![DeclarationId(1821)],
+                output: DeclarationId(1823),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21060, 21153)),
             },
             type_params: vec![],
@@ -25238,8 +25238,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(750),
             name: Some("first_breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1823)],
-                output: DeclarationId(1825),
+                inputs: vec![DeclarationId(1824)],
+                output: DeclarationId(1826),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21240, 21423)),
             },
             type_params: vec![],
@@ -25256,7 +25256,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(751),
             name: Some("compose_effects".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1826)],
+                inputs: vec![DeclarationId(1827)],
                 output: DeclarationId(746),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22313, 22436)),
             },
@@ -25321,19 +25321,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LinearEffect".to_string(),
-                        ty: DeclarationId(1863),
+                        ty: DeclarationId(1864),
                     },
                     Field {
                         label: "BranchEffect".to_string(),
-                        ty: DeclarationId(1865),
+                        ty: DeclarationId(1866),
                     },
                     Field {
                         label: "LoopEffect".to_string(),
-                        ty: DeclarationId(1866),
+                        ty: DeclarationId(1867),
                     },
                     Field {
                         label: "ParallelEffect".to_string(),
-                        ty: DeclarationId(1868),
+                        ty: DeclarationId(1869),
                     },
                 ],
             },
@@ -25383,11 +25383,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "WorkflowCompositionVerdict".to_string(),
-                        ty: DeclarationId(1869),
+                        ty: DeclarationId(1870),
                     },
                     Field {
                         label: "IdempotencyUnsupported".to_string(),
-                        ty: DeclarationId(1870),
+                        ty: DeclarationId(1871),
                     },
                 ],
             },
@@ -25426,23 +25426,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoWorkflowProjection".to_string(),
-                        ty: DeclarationId(1871),
+                        ty: DeclarationId(1872),
                     },
                     Field {
                         label: "NotParallelEffectRoot".to_string(),
-                        ty: DeclarationId(1872),
+                        ty: DeclarationId(1873),
                     },
                     Field {
                         label: "NonLinearParallelBranch".to_string(),
-                        ty: DeclarationId(1873),
+                        ty: DeclarationId(1874),
                     },
                     Field {
                         label: "PairwiseNonCommute".to_string(),
-                        ty: DeclarationId(1874),
+                        ty: DeclarationId(1875),
                     },
                     Field {
                         label: "LensSurfacePending".to_string(),
-                        ty: DeclarationId(1875),
+                        ty: DeclarationId(1876),
                     },
                 ],
             },
@@ -25492,11 +25492,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ParallelCompositionVerdict".to_string(),
-                        ty: DeclarationId(1876),
+                        ty: DeclarationId(1877),
                     },
                     Field {
                         label: "ParallelismUnsupported".to_string(),
-                        ty: DeclarationId(1877),
+                        ty: DeclarationId(1878),
                     },
                 ],
             },
@@ -25551,7 +25551,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("parse_http_method".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230)],
-                output: DeclarationId(1827),
+                output: DeclarationId(1828),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 29707, 30005)),
             },
             type_params: vec![],
@@ -25586,7 +25586,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(765),
             name: Some("upsert_or_create".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1828), DeclarationId(198)],
+                inputs: vec![DeclarationId(1829), DeclarationId(198)],
                 output: DeclarationId(738),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30476, 30628)),
             },
@@ -25604,7 +25604,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(766),
             name: Some("delete_or_create".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1829), DeclarationId(198)],
+                inputs: vec![DeclarationId(1830), DeclarationId(198)],
                 output: DeclarationId(738),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30706, 30858)),
             },
@@ -25661,15 +25661,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Agrees".to_string(),
-                        ty: DeclarationId(1878),
+                        ty: DeclarationId(1879),
                     },
                     Field {
                         label: "Disagrees".to_string(),
-                        ty: DeclarationId(1879),
+                        ty: DeclarationId(1880),
                     },
                     Field {
                         label: "DerivationUnknown".to_string(),
-                        ty: DeclarationId(1880),
+                        ty: DeclarationId(1881),
                     },
                 ],
             },
@@ -25690,11 +25690,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ModifierNotDeclared".to_string(),
-                        ty: DeclarationId(1881),
+                        ty: DeclarationId(1882),
                     },
                     Field {
                         label: "ModifierDeclared".to_string(),
-                        ty: DeclarationId(1882),
+                        ty: DeclarationId(1883),
                     },
                 ],
             },
@@ -25832,8 +25832,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(776),
             name: Some("generate_idempotency_obligations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1830)],
-                output: DeclarationId(1831),
+                inputs: vec![DeclarationId(1831)],
+                output: DeclarationId(1832),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 36640, 36910)),
             },
             type_params: vec![],
@@ -25926,15 +25926,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Uninferred".to_string(),
-                        ty: DeclarationId(1891),
+                        ty: DeclarationId(1892),
                     },
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(1892),
+                        ty: DeclarationId(1893),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(1893),
+                        ty: DeclarationId(1894),
                     },
                 ],
             },
@@ -25963,7 +25963,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "produced_by".to_string(),
-                        ty: DeclarationId(1894),
+                        ty: DeclarationId(1895),
                     },
                 ],
             },
@@ -25984,15 +25984,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LitInt".to_string(),
-                        ty: DeclarationId(1895),
+                        ty: DeclarationId(1896),
                     },
                     Field {
                         label: "LitBool".to_string(),
-                        ty: DeclarationId(1896),
+                        ty: DeclarationId(1897),
                     },
                     Field {
                         label: "LitString".to_string(),
-                        ty: DeclarationId(1897),
+                        ty: DeclarationId(1898),
                     },
                 ],
             },
@@ -26013,23 +26013,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(1898),
+                        ty: DeclarationId(1899),
                     },
                     Field {
                         label: "UnresolvedIdentifier".to_string(),
-                        ty: DeclarationId(1899),
+                        ty: DeclarationId(1900),
                     },
                     Field {
                         label: "ResolvedByStructure".to_string(),
-                        ty: DeclarationId(1900),
+                        ty: DeclarationId(1901),
                     },
                     Field {
                         label: "ResolvedByName".to_string(),
-                        ty: DeclarationId(1901),
+                        ty: DeclarationId(1902),
                     },
                     Field {
                         label: "TypeParam".to_string(),
-                        ty: DeclarationId(1902),
+                        ty: DeclarationId(1903),
                     },
                 ],
             },
@@ -26050,15 +26050,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "OneUnit".to_string(),
-                        ty: DeclarationId(1903),
+                        ty: DeclarationId(1904),
                     },
                     Field {
                         label: "AdditionalUnit".to_string(),
-                        ty: DeclarationId(1904),
+                        ty: DeclarationId(1905),
                     },
                     Field {
                         label: "UnitCount".to_string(),
-                        ty: DeclarationId(1905),
+                        ty: DeclarationId(1906),
                     },
                 ],
             },
@@ -26079,11 +26079,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ZeroWidth".to_string(),
-                        ty: DeclarationId(1906),
+                        ty: DeclarationId(1907),
                     },
                     Field {
                         label: "PositiveWidth".to_string(),
-                        ty: DeclarationId(1907),
+                        ty: DeclarationId(1908),
                     },
                 ],
             },
@@ -26104,11 +26104,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "BoundedInterval".to_string(),
-                        ty: DeclarationId(1908),
+                        ty: DeclarationId(1909),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1909),
+                        ty: DeclarationId(1910),
                     },
                 ],
             },
@@ -26163,11 +26163,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "StaticBound".to_string(),
-                        ty: DeclarationId(1911),
+                        ty: DeclarationId(1912),
                     },
                     Field {
                         label: "PlatformDependent".to_string(),
-                        ty: DeclarationId(1912),
+                        ty: DeclarationId(1913),
                     },
                 ],
             },
@@ -26188,15 +26188,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Exact".to_string(),
-                        ty: DeclarationId(1913),
+                        ty: DeclarationId(1914),
                     },
                     Field {
                         label: "AtMostOne".to_string(),
-                        ty: DeclarationId(1914),
+                        ty: DeclarationId(1915),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1915),
+                        ty: DeclarationId(1916),
                     },
                 ],
             },
@@ -26292,27 +26292,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(1916),
+                        ty: DeclarationId(1917),
                     },
                     Field {
                         label: "Reference".to_string(),
-                        ty: DeclarationId(1917),
+                        ty: DeclarationId(1918),
                     },
                     Field {
                         label: "Record".to_string(),
-                        ty: DeclarationId(1919),
+                        ty: DeclarationId(1920),
                     },
                     Field {
                         label: "List".to_string(),
-                        ty: DeclarationId(1921),
+                        ty: DeclarationId(1922),
                     },
                     Field {
                         label: "Map".to_string(),
-                        ty: DeclarationId(1923),
+                        ty: DeclarationId(1924),
                     },
                     Field {
                         label: "Variant".to_string(),
-                        ty: DeclarationId(1925),
+                        ty: DeclarationId(1926),
                     },
                 ],
             },
@@ -26333,23 +26333,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ValueBodyUnparsed".to_string(),
-                        ty: DeclarationId(1926),
+                        ty: DeclarationId(1927),
                     },
                     Field {
                         label: "ValueBodyStructural".to_string(),
-                        ty: DeclarationId(1928),
+                        ty: DeclarationId(1929),
                     },
                     Field {
                         label: "ValueBodyScalar".to_string(),
-                        ty: DeclarationId(1929),
+                        ty: DeclarationId(1930),
                     },
                     Field {
                         label: "ValueBodyList".to_string(),
-                        ty: DeclarationId(1931),
+                        ty: DeclarationId(1932),
                     },
                     Field {
                         label: "ValueBodyMap".to_string(),
-                        ty: DeclarationId(1933),
+                        ty: DeclarationId(1934),
                     },
                 ],
             },
@@ -26389,23 +26389,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UserDefined".to_string(),
-                        ty: DeclarationId(1934),
+                        ty: DeclarationId(1935),
                     },
                     Field {
                         label: "ExternalRealization".to_string(),
-                        ty: DeclarationId(1935),
+                        ty: DeclarationId(1936),
                     },
                     Field {
                         label: "Pending".to_string(),
-                        ty: DeclarationId(1936),
+                        ty: DeclarationId(1937),
                     },
                     Field {
                         label: "NoBody".to_string(),
-                        ty: DeclarationId(1937),
+                        ty: DeclarationId(1938),
                     },
                     Field {
                         label: "Unparsed".to_string(),
-                        ty: DeclarationId(1938),
+                        ty: DeclarationId(1939),
                     },
                 ],
             },
@@ -26426,27 +26426,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Atom".to_string(),
-                        ty: DeclarationId(1939),
+                        ty: DeclarationId(1940),
                     },
                     Field {
                         label: "Conj".to_string(),
-                        ty: DeclarationId(1941),
+                        ty: DeclarationId(1942),
                     },
                     Field {
                         label: "Disj".to_string(),
-                        ty: DeclarationId(1943),
+                        ty: DeclarationId(1944),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(1945),
+                        ty: DeclarationId(1946),
                     },
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(1946),
+                        ty: DeclarationId(1947),
                     },
                     Field {
                         label: "Instantiation".to_string(),
-                        ty: DeclarationId(1948),
+                        ty: DeclarationId(1949),
                     },
                 ],
             },
@@ -26471,7 +26471,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(1949),
+                        ty: DeclarationId(1950),
                     },
                     Field {
                         label: "connective".to_string(),
@@ -26479,27 +26479,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(1950),
+                        ty: DeclarationId(1951),
                     },
                     Field {
                         label: "phantom_params".to_string(),
-                        ty: DeclarationId(1951),
+                        ty: DeclarationId(1952),
                     },
                     Field {
                         label: "meta_tag".to_string(),
-                        ty: DeclarationId(1952),
+                        ty: DeclarationId(1953),
                     },
                     Field {
                         label: "inhabits".to_string(),
-                        ty: DeclarationId(1953),
+                        ty: DeclarationId(1954),
                     },
                     Field {
                         label: "value_body".to_string(),
-                        ty: DeclarationId(1954),
+                        ty: DeclarationId(1955),
                     },
                     Field {
                         label: "nominal_opacity".to_string(),
-                        ty: DeclarationId(1955),
+                        ty: DeclarationId(1956),
                     },
                     Field {
                         label: "span".to_string(),
@@ -26548,7 +26548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "permitted_accessors".to_string(),
-                    ty: DeclarationId(1956),
+                    ty: DeclarationId(1957),
                 }],
             },
             type_params: vec![],
@@ -26568,19 +26568,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Add".to_string(),
-                        ty: DeclarationId(1957),
+                        ty: DeclarationId(1958),
                     },
                     Field {
                         label: "Sub".to_string(),
-                        ty: DeclarationId(1958),
+                        ty: DeclarationId(1959),
                     },
                     Field {
                         label: "Mul".to_string(),
-                        ty: DeclarationId(1959),
+                        ty: DeclarationId(1960),
                     },
                     Field {
                         label: "Div".to_string(),
-                        ty: DeclarationId(1960),
+                        ty: DeclarationId(1961),
                     },
                 ],
             },
@@ -26601,27 +26601,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(1961),
+                        ty: DeclarationId(1962),
                     },
                     Field {
                         label: "Ne".to_string(),
-                        ty: DeclarationId(1962),
+                        ty: DeclarationId(1963),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(1963),
+                        ty: DeclarationId(1964),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(1964),
+                        ty: DeclarationId(1965),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(1965),
+                        ty: DeclarationId(1966),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(1966),
+                        ty: DeclarationId(1967),
                     },
                 ],
             },
@@ -26667,11 +26667,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "And".to_string(),
-                        ty: DeclarationId(1967),
+                        ty: DeclarationId(1968),
                     },
                     Field {
                         label: "Or".to_string(),
-                        ty: DeclarationId(1968),
+                        ty: DeclarationId(1969),
                     },
                 ],
             },
@@ -26692,15 +26692,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Arithmetic".to_string(),
-                        ty: DeclarationId(1969),
+                        ty: DeclarationId(1970),
                     },
                     Field {
                         label: "Comparison".to_string(),
-                        ty: DeclarationId(1970),
+                        ty: DeclarationId(1971),
                     },
                     Field {
                         label: "Logical".to_string(),
-                        ty: DeclarationId(1971),
+                        ty: DeclarationId(1972),
                     },
                 ],
             },
@@ -26721,19 +26721,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Callable".to_string(),
-                        ty: DeclarationId(1972),
+                        ty: DeclarationId(1973),
                     },
                     Field {
                         label: "UnresolvedFieldProject".to_string(),
-                        ty: DeclarationId(1973),
+                        ty: DeclarationId(1974),
                     },
                     Field {
                         label: "ResolvedFieldProject".to_string(),
-                        ty: DeclarationId(1974),
+                        ty: DeclarationId(1975),
                     },
                     Field {
                         label: "Operator".to_string(),
-                        ty: DeclarationId(1975),
+                        ty: DeclarationId(1976),
                     },
                 ],
             },
@@ -26754,11 +26754,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UnresolvedVariant".to_string(),
-                        ty: DeclarationId(1976),
+                        ty: DeclarationId(1977),
                     },
                     Field {
                         label: "ResolvedVariant".to_string(),
-                        ty: DeclarationId(1977),
+                        ty: DeclarationId(1978),
                     },
                 ],
             },
@@ -26816,7 +26816,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "binding".to_string(),
-                        ty: DeclarationId(1978),
+                        ty: DeclarationId(1979),
                     },
                 ],
             },
@@ -26952,11 +26952,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "members".to_string(),
-                        ty: DeclarationId(1979),
+                        ty: DeclarationId(1980),
                     },
                     Field {
                         label: "intra_cluster_calls".to_string(),
-                        ty: DeclarationId(1980),
+                        ty: DeclarationId(1981),
                     },
                 ],
             },
@@ -26977,11 +26977,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(1981),
+                        ty: DeclarationId(1982),
                     },
                     Field {
                         label: "Descent".to_string(),
-                        ty: DeclarationId(1982),
+                        ty: DeclarationId(1983),
                     },
                 ],
             },
@@ -27036,7 +27036,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "lane2_workflow".to_string(),
-                        ty: DeclarationId(1983),
+                        ty: DeclarationId(1984),
                     },
                 ],
             },
@@ -27065,7 +27065,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(1984),
+                        ty: DeclarationId(1985),
                     },
                     Field {
                         label: "result_port".to_string(),
@@ -27093,7 +27093,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "UserMatch".to_string(),
-                    ty: DeclarationId(1985),
+                    ty: DeclarationId(1986),
                 }],
             },
             type_params: vec![],
@@ -27121,7 +27121,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "paths".to_string(),
-                        ty: DeclarationId(1986),
+                        ty: DeclarationId(1987),
                     },
                     Field {
                         label: "result_port".to_string(),
@@ -27133,7 +27133,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "emit_participation".to_string(),
-                        ty: DeclarationId(1987),
+                        ty: DeclarationId(1988),
                     },
                 ],
             },
@@ -27198,7 +27198,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "UserCallable".to_string(),
-                    ty: DeclarationId(1988),
+                    ty: DeclarationId(1989),
                 }],
             },
             type_params: vec![],
@@ -27230,7 +27230,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(1989),
+                        ty: DeclarationId(1990),
                     },
                     Field {
                         label: "span".to_string(),
@@ -27238,11 +27238,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "lane2_workflow".to_string(),
-                        ty: DeclarationId(1990),
+                        ty: DeclarationId(1991),
                     },
                     Field {
                         label: "emit_participation".to_string(),
-                        ty: DeclarationId(1991),
+                        ty: DeclarationId(1992),
                     },
                 ],
             },
@@ -27263,23 +27263,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Value".to_string(),
-                        ty: DeclarationId(1992),
+                        ty: DeclarationId(1993),
                     },
                     Field {
                         label: "Transform".to_string(),
-                        ty: DeclarationId(1993),
+                        ty: DeclarationId(1994),
                     },
                     Field {
                         label: "Branch".to_string(),
-                        ty: DeclarationId(1994),
+                        ty: DeclarationId(1995),
                     },
                     Field {
                         label: "Loop".to_string(),
-                        ty: DeclarationId(1995),
+                        ty: DeclarationId(1996),
                     },
                     Field {
                         label: "Bind".to_string(),
-                        ty: DeclarationId(1996),
+                        ty: DeclarationId(1997),
                     },
                 ],
             },
@@ -27300,19 +27300,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "declarations".to_string(),
-                        ty: DeclarationId(1997),
+                        ty: DeclarationId(1998),
                     },
                     Field {
                         label: "nodes".to_string(),
-                        ty: DeclarationId(1998),
+                        ty: DeclarationId(1999),
                     },
                     Field {
                         label: "ports".to_string(),
-                        ty: DeclarationId(1999),
+                        ty: DeclarationId(2000),
                     },
                     Field {
                         label: "clusters".to_string(),
-                        ty: DeclarationId(2000),
+                        ty: DeclarationId(2001),
                     },
                 ],
             },
@@ -27379,7 +27379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("port".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(722)],
-                output: DeclarationId(1883),
+                output: DeclarationId(1884),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22297,
@@ -27401,7 +27401,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("node".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-                output: DeclarationId(1884),
+                output: DeclarationId(1885),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22355,
@@ -27423,7 +27423,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("resolve_producer".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(722)],
-                output: DeclarationId(1885),
+                output: DeclarationId(1886),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22430,
@@ -27445,7 +27445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("declaration_by_id".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(723)],
-                output: DeclarationId(1886),
+                output: DeclarationId(1887),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22819,
@@ -27467,7 +27467,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("declaration_by_name".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(230)],
-                output: DeclarationId(1887),
+                output: DeclarationId(1888),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     23694,
@@ -27489,7 +27489,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("lane2_workflow_at".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-                output: DeclarationId(1888),
+                output: DeclarationId(1889),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     24020,
@@ -27513,15 +27513,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "SingleRoot".to_string(),
-                        ty: DeclarationId(2001),
+                        ty: DeclarationId(2002),
                     },
                     Field {
                         label: "NoRoot".to_string(),
-                        ty: DeclarationId(2002),
+                        ty: DeclarationId(2003),
                     },
                     Field {
                         label: "AmbiguousRoot".to_string(),
-                        ty: DeclarationId(2004),
+                        ty: DeclarationId(2005),
                     },
                 ],
             },
@@ -27562,7 +27562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("miss_declaration_id_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1889),
+                output: DeclarationId(1890),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     28025,
@@ -27584,7 +27584,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("hit_declaration_id_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(723)],
-                output: DeclarationId(1890),
+                output: DeclarationId(1891),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     28110,
@@ -27627,15 +27627,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ShrinkEffect".to_string(),
-                        ty: DeclarationId(2029),
+                        ty: DeclarationId(2030),
                     },
                     Field {
                         label: "ProjectionEffect".to_string(),
-                        ty: DeclarationId(2030),
+                        ty: DeclarationId(2031),
                     },
                     Field {
                         label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(2031),
+                        ty: DeclarationId(2032),
                     },
                 ],
             },
@@ -27656,19 +27656,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ShapeConstant".to_string(),
-                        ty: DeclarationId(2032),
+                        ty: DeclarationId(2033),
                     },
                     Field {
                         label: "ShapeLinearScan".to_string(),
-                        ty: DeclarationId(2033),
+                        ty: DeclarationId(2034),
                     },
                     Field {
                         label: "ShapeIterateBody".to_string(),
-                        ty: DeclarationId(2034),
+                        ty: DeclarationId(2035),
                     },
                     Field {
                         label: "ShapeSortBody".to_string(),
-                        ty: DeclarationId(2035),
+                        ty: DeclarationId(2036),
                     },
                 ],
             },
@@ -27697,15 +27697,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "size_effect".to_string(),
-                        ty: DeclarationId(2036),
+                        ty: DeclarationId(2037),
                     },
                     Field {
                         label: "cost_shape".to_string(),
-                        ty: DeclarationId(2037),
+                        ty: DeclarationId(2038),
                     },
                     Field {
                         label: "callback_element_position".to_string(),
-                        ty: DeclarationId(2038),
+                        ty: DeclarationId(2039),
                     },
                 ],
             },
@@ -27730,7 +27730,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "display_name".to_string(),
-                        ty: DeclarationId(2039),
+                        ty: DeclarationId(2040),
                     },
                 ],
             },
@@ -27787,11 +27787,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DegreeTwo".to_string(),
-                        ty: DeclarationId(2040),
+                        ty: DeclarationId(2041),
                     },
                     Field {
                         label: "DegreeSuccessor".to_string(),
-                        ty: DeclarationId(2041),
+                        ty: DeclarationId(2042),
                     },
                 ],
             },
@@ -27812,31 +27812,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ConstantCost".to_string(),
-                        ty: DeclarationId(2042),
+                        ty: DeclarationId(2043),
                     },
                     Field {
                         label: "LinearCost".to_string(),
-                        ty: DeclarationId(2043),
+                        ty: DeclarationId(2044),
                     },
                     Field {
                         label: "PolynomialCost".to_string(),
-                        ty: DeclarationId(2044),
+                        ty: DeclarationId(2045),
                     },
                     Field {
                         label: "ProductCost".to_string(),
-                        ty: DeclarationId(2046),
+                        ty: DeclarationId(2047),
                     },
                     Field {
                         label: "SumCost".to_string(),
-                        ty: DeclarationId(2048),
+                        ty: DeclarationId(2049),
                     },
                     Field {
                         label: "LogCost".to_string(),
-                        ty: DeclarationId(2049),
+                        ty: DeclarationId(2050),
                     },
                     Field {
                         label: "UnknownCost".to_string(),
-                        ty: DeclarationId(2050),
+                        ty: DeclarationId(2051),
                     },
                 ],
             },
@@ -27844,7 +27844,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-            inhabits: Some(DeclarationId(2051)),
+            inhabits: Some(DeclarationId(2052)),
             value_body: None,
             refinement: None,
             nominal_opacity: None,
@@ -27898,7 +27898,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("miss_symbolic_cost_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2005),
+                output: DeclarationId(2006),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 10963, 10973)),
             },
             type_params: vec![],
@@ -27916,7 +27916,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("hit_symbolic_cost_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(849)],
-                output: DeclarationId(2006),
+                output: DeclarationId(2007),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 11047, 11062)),
             },
             type_params: vec![],
@@ -27934,7 +27934,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("two_terms".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(849), DeclarationId(849)],
-                output: DeclarationId(2007),
+                output: DeclarationId(2008),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(185))),
             },
             type_params: vec![],
@@ -27951,8 +27951,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(855),
             name: Some("many_terms".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849), DeclarationId(849), DeclarationId(2008)],
-                output: DeclarationId(2009),
+                inputs: vec![DeclarationId(849), DeclarationId(849), DeclarationId(2009)],
+                output: DeclarationId(2010),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(187))),
             },
             type_params: vec![],
@@ -28077,7 +28077,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(862),
             name: Some("max_path".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2010)],
+                inputs: vec![DeclarationId(2011)],
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(220))),
             },
@@ -28134,35 +28134,35 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ClassConstant".to_string(),
-                        ty: DeclarationId(2052),
+                        ty: DeclarationId(2053),
                     },
                     Field {
                         label: "ClassLog".to_string(),
-                        ty: DeclarationId(2053),
+                        ty: DeclarationId(2054),
                     },
                     Field {
                         label: "ClassLinear".to_string(),
-                        ty: DeclarationId(2054),
+                        ty: DeclarationId(2055),
                     },
                     Field {
                         label: "ClassLinearithmic".to_string(),
-                        ty: DeclarationId(2055),
+                        ty: DeclarationId(2056),
                     },
                     Field {
                         label: "ClassQuadratic".to_string(),
-                        ty: DeclarationId(2056),
+                        ty: DeclarationId(2057),
                     },
                     Field {
                         label: "ClassPolynomial".to_string(),
-                        ty: DeclarationId(2057),
+                        ty: DeclarationId(2058),
                     },
                     Field {
                         label: "ClassExponential".to_string(),
-                        ty: DeclarationId(2058),
+                        ty: DeclarationId(2059),
                     },
                     Field {
                         label: "ClassUnknown".to_string(),
-                        ty: DeclarationId(2059),
+                        ty: DeclarationId(2060),
                     },
                 ],
             },
@@ -28170,7 +28170,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-            inhabits: Some(DeclarationId(2060)),
+            inhabits: Some(DeclarationId(2061)),
             value_body: None,
             refinement: None,
             nominal_opacity: None,
@@ -28270,8 +28270,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(871),
             name: Some("nsl_to_list".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2011)],
-                output: DeclarationId(2012),
+                inputs: vec![DeclarationId(2012)],
+                output: DeclarationId(2013),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(366))),
             },
             type_params: vec![],
@@ -28288,8 +28288,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(872),
             name: Some("drop_additive_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2013)],
-                output: DeclarationId(2014),
+                inputs: vec![DeclarationId(2014)],
+                output: DeclarationId(2015),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(379))),
             },
             type_params: vec![],
@@ -28306,8 +28306,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(873),
             name: Some("collapse_on_multiplicative_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2015)],
-                output: DeclarationId(2016),
+                inputs: vec![DeclarationId(2016)],
+                output: DeclarationId(2017),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(386))),
             },
             type_params: vec![],
@@ -28324,7 +28324,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(874),
             name: Some("any_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2017)],
+                inputs: vec![DeclarationId(2018)],
                 output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(395))),
             },
@@ -28342,8 +28342,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(875),
             name: Some("drop_multiplicative_one".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2018)],
-                output: DeclarationId(2019),
+                inputs: vec![DeclarationId(2019)],
+                output: DeclarationId(2020),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(408))),
             },
             type_params: vec![],
@@ -28396,7 +28396,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(878),
             name: Some("reduce_sum".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2020)],
+                inputs: vec![DeclarationId(2021)],
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(440))),
             },
@@ -28414,7 +28414,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(879),
             name: Some("wrap_sum".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2021)],
+                inputs: vec![DeclarationId(2022)],
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(452))),
             },
@@ -28432,7 +28432,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(880),
             name: Some("reduce_product".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2022)],
+                inputs: vec![DeclarationId(2023)],
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(469))),
             },
@@ -28581,8 +28581,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(888),
             name: Some("filter_not_dominated_by".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2023), DeclarationId(849)],
-                output: DeclarationId(2024),
+                inputs: vec![DeclarationId(2024), DeclarationId(849)],
+                output: DeclarationId(2025),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(517))),
             },
             type_params: vec![],
@@ -28599,8 +28599,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(889),
             name: Some("drop_dominated_step".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2025), DeclarationId(849)],
-                output: DeclarationId(2026),
+                inputs: vec![DeclarationId(2026), DeclarationId(849)],
+                output: DeclarationId(2027),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(524))),
             },
             type_params: vec![],
@@ -28617,8 +28617,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(890),
             name: Some("drop_dominated".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2027)],
-                output: DeclarationId(2028),
+                inputs: vec![DeclarationId(2028)],
+                output: DeclarationId(2029),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(527))),
             },
             type_params: vec![],
@@ -28638,10 +28638,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 inputs: vec![
                     DeclarationId(147),
                     DeclarationId(230),
-                    DeclarationId(2088),
-                    DeclarationId(93),
                     DeclarationId(2089),
+                    DeclarationId(93),
                     DeclarationId(2090),
+                    DeclarationId(2091),
                 ],
                 output: DeclarationId(912),
                 body: ArrowBody::Unparsed(SourceSpan::new(
@@ -28672,7 +28672,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2091)),
+            meta_tag: Some(DeclarationId(2092)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![])),
@@ -28687,11 +28687,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UserMessage".to_string(),
-                        ty: DeclarationId(2093),
+                        ty: DeclarationId(2094),
                     },
                     Field {
                         label: "AssistantMessage".to_string(),
-                        ty: DeclarationId(2095),
+                        ty: DeclarationId(2096),
                     },
                 ],
             },
@@ -28712,11 +28712,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Base64Image".to_string(),
-                        ty: DeclarationId(2096),
+                        ty: DeclarationId(2097),
                     },
                     Field {
                         label: "UrlImage".to_string(),
-                        ty: DeclarationId(2097),
+                        ty: DeclarationId(2098),
                     },
                 ],
             },
@@ -28737,11 +28737,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "TextContent".to_string(),
-                        ty: DeclarationId(2098),
+                        ty: DeclarationId(2099),
                     },
                     Field {
                         label: "ImageContent".to_string(),
-                        ty: DeclarationId(2099),
+                        ty: DeclarationId(2100),
                     },
                 ],
             },
@@ -28800,11 +28800,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ToolResultText".to_string(),
-                        ty: DeclarationId(2100),
+                        ty: DeclarationId(2101),
                     },
                     Field {
                         label: "ToolResultBlocks".to_string(),
-                        ty: DeclarationId(2102),
+                        ty: DeclarationId(2103),
                     },
                 ],
             },
@@ -28824,7 +28824,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Text".to_string(),
-                    ty: DeclarationId(2103),
+                    ty: DeclarationId(2104),
                 }],
             },
             type_params: vec![],
@@ -28843,7 +28843,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "TextPlain".to_string(),
-                    ty: DeclarationId(2104),
+                    ty: DeclarationId(2105),
                 }],
             },
             type_params: vec![],
@@ -28888,23 +28888,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "AnthropicTextBlock".to_string(),
-                        ty: DeclarationId(2105),
+                        ty: DeclarationId(2106),
                     },
                     Field {
                         label: "AnthropicImageBlock".to_string(),
-                        ty: DeclarationId(2106),
+                        ty: DeclarationId(2107),
                     },
                     Field {
                         label: "AnthropicDocumentBlock".to_string(),
-                        ty: DeclarationId(2107),
+                        ty: DeclarationId(2108),
                     },
                     Field {
                         label: "AnthropicSearchResultBlock".to_string(),
-                        ty: DeclarationId(2111),
+                        ty: DeclarationId(2112),
                     },
                     Field {
                         label: "AnthropicToolReferenceBlock".to_string(),
-                        ty: DeclarationId(2112),
+                        ty: DeclarationId(2113),
                     },
                 ],
             },
@@ -28954,11 +28954,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UserTextBlock".to_string(),
-                        ty: DeclarationId(2113),
+                        ty: DeclarationId(2114),
                     },
                     Field {
                         label: "UserToolResultBlock".to_string(),
-                        ty: DeclarationId(2116),
+                        ty: DeclarationId(2117),
                     },
                 ],
             },
@@ -28979,11 +28979,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "AssistantTextBlock".to_string(),
-                        ty: DeclarationId(2117),
+                        ty: DeclarationId(2118),
                     },
                     Field {
                         label: "AssistantToolUseBlock".to_string(),
-                        ty: DeclarationId(2118),
+                        ty: DeclarationId(2119),
                     },
                 ],
             },
@@ -29004,31 +29004,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "EndTurn".to_string(),
-                        ty: DeclarationId(2119),
+                        ty: DeclarationId(2120),
                     },
                     Field {
                         label: "MaxTokens".to_string(),
-                        ty: DeclarationId(2120),
+                        ty: DeclarationId(2121),
                     },
                     Field {
                         label: "StopSequence".to_string(),
-                        ty: DeclarationId(2121),
+                        ty: DeclarationId(2122),
                     },
                     Field {
                         label: "ToolUse".to_string(),
-                        ty: DeclarationId(2122),
+                        ty: DeclarationId(2123),
                     },
                     Field {
                         label: "PauseTurn".to_string(),
-                        ty: DeclarationId(2123),
+                        ty: DeclarationId(2124),
                     },
                     Field {
                         label: "Refusal".to_string(),
-                        ty: DeclarationId(2124),
+                        ty: DeclarationId(2125),
                     },
                     Field {
                         label: "ModelContextWindowExceeded".to_string(),
-                        ty: DeclarationId(2125),
+                        ty: DeclarationId(2126),
                     },
                 ],
             },
@@ -29049,23 +29049,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "CharLocation".to_string(),
-                        ty: DeclarationId(2128),
+                        ty: DeclarationId(2129),
                     },
                     Field {
                         label: "PageLocation".to_string(),
-                        ty: DeclarationId(2131),
+                        ty: DeclarationId(2132),
                     },
                     Field {
                         label: "ContentBlockLocation".to_string(),
-                        ty: DeclarationId(2134),
+                        ty: DeclarationId(2135),
                     },
                     Field {
                         label: "WebSearchResultLocation".to_string(),
-                        ty: DeclarationId(2136),
+                        ty: DeclarationId(2137),
                     },
                     Field {
                         label: "SearchResultLocation".to_string(),
-                        ty: DeclarationId(2138),
+                        ty: DeclarationId(2139),
                     },
                 ],
             },
@@ -29086,27 +29086,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "MessagesTextBlock".to_string(),
-                        ty: DeclarationId(2141),
+                        ty: DeclarationId(2142),
                     },
                     Field {
                         label: "MessagesThinkingBlock".to_string(),
-                        ty: DeclarationId(2142),
+                        ty: DeclarationId(2143),
                     },
                     Field {
                         label: "MessagesRedactedThinkingBlock".to_string(),
-                        ty: DeclarationId(2143),
+                        ty: DeclarationId(2144),
                     },
                     Field {
                         label: "MessagesToolUseBlock".to_string(),
-                        ty: DeclarationId(2145),
+                        ty: DeclarationId(2146),
                     },
                     Field {
                         label: "MessagesServerToolUseBlock".to_string(),
-                        ty: DeclarationId(2147),
+                        ty: DeclarationId(2148),
                     },
                     Field {
                         label: "MessagesWebSearchToolResultBlock".to_string(),
-                        ty: DeclarationId(2149),
+                        ty: DeclarationId(2150),
                     },
                 ],
             },
@@ -29127,35 +29127,35 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "WebSearch".to_string(),
-                        ty: DeclarationId(2150),
+                        ty: DeclarationId(2151),
                     },
                     Field {
                         label: "WebFetch".to_string(),
-                        ty: DeclarationId(2151),
+                        ty: DeclarationId(2152),
                     },
                     Field {
                         label: "CodeExecution".to_string(),
-                        ty: DeclarationId(2152),
+                        ty: DeclarationId(2153),
                     },
                     Field {
                         label: "BashCodeExecution".to_string(),
-                        ty: DeclarationId(2153),
+                        ty: DeclarationId(2154),
                     },
                     Field {
                         label: "TextEditorCodeExecution".to_string(),
-                        ty: DeclarationId(2154),
+                        ty: DeclarationId(2155),
                     },
                     Field {
                         label: "ToolSearchToolRegex".to_string(),
-                        ty: DeclarationId(2155),
+                        ty: DeclarationId(2156),
                     },
                     Field {
                         label: "ToolSearchToolBm25".to_string(),
-                        ty: DeclarationId(2156),
+                        ty: DeclarationId(2157),
                     },
                     Field {
                         label: "Advisor".to_string(),
-                        ty: DeclarationId(2157),
+                        ty: DeclarationId(2158),
                     },
                 ],
             },
@@ -29184,15 +29184,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "cache_creation_input_tokens".to_string(),
-                        ty: DeclarationId(2158),
+                        ty: DeclarationId(2159),
                     },
                     Field {
                         label: "cache_read_input_tokens".to_string(),
-                        ty: DeclarationId(2159),
+                        ty: DeclarationId(2160),
                     },
                     Field {
                         label: "service_tier".to_string(),
-                        ty: DeclarationId(2160),
+                        ty: DeclarationId(2161),
                     },
                 ],
             },
@@ -29212,7 +29212,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Assistant".to_string(),
-                    ty: DeclarationId(2161),
+                    ty: DeclarationId(2162),
                 }],
             },
             type_params: vec![],
@@ -29244,7 +29244,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(2162),
+                        ty: DeclarationId(2163),
                     },
                     Field {
                         label: "model".to_string(),
@@ -29256,7 +29256,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "stop_sequence".to_string(),
-                        ty: DeclarationId(2163),
+                        ty: DeclarationId(2164),
                     },
                     Field {
                         label: "usage".to_string(),
@@ -29264,7 +29264,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "container".to_string(),
-                        ty: DeclarationId(2164),
+                        ty: DeclarationId(2165),
                     },
                 ],
             },
@@ -29314,23 +29314,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "StdAuthority".to_string(),
-                        ty: DeclarationId(2165),
+                        ty: DeclarationId(2166),
                     },
                     Field {
                         label: "V3StdAuthority".to_string(),
-                        ty: DeclarationId(2166),
+                        ty: DeclarationId(2167),
                     },
                     Field {
                         label: "V3SpecAuthority".to_string(),
-                        ty: DeclarationId(2167),
+                        ty: DeclarationId(2168),
                     },
                     Field {
                         label: "CompilerAuthority".to_string(),
-                        ty: DeclarationId(2168),
+                        ty: DeclarationId(2169),
                     },
                     Field {
                         label: "ExtdepsFixtureAuthority".to_string(),
-                        ty: DeclarationId(2169),
+                        ty: DeclarationId(2170),
                     },
                 ],
             },
@@ -29387,483 +29387,483 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "dsl/std/logic.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2165),
+                            constructor: DeclarationId(2166),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/bit.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2165),
+                            constructor: DeclarationId(2166),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/error_primitives.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2165),
+                            constructor: DeclarationId(2166),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/algebra.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2165),
+                            constructor: DeclarationId(2166),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/magnitude.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2165),
+                            constructor: DeclarationId(2166),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/machine_constraints.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2165),
+                            constructor: DeclarationId(2166),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/nat.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2165),
+                            constructor: DeclarationId(2166),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/integer.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2165),
+                            constructor: DeclarationId(2166),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/rational.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2165),
+                            constructor: DeclarationId(2166),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/float.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2165),
+                            constructor: DeclarationId(2166),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/types.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2165),
+                            constructor: DeclarationId(2166),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/string_type.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2165),
+                            constructor: DeclarationId(2166),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/unicode.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2165),
+                            constructor: DeclarationId(2166),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/render_repeat_string_bootstrap.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2165),
+                            constructor: DeclarationId(2166),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/methods.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2165),
+                            constructor: DeclarationId(2166),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/serialization.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2165),
+                            constructor: DeclarationId(2166),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/algebra.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_messages.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_operations.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_schema.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/approximate_field.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bin_shim.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bootstrap_authority.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bridge_ledger.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/clean_emission.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/computation.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/computation_model.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/coproduct_projection.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/cross_target_coverage.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/diagnostics.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/dimensions.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/effects.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/emission_provenance.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/emit_model.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/extdeps_bootstrap_fixtures.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/go_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/induction.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/integer_diagnostic_order.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lens.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lens_application.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/list.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lookup.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/methods.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/parse_surface.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/python_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/resources.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/runtime.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/rust_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/services.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/substrate.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/substrate_minimal.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/termination.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/t_ci_workflow_as_data_demo.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/timing_lens.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/tokenize.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/verification.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/workflows.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2167),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/v3_l1.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2168),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/go.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2168),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/python.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2168),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/rust.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2168),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/pipeline.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2168),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/operators.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2168),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/regen.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2168),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/languages/rust/primitives.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2169),
+                            constructor: DeclarationId(2170),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/cron_schedule_model.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2169),
+                            constructor: DeclarationId(2170),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/github/github.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2169),
+                            constructor: DeclarationId(2170),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/github/actions.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2169),
+                            constructor: DeclarationId(2170),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/github/ci.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2169),
+                            constructor: DeclarationId(2170),
                             payload: vec![],
                         },
                     ),
@@ -29881,11 +29881,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Retired".to_string(),
-                        ty: DeclarationId(2170),
+                        ty: DeclarationId(2171),
                     },
                     Field {
                         label: "Open".to_string(),
-                        ty: DeclarationId(2171),
+                        ty: DeclarationId(2172),
                     },
                 ],
             },
@@ -29951,7 +29951,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6389, 6499),
         });
-        declarations.push(Declaration { id: DeclarationId(920), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(919) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2172)), 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(2171), 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(2170), 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(2170), 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(2170), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-pb-bridge-canonical-lens-name-dispatch-closure.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(2170), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/l1_5_fixed_point_test.rs".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(2170), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/bridge_lower_helpers_patch_zero_residual_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_semantic_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2171), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-v-bridge-row-4-exact-string-deeper-detail-receipt.md".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6963, 8416) });
+        declarations.push(Declaration { id: DeclarationId(920), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(919) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2173)), 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(2172), 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(2171), 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(2171), 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(2171), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-pb-bridge-canonical-lens-name-dispatch-closure.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(2171), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/l1_5_fixed_point_test.rs".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(2171), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/bridge_lower_helpers_patch_zero_residual_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_semantic_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2172), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-v-bridge-row-4-exact-string-deeper-detail-receipt.md".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6963, 8416) });
         declarations.push(Declaration {
             id: DeclarationId(921),
             name: Some("CleanEmissionContract".to_string()),
@@ -30037,15 +30037,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "WrapEverything".to_string(),
-                        ty: DeclarationId(2173),
+                        ty: DeclarationId(2174),
                     },
                     Field {
                         label: "WrapOnlyInOperandPosition".to_string(),
-                        ty: DeclarationId(2174),
+                        ty: DeclarationId(2175),
                     },
                     Field {
                         label: "NoWrapping".to_string(),
-                        ty: DeclarationId(2175),
+                        ty: DeclarationId(2176),
                     },
                 ],
             },
@@ -30066,19 +30066,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "EmitBindingAlways".to_string(),
-                        ty: DeclarationId(2176),
+                        ty: DeclarationId(2177),
                     },
                     Field {
                         label: "EmitUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(2177),
+                        ty: DeclarationId(2178),
                     },
                     Field {
                         label: "EmitPrefixedUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(2178),
+                        ty: DeclarationId(2179),
                     },
                     Field {
                         label: "NotApplicablePatternBinding".to_string(),
-                        ty: DeclarationId(2179),
+                        ty: DeclarationId(2180),
                     },
                 ],
             },
@@ -30099,11 +30099,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "AccessFromPayloadBinding".to_string(),
-                        ty: DeclarationId(2180),
+                        ty: DeclarationId(2181),
                     },
                     Field {
                         label: "OverrideNamedFieldsAtBindingSite".to_string(),
-                        ty: DeclarationId(2181),
+                        ty: DeclarationId(2182),
                     },
                 ],
             },
@@ -30124,15 +30124,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ImportEverythingDeclared".to_string(),
-                        ty: DeclarationId(2182),
+                        ty: DeclarationId(2183),
                     },
                     Field {
                         label: "IncludeOnlyReferenced".to_string(),
-                        ty: DeclarationId(2183),
+                        ty: DeclarationId(2184),
                     },
                     Field {
                         label: "ImportPerUsageSite".to_string(),
-                        ty: DeclarationId(2184),
+                        ty: DeclarationId(2185),
                     },
                 ],
             },
@@ -30153,15 +30153,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "WrapReturnValue".to_string(),
-                        ty: DeclarationId(2185),
+                        ty: DeclarationId(2186),
                     },
                     Field {
                         label: "NoWrappingOnTerminalExpression".to_string(),
-                        ty: DeclarationId(2186),
+                        ty: DeclarationId(2187),
                     },
                     Field {
                         label: "ExplicitReturnKeyword".to_string(),
-                        ty: DeclarationId(2187),
+                        ty: DeclarationId(2188),
                     },
                 ],
             },
@@ -30182,15 +30182,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "EmitLetBindingAlways".to_string(),
-                        ty: DeclarationId(2188),
+                        ty: DeclarationId(2189),
                     },
                     Field {
                         label: "EmitLetUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(2189),
+                        ty: DeclarationId(2190),
                     },
                     Field {
                         label: "OmitLetBinding".to_string(),
-                        ty: DeclarationId(2190),
+                        ty: DeclarationId(2191),
                     },
                 ],
             },
@@ -30211,15 +30211,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "WrapBody".to_string(),
-                        ty: DeclarationId(2191),
+                        ty: DeclarationId(2192),
                     },
                     Field {
                         label: "NoWrappingOnNonComplexBody".to_string(),
-                        ty: DeclarationId(2192),
+                        ty: DeclarationId(2193),
                     },
                     Field {
                         label: "NotApplicableMatchArmBody".to_string(),
-                        ty: DeclarationId(2193),
+                        ty: DeclarationId(2194),
                     },
                 ],
             },
@@ -30277,7 +30277,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2194),
+                        ty: DeclarationId(2195),
                     },
                     Field {
                         label: "syntax_only".to_string(),
@@ -30310,19 +30310,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IgnoreVerifierOutput".to_string(),
-                        ty: DeclarationId(2195),
+                        ty: DeclarationId(2196),
                     },
                     Field {
                         label: "RequireEmptyStdout".to_string(),
-                        ty: DeclarationId(2196),
+                        ty: DeclarationId(2197),
                     },
                     Field {
                         label: "RequireEmptyStderr".to_string(),
-                        ty: DeclarationId(2197),
+                        ty: DeclarationId(2198),
                     },
                     Field {
                         label: "RequireEmptyStdoutAndStderr".to_string(),
-                        ty: DeclarationId(2198),
+                        ty: DeclarationId(2199),
                     },
                 ],
             },
@@ -30343,35 +30343,35 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "CollectionSize".to_string(),
-                        ty: DeclarationId(2205),
+                        ty: DeclarationId(2206),
                     },
                     Field {
                         label: "ParserStreamSize".to_string(),
-                        ty: DeclarationId(2206),
+                        ty: DeclarationId(2207),
                     },
                     Field {
                         label: "WorklistDrainSize".to_string(),
-                        ty: DeclarationId(2207),
+                        ty: DeclarationId(2208),
                     },
                     Field {
                         label: "TreeSize".to_string(),
-                        ty: DeclarationId(2208),
+                        ty: DeclarationId(2209),
                     },
                     Field {
                         label: "ArithmeticParam".to_string(),
-                        ty: DeclarationId(2209),
+                        ty: DeclarationId(2210),
                     },
                     Field {
                         label: "ExplicitCountZero".to_string(),
-                        ty: DeclarationId(2210),
+                        ty: DeclarationId(2211),
                     },
                     Field {
                         label: "ExplicitCountPositive".to_string(),
-                        ty: DeclarationId(2211),
+                        ty: DeclarationId(2212),
                     },
                     Field {
                         label: "Forever".to_string(),
-                        ty: DeclarationId(2212),
+                        ty: DeclarationId(2213),
                     },
                 ],
             },
@@ -30414,35 +30414,35 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ChildAccessorCall".to_string(),
-                        ty: DeclarationId(2213),
+                        ty: DeclarationId(2214),
                     },
                     Field {
                         label: "CollectionShrinkCall".to_string(),
-                        ty: DeclarationId(2214),
+                        ty: DeclarationId(2215),
                     },
                     Field {
                         label: "ArithmeticSubtractCall".to_string(),
-                        ty: DeclarationId(2215),
+                        ty: DeclarationId(2216),
                     },
                     Field {
                         label: "ArithmeticDivideCall".to_string(),
-                        ty: DeclarationId(2216),
+                        ty: DeclarationId(2217),
                     },
                     Field {
                         label: "ParserAdvanceCall".to_string(),
-                        ty: DeclarationId(2217),
+                        ty: DeclarationId(2218),
                     },
                     Field {
                         label: "WorklistDrainCall".to_string(),
-                        ty: DeclarationId(2218),
+                        ty: DeclarationId(2219),
                     },
                     Field {
                         label: "FoldBodyCall".to_string(),
-                        ty: DeclarationId(2219),
+                        ty: DeclarationId(2220),
                     },
                     Field {
                         label: "SameArgumentCall".to_string(),
-                        ty: DeclarationId(2220),
+                        ty: DeclarationId(2221),
                     },
                 ],
             },
@@ -30461,7 +30461,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("per_call_pattern_at".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-                output: DeclarationId(2199),
+                output: DeclarationId(2200),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     2764,
@@ -30483,7 +30483,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("per_call_descent_operand_port".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-                output: DeclarationId(2200),
+                output: DeclarationId(2201),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     2969,
@@ -30507,15 +30507,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UnitShrink".to_string(),
-                        ty: DeclarationId(2221),
+                        ty: DeclarationId(2222),
                     },
                     Field {
                         label: "ConstantShrink".to_string(),
-                        ty: DeclarationId(2222),
+                        ty: DeclarationId(2223),
                     },
                     Field {
                         label: "ProportionalShrink".to_string(),
-                        ty: DeclarationId(2223),
+                        ty: DeclarationId(2224),
                     },
                 ],
             },
@@ -30536,15 +30536,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Fold".to_string(),
-                        ty: DeclarationId(2224),
+                        ty: DeclarationId(2225),
                     },
                     Field {
                         label: "Descend".to_string(),
-                        ty: DeclarationId(2225),
+                        ty: DeclarationId(2226),
                     },
                     Field {
                         label: "Repeat".to_string(),
-                        ty: DeclarationId(2226),
+                        ty: DeclarationId(2227),
                     },
                 ],
             },
@@ -30577,7 +30577,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "factor".to_string(),
-                        ty: DeclarationId(2227),
+                        ty: DeclarationId(2228),
                     },
                 ],
             },
@@ -30618,7 +30618,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("size_bound_param".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(933)],
-                output: DeclarationId(2201),
+                output: DeclarationId(2202),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     5787,
@@ -30684,7 +30684,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("constant_bound_value".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(933)],
-                output: DeclarationId(2202),
+                output: DeclarationId(2203),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     6715,
@@ -30708,15 +30708,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "TreeDescent".to_string(),
-                        ty: DeclarationId(2228),
+                        ty: DeclarationId(2229),
                     },
                     Field {
                         label: "CollectionFold".to_string(),
-                        ty: DeclarationId(2229),
+                        ty: DeclarationId(2230),
                     },
                     Field {
                         label: "ArithmeticRepeat".to_string(),
-                        ty: DeclarationId(2230),
+                        ty: DeclarationId(2231),
                     },
                 ],
             },
@@ -30735,7 +30735,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("algebra_profile_to_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(53)],
-                output: DeclarationId(2203),
+                output: DeclarationId(2204),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     7781,
@@ -30757,7 +30757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("type_iteration_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230)],
-                output: DeclarationId(2204),
+                output: DeclarationId(2205),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     8346,
@@ -30781,11 +30781,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Immutable".to_string(),
-                        ty: DeclarationId(2231),
+                        ty: DeclarationId(2232),
                     },
                     Field {
                         label: "Mutable".to_string(),
-                        ty: DeclarationId(2232),
+                        ty: DeclarationId(2233),
                     },
                 ],
             },
@@ -30806,11 +30806,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Pure".to_string(),
-                        ty: DeclarationId(2233),
+                        ty: DeclarationId(2234),
                     },
                     Field {
                         label: "Effectful".to_string(),
-                        ty: DeclarationId(2234),
+                        ty: DeclarationId(2235),
                     },
                 ],
             },
@@ -30831,11 +30831,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ExplicitDAG".to_string(),
-                        ty: DeclarationId(2235),
+                        ty: DeclarationId(2236),
                     },
                     Field {
                         label: "Arbitrary".to_string(),
-                        ty: DeclarationId(2236),
+                        ty: DeclarationId(2237),
                     },
                 ],
             },
@@ -30856,11 +30856,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Bounded".to_string(),
-                        ty: DeclarationId(2237),
+                        ty: DeclarationId(2238),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(2238),
+                        ty: DeclarationId(2239),
                     },
                 ],
             },
@@ -30924,28 +30924,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "mutability".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2231),
+                            constructor: DeclarationId(2232),
                             payload: vec![],
                         },
                     ),
                     (
                         "purity".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2233),
+                            constructor: DeclarationId(2234),
                             payload: vec![],
                         },
                     ),
                     (
                         "structure".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2235),
+                            constructor: DeclarationId(2236),
                             payload: vec![],
                         },
                     ),
                     (
                         "iteration".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2237),
+                            constructor: DeclarationId(2238),
                             payload: vec![],
                         },
                     ),
@@ -30962,19 +30962,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ValueOnly".to_string(),
-                        ty: DeclarationId(2239),
+                        ty: DeclarationId(2240),
                     },
                     Field {
                         label: "GarbageCollected".to_string(),
-                        ty: DeclarationId(2240),
+                        ty: DeclarationId(2241),
                     },
                     Field {
                         label: "RefCounted".to_string(),
-                        ty: DeclarationId(2241),
+                        ty: DeclarationId(2242),
                     },
                     Field {
                         label: "OwnershipBased".to_string(),
-                        ty: DeclarationId(2242),
+                        ty: DeclarationId(2243),
                     },
                 ],
             },
@@ -30995,11 +30995,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LexicalScoping".to_string(),
-                        ty: DeclarationId(2243),
+                        ty: DeclarationId(2244),
                     },
                     Field {
                         label: "DynamicScoping".to_string(),
-                        ty: DeclarationId(2244),
+                        ty: DeclarationId(2245),
                     },
                 ],
             },
@@ -31044,7 +31044,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "excluded_prefixes".to_string(),
-                    ty: DeclarationId(2245),
+                    ty: DeclarationId(2246),
                 }],
             },
             type_params: vec![],
@@ -31068,7 +31068,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "additional_excluded_prefixes".to_string(),
-                        ty: DeclarationId(2246),
+                        ty: DeclarationId(2247),
                     },
                 ],
             },
@@ -31116,11 +31116,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "OwnershipBased".to_string(),
-                        ty: DeclarationId(2247),
+                        ty: DeclarationId(2248),
                     },
                     Field {
                         label: "GarbageCollected".to_string(),
-                        ty: DeclarationId(2248),
+                        ty: DeclarationId(2249),
                     },
                 ],
             },
@@ -31157,7 +31157,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "StringTag".to_string(),
-                    ty: DeclarationId(2249),
+                    ty: DeclarationId(2250),
                 }],
             },
             type_params: vec![],
@@ -31177,11 +31177,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Empty".to_string(),
-                        ty: DeclarationId(2250),
+                        ty: DeclarationId(2251),
                     },
                     Field {
                         label: "Populated".to_string(),
-                        ty: DeclarationId(2251),
+                        ty: DeclarationId(2252),
                     },
                 ],
             },
@@ -31235,7 +31235,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "variant_projections".to_string(),
-                        ty: DeclarationId(2252),
+                        ty: DeclarationId(2253),
                     },
                 ],
             },
@@ -31336,27 +31336,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Atom".to_string(),
-                        ty: DeclarationId(2253),
+                        ty: DeclarationId(2254),
                     },
                     Field {
                         label: "Conj".to_string(),
-                        ty: DeclarationId(2254),
+                        ty: DeclarationId(2255),
                     },
                     Field {
                         label: "Disj".to_string(),
-                        ty: DeclarationId(2255),
+                        ty: DeclarationId(2256),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2256),
+                        ty: DeclarationId(2257),
                     },
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(2257),
+                        ty: DeclarationId(2258),
                     },
                     Field {
                         label: "Instantiation".to_string(),
-                        ty: DeclarationId(2258),
+                        ty: DeclarationId(2259),
                     },
                 ],
             },
@@ -31377,23 +31377,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Value".to_string(),
-                        ty: DeclarationId(2259),
+                        ty: DeclarationId(2260),
                     },
                     Field {
                         label: "Transform".to_string(),
-                        ty: DeclarationId(2260),
+                        ty: DeclarationId(2261),
                     },
                     Field {
                         label: "Branch".to_string(),
-                        ty: DeclarationId(2261),
+                        ty: DeclarationId(2262),
                     },
                     Field {
                         label: "Loop".to_string(),
-                        ty: DeclarationId(2262),
+                        ty: DeclarationId(2263),
                     },
                     Field {
                         label: "Bind".to_string(),
-                        ty: DeclarationId(2263),
+                        ty: DeclarationId(2264),
                     },
                 ],
             },
@@ -31468,7 +31468,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "cells".to_string(),
-                        ty: DeclarationId(2264),
+                        ty: DeclarationId(2265),
                     },
                 ],
             },
@@ -31494,7 +31494,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2265)),
+            meta_tag: Some(DeclarationId(2266)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -31521,14 +31521,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -31558,14 +31558,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -31595,14 +31595,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -31632,14 +31632,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -31669,14 +31669,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -31706,14 +31706,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -31743,14 +31743,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -31780,14 +31780,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -31817,14 +31817,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -31854,14 +31854,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -31891,14 +31891,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -31928,14 +31928,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -31965,14 +31965,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -32002,14 +32002,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -32039,14 +32039,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -32076,14 +32076,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -32113,14 +32113,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -32150,14 +32150,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -32187,14 +32187,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -32224,14 +32224,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -32261,14 +32261,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -32298,14 +32298,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -32335,14 +32335,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -32372,14 +32372,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -32409,14 +32409,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -32446,14 +32446,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -32483,14 +32483,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -32520,14 +32520,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -32557,14 +32557,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -32594,14 +32594,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -32631,14 +32631,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -32668,14 +32668,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -32705,14 +32705,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -32742,14 +32742,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -32779,14 +32779,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -32816,14 +32816,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -32853,14 +32853,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -32890,14 +32890,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -32927,14 +32927,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -32964,14 +32964,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -33001,14 +33001,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2257),
+                                    constructor: DeclarationId(2258),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2260),
+                                    constructor: DeclarationId(2261),
                                     payload: vec![],
                                 },
                             ),
@@ -33027,43 +33027,43 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-                        ty: DeclarationId(2266),
+                        ty: DeclarationId(2267),
                     },
                     Field {
                         label: "ParseError".to_string(),
-                        ty: DeclarationId(2267),
+                        ty: DeclarationId(2268),
                     },
                     Field {
                         label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(2268),
+                        ty: DeclarationId(2269),
                     },
                     Field {
                         label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(2269),
+                        ty: DeclarationId(2270),
                     },
                     Field {
                         label: "ResolveError".to_string(),
-                        ty: DeclarationId(2270),
+                        ty: DeclarationId(2271),
                     },
                     Field {
                         label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(2271),
+                        ty: DeclarationId(2272),
                     },
                     Field {
                         label: "BranchConditionNotBool".to_string(),
-                        ty: DeclarationId(2272),
+                        ty: DeclarationId(2273),
                     },
                     Field {
                         label: "MagnitudeOutOfRange".to_string(),
-                        ty: DeclarationId(2273),
+                        ty: DeclarationId(2274),
                     },
                     Field {
                         label: "MalformedIntegerRangeFact".to_string(),
-                        ty: DeclarationId(2274),
+                        ty: DeclarationId(2275),
                     },
                     Field {
                         label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(2275),
+                        ty: DeclarationId(2276),
                     },
                 ],
             },
@@ -33157,11 +33157,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "CompilerKind".to_string(),
-                        ty: DeclarationId(2276),
+                        ty: DeclarationId(2277),
                     },
                     Field {
                         label: "LensInstanceKind".to_string(),
-                        ty: DeclarationId(2277),
+                        ty: DeclarationId(2278),
                     },
                 ],
             },
@@ -33194,7 +33194,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "fixes".to_string(),
-                        ty: DeclarationId(2278),
+                        ty: DeclarationId(2279),
                     },
                 ],
             },
@@ -33215,31 +33215,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UnderRefined".to_string(),
-                        ty: DeclarationId(2279),
+                        ty: DeclarationId(2280),
                     },
                     Field {
                         label: "NoInhabitant".to_string(),
-                        ty: DeclarationId(2280),
+                        ty: DeclarationId(2281),
                     },
                     Field {
                         label: "ContradictoryUse".to_string(),
-                        ty: DeclarationId(2282),
+                        ty: DeclarationId(2283),
                     },
                     Field {
                         label: "OutOfR2Scope".to_string(),
-                        ty: DeclarationId(2283),
+                        ty: DeclarationId(2284),
                     },
                     Field {
                         label: "LifetimeProgramExtractionPending".to_string(),
-                        ty: DeclarationId(2284),
+                        ty: DeclarationId(2285),
                     },
                     Field {
                         label: "FoldNotImplemented".to_string(),
-                        ty: DeclarationId(2285),
+                        ty: DeclarationId(2286),
                     },
                     Field {
                         label: "MissingEmissionPath".to_string(),
-                        ty: DeclarationId(2286),
+                        ty: DeclarationId(2287),
                     },
                 ],
             },
@@ -33260,11 +33260,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Inhabits".to_string(),
-                        ty: DeclarationId(2301),
+                        ty: DeclarationId(2302),
                     },
                     Field {
                         label: "Violates".to_string(),
-                        ty: DeclarationId(2302),
+                        ty: DeclarationId(2303),
                     },
                 ],
             },
@@ -33299,11 +33299,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoDiagnostic".to_string(),
-                        ty: DeclarationId(2303),
+                        ty: DeclarationId(2304),
                     },
                     Field {
                         label: "SomeDiagnostic".to_string(),
-                        ty: DeclarationId(2304),
+                        ty: DeclarationId(2305),
                     },
                 ],
             },
@@ -33324,11 +33324,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DimensionOk".to_string(),
-                        ty: DeclarationId(2307),
+                        ty: DeclarationId(2308),
                     },
                     Field {
                         label: "DimensionFail".to_string(),
-                        ty: DeclarationId(2311),
+                        ty: DeclarationId(2312),
                     },
                 ],
             },
@@ -33367,15 +33367,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "witness_of".to_string(),
-                        ty: DeclarationId(2313),
+                        ty: DeclarationId(2314),
                     },
                     Field {
                         label: "compose".to_string(),
-                        ty: DeclarationId(2314),
+                        ty: DeclarationId(2315),
                     },
                     Field {
                         label: "break_diagnostic".to_string(),
-                        ty: DeclarationId(2315),
+                        ty: DeclarationId(2316),
                     },
                 ],
             },
@@ -33415,7 +33415,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             type_params: vec![DeclarationId(992), DeclarationId(993)],
             phantom_params: vec![PhantomParameter {
                 parameter: DeclarationId(992),
-                algebra: DeclarationId(2316),
+                algebra: DeclarationId(2317),
             }],
             meta_tag: None,
             specialization_parent: None,
@@ -33556,11 +33556,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("add_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(2287),
                     DeclarationId(2288),
                     DeclarationId(2289),
+                    DeclarationId(2290),
                 ],
-                output: DeclarationId(2290),
+                output: DeclarationId(2291),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4966, 4988)),
             },
             type_params: vec![DeclarationId(1002), DeclarationId(1003)],
@@ -33606,11 +33606,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("sub_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(2291),
                     DeclarationId(2292),
                     DeclarationId(2293),
+                    DeclarationId(2294),
                 ],
-                output: DeclarationId(2294),
+                output: DeclarationId(2295),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5162, 5184)),
             },
             type_params: vec![DeclarationId(1005), DeclarationId(1006)],
@@ -33656,11 +33656,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("mul_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(2295),
                     DeclarationId(2296),
+                    DeclarationId(2297),
                     DeclarationId(1009),
                 ],
-                output: DeclarationId(2297),
+                output: DeclarationId(2298),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5350, 5379)),
             },
             type_params: vec![DeclarationId(1008), DeclarationId(1009)],
@@ -33706,11 +33706,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("div_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(2298),
                     DeclarationId(2299),
+                    DeclarationId(2300),
                     DeclarationId(1012),
                 ],
-                output: DeclarationId(2300),
+                output: DeclarationId(2301),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5545, 5574)),
             },
             type_params: vec![DeclarationId(1011), DeclarationId(1012)],
@@ -33775,11 +33775,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoSourceSpan".to_string(),
-                        ty: DeclarationId(2317),
+                        ty: DeclarationId(2318),
                     },
                     Field {
                         label: "SomeSourceSpan".to_string(),
-                        ty: DeclarationId(2318),
+                        ty: DeclarationId(2319),
                     },
                 ],
             },
@@ -33845,7 +33845,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2319),
+                        ty: DeclarationId(2320),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -33907,15 +33907,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "BoundUnspecified".to_string(),
-                        ty: DeclarationId(2320),
+                        ty: DeclarationId(2321),
                     },
                     Field {
                         label: "StaticBoundFact".to_string(),
-                        ty: DeclarationId(2321),
+                        ty: DeclarationId(2322),
                     },
                     Field {
                         label: "PlatformDependentFact".to_string(),
-                        ty: DeclarationId(2322),
+                        ty: DeclarationId(2323),
                     },
                 ],
             },
@@ -33965,11 +33965,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DirectField".to_string(),
-                        ty: DeclarationId(2323),
+                        ty: DeclarationId(2324),
                     },
                     Field {
                         label: "AccessorMethod".to_string(),
-                        ty: DeclarationId(2324),
+                        ty: DeclarationId(2325),
                     },
                 ],
             },
@@ -34072,7 +34072,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "parameters".to_string(),
-                        ty: DeclarationId(2325),
+                        ty: DeclarationId(2326),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -34122,11 +34122,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Borrowed".to_string(),
-                        ty: DeclarationId(2326),
+                        ty: DeclarationId(2327),
                     },
                     Field {
                         label: "Consumed".to_string(),
-                        ty: DeclarationId(2327),
+                        ty: DeclarationId(2328),
                     },
                 ],
             },
@@ -34147,11 +34147,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Owned".to_string(),
-                        ty: DeclarationId(2328),
+                        ty: DeclarationId(2329),
                     },
                     Field {
                         label: "Borrowed".to_string(),
-                        ty: DeclarationId(2329),
+                        ty: DeclarationId(2330),
                     },
                 ],
             },
@@ -34172,11 +34172,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "SelfContained".to_string(),
-                        ty: DeclarationId(2330),
+                        ty: DeclarationId(2331),
                     },
                     Field {
                         label: "Caller".to_string(),
-                        ty: DeclarationId(2331),
+                        ty: DeclarationId(2332),
                     },
                 ],
             },
@@ -34197,15 +34197,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Growable".to_string(),
-                        ty: DeclarationId(2332),
+                        ty: DeclarationId(2333),
                     },
                     Field {
                         label: "Fixed".to_string(),
-                        ty: DeclarationId(2333),
+                        ty: DeclarationId(2334),
                     },
                     Field {
                         label: "NotApplicable".to_string(),
-                        ty: DeclarationId(2334),
+                        ty: DeclarationId(2335),
                     },
                 ],
             },
@@ -34225,7 +34225,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Utf8FreeMonoidChar".to_string(),
-                    ty: DeclarationId(2335),
+                    ty: DeclarationId(2336),
                 }],
             },
             type_params: vec![],
@@ -34323,43 +34323,43 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ListEmpty".to_string(),
-                        ty: DeclarationId(2336),
+                        ty: DeclarationId(2337),
                     },
                     Field {
                         label: "ListSingleton".to_string(),
-                        ty: DeclarationId(2337),
+                        ty: DeclarationId(2338),
                     },
                     Field {
                         label: "ListCons".to_string(),
-                        ty: DeclarationId(2338),
+                        ty: DeclarationId(2339),
                     },
                     Field {
                         label: "ListConcat".to_string(),
-                        ty: DeclarationId(2339),
+                        ty: DeclarationId(2340),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(2340),
+                        ty: DeclarationId(2341),
                     },
                     Field {
                         label: "ListIsEmpty".to_string(),
-                        ty: DeclarationId(2341),
+                        ty: DeclarationId(2342),
                     },
                     Field {
                         label: "ListFold".to_string(),
-                        ty: DeclarationId(2342),
+                        ty: DeclarationId(2343),
                     },
                     Field {
                         label: "ListMap".to_string(),
-                        ty: DeclarationId(2343),
+                        ty: DeclarationId(2344),
                     },
                     Field {
                         label: "ListFilter".to_string(),
-                        ty: DeclarationId(2344),
+                        ty: DeclarationId(2345),
                     },
                     Field {
                         label: "ListContains".to_string(),
-                        ty: DeclarationId(2345),
+                        ty: DeclarationId(2346),
                     },
                 ],
             },
@@ -34441,11 +34441,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "PlaceholderPatternStrategy".to_string(),
-                        ty: DeclarationId(2346),
+                        ty: DeclarationId(2347),
                     },
                     Field {
                         label: "VectorList".to_string(),
-                        ty: DeclarationId(2347),
+                        ty: DeclarationId(2348),
                     },
                 ],
             },
@@ -34924,11 +34924,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Borrow".to_string(),
-                        ty: DeclarationId(2348),
+                        ty: DeclarationId(2349),
                     },
                     Field {
                         label: "PassByValue".to_string(),
-                        ty: DeclarationId(2349),
+                        ty: DeclarationId(2350),
                     },
                 ],
             },
@@ -34949,11 +34949,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "CopyOrClone".to_string(),
-                        ty: DeclarationId(2350),
+                        ty: DeclarationId(2351),
                     },
                     Field {
                         label: "PassByValue".to_string(),
-                        ty: DeclarationId(2351),
+                        ty: DeclarationId(2352),
                     },
                 ],
             },
@@ -35039,11 +35039,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IndexedArgs".to_string(),
-                        ty: DeclarationId(2352),
+                        ty: DeclarationId(2353),
                     },
                     Field {
                         label: "NamedArg".to_string(),
-                        ty: DeclarationId(2353),
+                        ty: DeclarationId(2354),
                     },
                 ],
             },
@@ -35064,11 +35064,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "SingleTemplate".to_string(),
-                        ty: DeclarationId(2354),
+                        ty: DeclarationId(2355),
                     },
                     Field {
                         label: "HigherOrderTemplates".to_string(),
-                        ty: DeclarationId(2355),
+                        ty: DeclarationId(2356),
                     },
                 ],
             },
@@ -35335,7 +35335,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({left}, {right}...)".to_string(),
                             ))],
@@ -35348,7 +35348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -35386,7 +35386,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "int64(len({recv}))".to_string(),
                             ))],
@@ -35399,7 +35399,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -35437,7 +35437,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv}) == 0".to_string(),
                             ))],
@@ -35450,7 +35450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -35490,7 +35490,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "/* fold({recv}, {init}, {body}) */".to_string(),
                             ))],
@@ -35503,7 +35503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -35543,7 +35543,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "/* map({recv}, {body}) */".to_string(),
                             ))],
@@ -35556,7 +35556,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -35596,7 +35596,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Filter({recv}, {arg})".to_string(),
                             ))],
@@ -35609,7 +35609,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -35649,7 +35649,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Any({recv}, {arg})".to_string(),
                             ))],
@@ -35662,7 +35662,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -35702,7 +35702,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.All({recv}, {arg})".to_string(),
                             ))],
@@ -35715,7 +35715,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -35755,7 +35755,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.FlatMap({recv}, {arg})".to_string(),
                             ))],
@@ -35768,7 +35768,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -35790,7 +35790,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2356)),
+            meta_tag: Some(DeclarationId(2357)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -35809,7 +35809,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -35822,7 +35822,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -35844,7 +35844,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Join({recv}, {arg})".to_string(),
                             ))],
@@ -35857,7 +35857,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -35879,7 +35879,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Split({recv}, {arg})".to_string(),
                             ))],
@@ -35892,7 +35892,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -35916,7 +35916,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -35929,7 +35929,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -35949,7 +35949,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -35962,7 +35962,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -35984,7 +35984,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.SortBy({recv}, {arg})".to_string(),
                             ))],
@@ -35997,7 +35997,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -36019,7 +36019,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({recv}, {arg})".to_string(),
                             ))],
@@ -36032,7 +36032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -36054,7 +36054,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Contains({recv}, {arg})".to_string(),
                             ))],
@@ -36067,7 +36067,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -36084,23 +36084,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DirectRecursion".to_string(),
-                        ty: DeclarationId(2370),
+                        ty: DeclarationId(2371),
                     },
                     Field {
                         label: "ListRecursion".to_string(),
-                        ty: DeclarationId(2371),
+                        ty: DeclarationId(2372),
                     },
                     Field {
                         label: "OptionalRecursion".to_string(),
-                        ty: DeclarationId(2372),
+                        ty: DeclarationId(2373),
                     },
                     Field {
                         label: "SetRecursion".to_string(),
-                        ty: DeclarationId(2373),
+                        ty: DeclarationId(2374),
                     },
                     Field {
                         label: "MapValueRecursion".to_string(),
-                        ty: DeclarationId(2374),
+                        ty: DeclarationId(2375),
                     },
                 ],
             },
@@ -36212,23 +36212,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "StrictSubValue".to_string(),
-                        ty: DeclarationId(2375),
+                        ty: DeclarationId(2376),
                     },
                     Field {
                         label: "IteratedSubValue".to_string(),
-                        ty: DeclarationId(2376),
+                        ty: DeclarationId(2377),
                     },
                     Field {
                         label: "ArithmeticDescent".to_string(),
-                        ty: DeclarationId(2377),
+                        ty: DeclarationId(2378),
                     },
                     Field {
                         label: "PreservedValue".to_string(),
-                        ty: DeclarationId(2378),
+                        ty: DeclarationId(2379),
                     },
                     Field {
                         label: "SubValueUnknown".to_string(),
-                        ty: DeclarationId(2379),
+                        ty: DeclarationId(2380),
                     },
                 ],
             },
@@ -36379,7 +36379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("sub_value_to_call_pattern".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1073)],
-                output: DeclarationId(2357),
+                output: DeclarationId(2358),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     20571,
@@ -36401,7 +36401,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("sub_value_to_lowering_target".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1073)],
-                output: DeclarationId(2358),
+                output: DeclarationId(2359),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     21959,
@@ -36425,19 +36425,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IntegerExpZero".to_string(),
-                        ty: DeclarationId(2380),
+                        ty: DeclarationId(2381),
                     },
                     Field {
                         label: "IntegerExpPos".to_string(),
-                        ty: DeclarationId(2381),
+                        ty: DeclarationId(2382),
                     },
                     Field {
                         label: "FractionExp".to_string(),
-                        ty: DeclarationId(2382),
+                        ty: DeclarationId(2383),
                     },
                     Field {
                         label: "LogBasedExp".to_string(),
-                        ty: DeclarationId(2383),
+                        ty: DeclarationId(2384),
                     },
                 ],
             },
@@ -36480,11 +36480,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "PolyCost".to_string(),
-                        ty: DeclarationId(2384),
+                        ty: DeclarationId(2385),
                     },
                     Field {
                         label: "LogCost".to_string(),
-                        ty: DeclarationId(2385),
+                        ty: DeclarationId(2386),
                     },
                 ],
             },
@@ -36505,31 +36505,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ConstantBound".to_string(),
-                        ty: DeclarationId(2386),
+                        ty: DeclarationId(2387),
                     },
                     Field {
                         label: "AtomicBound".to_string(),
-                        ty: DeclarationId(2387),
+                        ty: DeclarationId(2388),
                     },
                     Field {
                         label: "ProductBound".to_string(),
-                        ty: DeclarationId(2389),
+                        ty: DeclarationId(2390),
                     },
                     Field {
                         label: "SumOfProductsBound".to_string(),
-                        ty: DeclarationId(2392),
+                        ty: DeclarationId(2393),
                     },
                     Field {
                         label: "SumBound".to_string(),
-                        ty: DeclarationId(2394),
+                        ty: DeclarationId(2395),
                     },
                     Field {
                         label: "ForeverBound".to_string(),
-                        ty: DeclarationId(2395),
+                        ty: DeclarationId(2396),
                     },
                     Field {
                         label: "ErrorBound".to_string(),
-                        ty: DeclarationId(2396),
+                        ty: DeclarationId(2397),
                     },
                 ],
             },
@@ -36547,7 +36547,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1086),
             name: Some("sum_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2359)],
+                inputs: vec![DeclarationId(2360)],
                 output: DeclarationId(1085),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -36627,7 +36627,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1090),
             name: Some("product_atoms_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2360)],
+                inputs: vec![DeclarationId(2361)],
                 output: DeclarationId(849),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -36649,7 +36649,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1091),
             name: Some("product_term_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2361)],
+                inputs: vec![DeclarationId(2362)],
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(555))),
             },
@@ -36667,7 +36667,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1092),
             name: Some("sum_products_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2363)],
+                inputs: vec![DeclarationId(2364)],
                 output: DeclarationId(849),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -36921,7 +36921,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("int_add_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(2364),
+                output: DeclarationId(2365),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33617,
@@ -36943,7 +36943,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("int_mul_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(2365),
+                output: DeclarationId(2366),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33913,
@@ -36965,7 +36965,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("bounded_int_pow_exponent".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(2366),
+                output: DeclarationId(2367),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35162,
@@ -36987,7 +36987,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("int_pow_bounded".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(2367),
+                output: DeclarationId(2368),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35637,
@@ -37009,7 +37009,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("ceil_log".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(2368),
+                output: DeclarationId(2369),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     36900,
@@ -37036,7 +37036,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     DeclarationId(93),
                     DeclarationId(93),
                 ],
-                output: DeclarationId(2369),
+                output: DeclarationId(2370),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     37172,
@@ -37444,7 +37444,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2397)),
+            meta_tag: Some(DeclarationId(2398)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -37470,7 +37470,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2398)),
+            meta_tag: Some(DeclarationId(2399)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -37495,23 +37495,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "read".to_string(),
-                        ty: DeclarationId(2400),
+                        ty: DeclarationId(2401),
                     },
                     Field {
                         label: "sequential".to_string(),
-                        ty: DeclarationId(2401),
+                        ty: DeclarationId(2402),
                     },
                     Field {
                         label: "branch".to_string(),
-                        ty: DeclarationId(2402),
+                        ty: DeclarationId(2403),
                     },
                     Field {
                         label: "iterate".to_string(),
-                        ty: DeclarationId(2403),
+                        ty: DeclarationId(2404),
                     },
                     Field {
                         label: "validate".to_string(),
-                        ty: DeclarationId(2404),
+                        ty: DeclarationId(2405),
                     },
                 ],
             },
@@ -37546,11 +37546,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DeclarationScope".to_string(),
-                        ty: DeclarationId(2405),
+                        ty: DeclarationId(2406),
                     },
                     Field {
                         label: "NodeScope".to_string(),
-                        ty: DeclarationId(2406),
+                        ty: DeclarationId(2407),
                     },
                 ],
             },
@@ -37570,7 +37570,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Error".to_string(),
-                    ty: DeclarationId(2407),
+                    ty: DeclarationId(2408),
                 }],
             },
             type_params: vec![],
@@ -37590,11 +37590,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "project".to_string(),
-                        ty: DeclarationId(2408),
+                        ty: DeclarationId(2409),
                     },
                     Field {
                         label: "violates".to_string(),
-                        ty: DeclarationId(2409),
+                        ty: DeclarationId(2410),
                     },
                 ],
             },
@@ -37643,11 +37643,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "lens".to_string(),
-                        ty: DeclarationId(2410),
+                        ty: DeclarationId(2411),
                     },
                     Field {
                         label: "enforcement".to_string(),
-                        ty: DeclarationId(2411),
+                        ty: DeclarationId(2412),
                     },
                 ],
             },
@@ -37696,7 +37696,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "enforceable_lens".to_string(),
-                        ty: DeclarationId(2412),
+                        ty: DeclarationId(2413),
                     },
                     Field {
                         label: "section".to_string(),
@@ -37761,7 +37761,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "lens".to_string(),
-                        ty: DeclarationId(2413),
+                        ty: DeclarationId(2414),
                     },
                     Field {
                         label: "section".to_string(),
@@ -37804,11 +37804,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Miss".to_string(),
-                        ty: DeclarationId(2416),
+                        ty: DeclarationId(2417),
                     },
                     Field {
                         label: "Hit".to_string(),
-                        ty: DeclarationId(2417),
+                        ty: DeclarationId(2418),
                     },
                 ],
             },
@@ -37841,7 +37841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("miss_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2414),
+                output: DeclarationId(2415),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4601, 4611)),
             },
             type_params: vec![],
@@ -37859,7 +37859,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("hit_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(2415),
+                output: DeclarationId(2416),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4654, 4666)),
             },
             type_params: vec![],
@@ -37897,7 +37897,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "items".to_string(),
-                    ty: DeclarationId(2418),
+                    ty: DeclarationId(2419),
                 }],
             },
             type_params: vec![],
@@ -37925,7 +37925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "refinement".to_string(),
-                        ty: DeclarationId(2419),
+                        ty: DeclarationId(2420),
                     },
                 ],
             },
@@ -38000,11 +38000,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Positional".to_string(),
-                        ty: DeclarationId(2421),
+                        ty: DeclarationId(2422),
                     },
                     Field {
                         label: "Record".to_string(),
-                        ty: DeclarationId(2423),
+                        ty: DeclarationId(2424),
                     },
                 ],
             },
@@ -38025,19 +38025,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Named".to_string(),
-                        ty: DeclarationId(2424),
+                        ty: DeclarationId(2425),
                     },
                     Field {
                         label: "Parameterized".to_string(),
-                        ty: DeclarationId(2426),
+                        ty: DeclarationId(2427),
                     },
                     Field {
                         label: "Optional".to_string(),
-                        ty: DeclarationId(2427),
+                        ty: DeclarationId(2428),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2429),
+                        ty: DeclarationId(2430),
                     },
                 ],
             },
@@ -38178,15 +38178,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "BareVariant".to_string(),
-                        ty: DeclarationId(2430),
+                        ty: DeclarationId(2431),
                     },
                     Field {
                         label: "VariantWith".to_string(),
-                        ty: DeclarationId(2431),
+                        ty: DeclarationId(2432),
                     },
                     Field {
                         label: "VariantFields".to_string(),
-                        ty: DeclarationId(2433),
+                        ty: DeclarationId(2434),
                     },
                 ],
             },
@@ -38207,15 +38207,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Int".to_string(),
-                        ty: DeclarationId(2434),
+                        ty: DeclarationId(2435),
                     },
                     Field {
                         label: "Bool".to_string(),
-                        ty: DeclarationId(2435),
+                        ty: DeclarationId(2436),
                     },
                     Field {
                         label: "String".to_string(),
-                        ty: DeclarationId(2436),
+                        ty: DeclarationId(2437),
                     },
                 ],
             },
@@ -38236,55 +38236,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(2437),
+                        ty: DeclarationId(2438),
                     },
                     Field {
                         label: "Var".to_string(),
-                        ty: DeclarationId(2438),
+                        ty: DeclarationId(2439),
                     },
                     Field {
                         label: "Path".to_string(),
-                        ty: DeclarationId(2441),
+                        ty: DeclarationId(2442),
                     },
                     Field {
                         label: "Call".to_string(),
-                        ty: DeclarationId(2443),
+                        ty: DeclarationId(2444),
                     },
                     Field {
                         label: "PathCall".to_string(),
-                        ty: DeclarationId(2447),
+                        ty: DeclarationId(2448),
                     },
                     Field {
                         label: "VariantRecord".to_string(),
-                        ty: DeclarationId(2449),
+                        ty: DeclarationId(2450),
                     },
                     Field {
                         label: "Operator".to_string(),
-                        ty: DeclarationId(2451),
+                        ty: DeclarationId(2452),
                     },
                     Field {
                         label: "Lambda".to_string(),
-                        ty: DeclarationId(2453),
+                        ty: DeclarationId(2454),
                     },
                     Field {
                         label: "If".to_string(),
-                        ty: DeclarationId(2454),
+                        ty: DeclarationId(2455),
                     },
                     Field {
                         label: "Match".to_string(),
-                        ty: DeclarationId(2456),
+                        ty: DeclarationId(2457),
                     },
                     Field {
                         label: "Record".to_string(),
-                        ty: DeclarationId(2458),
+                        ty: DeclarationId(2459),
                     },
                     Field {
                         label: "List".to_string(),
-                        ty: DeclarationId(2460),
+                        ty: DeclarationId(2461),
                     },
                     Field {
                         label: "Map".to_string(),
-                        ty: DeclarationId(2462),
+                        ty: DeclarationId(2463),
                     },
                 ],
             },
@@ -38305,43 +38305,43 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Let".to_string(),
-                        ty: DeclarationId(2464),
+                        ty: DeclarationId(2465),
                     },
                     Field {
                         label: "Fn".to_string(),
-                        ty: DeclarationId(2467),
+                        ty: DeclarationId(2468),
                     },
                     Field {
                         label: "FnExternalBody".to_string(),
-                        ty: DeclarationId(2470),
+                        ty: DeclarationId(2471),
                     },
                     Field {
                         label: "Data".to_string(),
-                        ty: DeclarationId(2472),
+                        ty: DeclarationId(2473),
                     },
                     Field {
                         label: "Module".to_string(),
-                        ty: DeclarationId(2474),
+                        ty: DeclarationId(2475),
                     },
                     Field {
                         label: "Import".to_string(),
-                        ty: DeclarationId(2477),
+                        ty: DeclarationId(2478),
                     },
                     Field {
                         label: "TypeAtom".to_string(),
-                        ty: DeclarationId(2479),
+                        ty: DeclarationId(2480),
                     },
                     Field {
                         label: "TypeRecord".to_string(),
-                        ty: DeclarationId(2482),
+                        ty: DeclarationId(2483),
                     },
                     Field {
                         label: "TypeSum".to_string(),
-                        ty: DeclarationId(2486),
+                        ty: DeclarationId(2487),
                     },
                     Field {
                         label: "TypeAlias".to_string(),
-                        ty: DeclarationId(2489),
+                        ty: DeclarationId(2490),
                     },
                 ],
             },
@@ -38383,7 +38383,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[*{left}, *{right}]".to_string(),
                             ))],
@@ -38396,7 +38396,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -38438,7 +38438,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -38451,7 +38451,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -38493,7 +38493,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "(len({recv}) == 0)".to_string(),
                             ))],
@@ -38506,7 +38506,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -38550,7 +38550,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "__v3_fold({recv}, {init}, {body})".to_string(),
                             ))],
@@ -38563,7 +38563,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -38607,7 +38607,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[{body} for {item} in {recv}]".to_string(),
                             ))],
@@ -38620,7 +38620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -38664,7 +38664,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[x for x in {recv} if {arg}(x)]".to_string(),
                             ))],
@@ -38677,7 +38677,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -38721,7 +38721,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "any({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -38734,7 +38734,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -38778,7 +38778,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "all({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -38791,7 +38791,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -38835,7 +38835,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[y for x in {recv} for y in {arg}(x)]".to_string(),
                             ))],
@@ -38848,7 +38848,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -38874,7 +38874,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2490)),
+            meta_tag: Some(DeclarationId(2491)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -38893,7 +38893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -38906,7 +38906,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -38926,7 +38926,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg}.join({recv})".to_string(),
                             ))],
@@ -38939,7 +38939,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -38959,7 +38959,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}.split({arg})".to_string(),
                             ))],
@@ -38972,7 +38972,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -38994,7 +38994,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[-1] if {recv} else None".to_string(),
                             ))],
@@ -39007,7 +39007,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -39029,7 +39029,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[0] if {recv} else None".to_string(),
                             ))],
@@ -39042,7 +39042,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -39064,7 +39064,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "list(enumerate({recv}))".to_string(),
                             ))],
@@ -39077,7 +39077,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -39099,7 +39099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[ord(c) for c in {recv}]".to_string(),
                             ))],
@@ -39112,7 +39112,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -39136,7 +39136,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -39149,7 +39149,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -39169,7 +39169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -39182,7 +39182,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -39204,7 +39204,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "sorted({recv}, key={arg})".to_string(),
                             ))],
@@ -39217,7 +39217,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -39237,7 +39237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv} + [{arg}]".to_string(),
                             ))],
@@ -39250,7 +39250,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -39270,7 +39270,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg} in {recv}".to_string(),
                             ))],
@@ -39283,7 +39283,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -39381,23 +39381,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LiteralValue".to_string(),
-                        ty: DeclarationId(2492),
+                        ty: DeclarationId(2493),
                     },
                     Field {
                         label: "RecordValue".to_string(),
-                        ty: DeclarationId(2494),
+                        ty: DeclarationId(2495),
                     },
                     Field {
                         label: "VariantValue".to_string(),
-                        ty: DeclarationId(2495),
+                        ty: DeclarationId(2496),
                     },
                     Field {
                         label: "NodeRef".to_string(),
-                        ty: DeclarationId(2496),
+                        ty: DeclarationId(2497),
                     },
                     Field {
                         label: "CardinalityValue".to_string(),
-                        ty: DeclarationId(2497),
+                        ty: DeclarationId(2498),
                     },
                 ],
             },
@@ -39450,7 +39450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bindings".to_string(),
-                    ty: DeclarationId(2498),
+                    ty: DeclarationId(2499),
                 }],
             },
             type_params: vec![],
@@ -39469,7 +39469,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "frames".to_string(),
-                    ty: DeclarationId(2499),
+                    ty: DeclarationId(2500),
                 }],
             },
             type_params: vec![],
@@ -39507,7 +39507,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "ApplicativeOrder".to_string(),
-                    ty: DeclarationId(2500),
+                    ty: DeclarationId(2501),
                 }],
             },
             type_params: vec![],
@@ -39527,11 +39527,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LeftFirst".to_string(),
-                        ty: DeclarationId(2501),
+                        ty: DeclarationId(2502),
                     },
                     Field {
                         label: "RightFirst".to_string(),
-                        ty: DeclarationId(2502),
+                        ty: DeclarationId(2503),
                     },
                 ],
             },
@@ -39582,7 +39582,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1184),
             name: Some("evaluate".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(721), DeclarationId(2491)],
+                inputs: vec![DeclarationId(828), DeclarationId(721), DeclarationId(2492)],
                 output: DeclarationId(1175),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/runtime.dag", 11265, 11284)),
             },
@@ -39596,11 +39596,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/runtime.dag", 11196, 11284),
         });
-        declarations.push(Declaration { id: DeclarationId(1185), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(263)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2355), payload: vec![FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __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(2353), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3555, 4208) });
-        declarations.push(Declaration { id: DeclarationId(1186), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(249)))])), ("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(2355), 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(2353), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4210, 4705) });
-        declarations.push(Declaration { id: DeclarationId(1187), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(248)))])), ("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(2355), 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(2353), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4707, 5196) });
-        declarations.push(Declaration { id: DeclarationId(1188), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(265)))])), ("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(2355), 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(2353), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5198, 5729) });
-        declarations.push(Declaration { id: DeclarationId(1189), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(1054) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2503)), 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(258)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2354), 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(2353), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(271)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2354), 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(2353), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(295)))])), ("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(2354), 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(2353), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(273)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2354), 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(2353), 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}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2354), 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(2353), 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}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2354), 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(2353), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(252)))])), ("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(2354), 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(2353), payload: vec![] })]), FieldValue::Reference(DeclarationId(1185)), FieldValue::Reference(DeclarationId(1186)), FieldValue::Reference(DeclarationId(1187)), FieldValue::Reference(DeclarationId(1188)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(293)))])), ("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(2354), 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(2353), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(299)))])), ("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(2354), 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(2353), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5732, 8453) });
+        declarations.push(Declaration { id: DeclarationId(1185), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(263)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2356), payload: vec![FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __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(2354), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3555, 4208) });
+        declarations.push(Declaration { id: DeclarationId(1186), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(249)))])), ("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(2356), 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(2354), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4210, 4705) });
+        declarations.push(Declaration { id: DeclarationId(1187), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(248)))])), ("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(2356), 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(2354), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4707, 5196) });
+        declarations.push(Declaration { id: DeclarationId(1188), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(265)))])), ("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(2356), 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(2354), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5198, 5729) });
+        declarations.push(Declaration { id: DeclarationId(1189), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(1054) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2504)), 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(258)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2355), 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(2354), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(271)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2355), 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(2354), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(295)))])), ("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(2355), 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(2354), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(273)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2355), 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(2354), 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}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2355), 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(2354), 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}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2355), 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(2354), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(252)))])), ("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(2355), 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(2354), payload: vec![] })]), FieldValue::Reference(DeclarationId(1185)), FieldValue::Reference(DeclarationId(1186)), FieldValue::Reference(DeclarationId(1187)), FieldValue::Reference(DeclarationId(1188)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(293)))])), ("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(2355), 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(2354), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(299)))])), ("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(2355), 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(2354), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5732, 8453) });
         declarations.push(Declaration {
             id: DeclarationId(1190),
             name: Some("InputField".to_string()),
@@ -39670,7 +39670,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(2504),
+                        ty: DeclarationId(2505),
                     },
                     Field {
                         label: "endpoint".to_string(),
@@ -39692,12 +39692,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1194),
             name: Some("modeled_gunbc_ci_workflow".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1739),
+                template: DeclarationId(1740),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1739)),
+            meta_tag: Some(DeclarationId(1740)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -39714,7 +39714,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("ci_demo_timing_read".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2505),
+                output: DeclarationId(2506),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(597))),
             },
             type_params: vec![],
@@ -39732,7 +39732,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("ci_wad_modeled_workflow_timing_witness".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2506),
+                output: DeclarationId(2507),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(599))),
             },
             type_params: vec![],
@@ -39750,7 +39750,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_seed_list_declaration_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2507),
+                output: DeclarationId(2508),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(601))),
             },
             type_params: vec![],
@@ -39768,7 +39768,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_seed_list_behavior_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2508),
+                output: DeclarationId(2509),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(603))),
             },
             type_params: vec![],
@@ -39786,7 +39786,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_seed_list_dagport_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2509),
+                output: DeclarationId(2510),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(605))),
             },
             type_params: vec![],
@@ -39804,7 +39804,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_seed_list_cluster_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2510),
+                output: DeclarationId(2511),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(607))),
             },
             type_params: vec![],
@@ -39822,7 +39822,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_empty_list_diagnostic".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2511),
+                output: DeclarationId(2512),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(609))),
             },
             type_params: vec![],
@@ -39840,7 +39840,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_empty_list_witness_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2513),
+                output: DeclarationId(2514),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(611))),
             },
             type_params: vec![],
@@ -39858,7 +39858,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_witnesses_singleton_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1237)],
-                output: DeclarationId(2515),
+                output: DeclarationId(2516),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(615))),
             },
             type_params: vec![],
@@ -39876,7 +39876,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_violations_singleton".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(982)],
-                output: DeclarationId(2516),
+                output: DeclarationId(2517),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(618))),
             },
             type_params: vec![],
@@ -39894,7 +39894,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_dimension_ok_tm_payload".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1237)],
-                output: DeclarationId(2517),
+                output: DeclarationId(2518),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(622))),
             },
             type_params: vec![],
@@ -39912,7 +39912,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_dimension_fail_tm_payload".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1237), DeclarationId(982)],
-                output: DeclarationId(2518),
+                output: DeclarationId(2519),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(627))),
             },
             type_params: vec![],
@@ -39930,7 +39930,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("report_dim_ok_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(1237)],
-                output: DeclarationId(2519),
+                output: DeclarationId(2520),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(634))),
             },
             type_params: vec![],
@@ -39948,7 +39948,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("report_dim_fail_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(1237), DeclarationId(982)],
-                output: DeclarationId(2520),
+                output: DeclarationId(2521),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(641))),
             },
             type_params: vec![],
@@ -39966,7 +39966,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("report_inhabits_branch_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(1237), DeclarationId(986)],
-                output: DeclarationId(2521),
+                output: DeclarationId(2522),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(646))),
             },
             type_params: vec![],
@@ -39983,8 +39983,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1210),
             name: Some("dimension_report_tm_from_witness".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(2522)],
-                output: DeclarationId(2523),
+                inputs: vec![DeclarationId(828), DeclarationId(2523)],
+                output: DeclarationId(2524),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(656))),
             },
             type_params: vec![],
@@ -40002,7 +40002,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("demo_ci_modeled_timing_dimension_report".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2524),
+                output: DeclarationId(2525),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(664))),
             },
             type_params: vec![],
@@ -40022,15 +40022,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Strict".to_string(),
-                        ty: DeclarationId(2554),
+                        ty: DeclarationId(2555),
                     },
                     Field {
                         label: "NonIncreasing".to_string(),
-                        ty: DeclarationId(2555),
+                        ty: DeclarationId(2556),
                     },
                     Field {
                         label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2556),
+                        ty: DeclarationId(2557),
                     },
                 ],
             },
@@ -40132,8 +40132,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1217),
             name: Some("optional_evidence_meet".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2546), DeclarationId(2547)],
-                output: DeclarationId(2548),
+                inputs: vec![DeclarationId(2547), DeclarationId(2548)],
+                output: DeclarationId(2549),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2488,
@@ -40154,8 +40154,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1218),
             name: Some("map_evidence_merge_at".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2549), DeclarationId(230), DeclarationId(1212)],
-                output: DeclarationId(2550),
+                inputs: vec![DeclarationId(2550), DeclarationId(230), DeclarationId(1212)],
+                output: DeclarationId(2551),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2833,
@@ -40179,23 +40179,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "TreeSize".to_string(),
-                        ty: DeclarationId(2557),
+                        ty: DeclarationId(2558),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(2558),
+                        ty: DeclarationId(2559),
                     },
                     Field {
                         label: "ArithmeticValue".to_string(),
-                        ty: DeclarationId(2559),
+                        ty: DeclarationId(2560),
                     },
                     Field {
                         label: "TokenPosition".to_string(),
-                        ty: DeclarationId(2560),
+                        ty: DeclarationId(2561),
                     },
                     Field {
                         label: "SetCardinality".to_string(),
-                        ty: DeclarationId(2561),
+                        ty: DeclarationId(2562),
                     },
                 ],
             },
@@ -40216,11 +40216,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "OneStep".to_string(),
-                        ty: DeclarationId(2562),
+                        ty: DeclarationId(2563),
                     },
                     Field {
                         label: "AdditionalStep".to_string(),
-                        ty: DeclarationId(2563),
+                        ty: DeclarationId(2564),
                     },
                 ],
             },
@@ -40263,11 +40263,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DivideByTwo".to_string(),
-                        ty: DeclarationId(2564),
+                        ty: DeclarationId(2565),
                     },
                     Field {
                         label: "StrictlyLarger".to_string(),
-                        ty: DeclarationId(2565),
+                        ty: DeclarationId(2566),
                     },
                 ],
             },
@@ -40330,7 +40330,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("positive_descent_amount_from_positive_int".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(2551),
+                output: DeclarationId(2552),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     6420,
@@ -40352,7 +40352,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(93)],
-                output: DeclarationId(2552),
+                output: DeclarationId(2553),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     6860,
@@ -40376,31 +40376,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ChildAccessor".to_string(),
-                        ty: DeclarationId(2566),
+                        ty: DeclarationId(2567),
                     },
                     Field {
                         label: "ListShrink".to_string(),
-                        ty: DeclarationId(2567),
+                        ty: DeclarationId(2568),
                     },
                     Field {
                         label: "ArithmeticSubtractDescent".to_string(),
-                        ty: DeclarationId(2568),
+                        ty: DeclarationId(2569),
                     },
                     Field {
                         label: "ArithmeticDivideDescent".to_string(),
-                        ty: DeclarationId(2569),
+                        ty: DeclarationId(2570),
                     },
                     Field {
                         label: "ParserAdvance".to_string(),
-                        ty: DeclarationId(2570),
+                        ty: DeclarationId(2571),
                     },
                     Field {
                         label: "SetRemoval".to_string(),
-                        ty: DeclarationId(2571),
+                        ty: DeclarationId(2572),
                     },
                     Field {
                         label: "FoldIteration".to_string(),
-                        ty: DeclarationId(2572),
+                        ty: DeclarationId(2573),
                     },
                 ],
             },
@@ -40420,7 +40420,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "dimensions".to_string(),
-                    ty: DeclarationId(2573),
+                    ty: DeclarationId(2574),
                 }],
             },
             type_params: vec![],
@@ -40448,7 +40448,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "evidence".to_string(),
-                        ty: DeclarationId(2574),
+                        ty: DeclarationId(2575),
                     },
                 ],
             },
@@ -40468,7 +40468,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Strict".to_string(),
-                    ty: DeclarationId(2575),
+                    ty: DeclarationId(2576),
                 }],
             },
             type_params: vec![],
@@ -40488,11 +40488,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NonIncreasing".to_string(),
-                        ty: DeclarationId(2576),
+                        ty: DeclarationId(2577),
                     },
                     Field {
                         label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2577),
+                        ty: DeclarationId(2578),
                     },
                 ],
             },
@@ -40513,11 +40513,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "EvidenceUnknown".to_string(),
-                        ty: DeclarationId(2578),
+                        ty: DeclarationId(2579),
                     },
                     Field {
                         label: "EvidenceIncomplete".to_string(),
-                        ty: DeclarationId(2579),
+                        ty: DeclarationId(2580),
                     },
                 ],
             },
@@ -40546,7 +40546,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "per_path".to_string(),
-                        ty: DeclarationId(2580),
+                        ty: DeclarationId(2581),
                     },
                 ],
             },
@@ -40565,7 +40565,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("descent_execution_proof".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(724), DeclarationId(722)],
-                output: DeclarationId(2553),
+                output: DeclarationId(2554),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     12400,
@@ -40626,19 +40626,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Observed".to_string(),
-                        ty: DeclarationId(2583),
+                        ty: DeclarationId(2584),
                     },
                     Field {
                         label: "Unobserved".to_string(),
-                        ty: DeclarationId(2584),
+                        ty: DeclarationId(2585),
                     },
                     Field {
                         label: "Ambiguous".to_string(),
-                        ty: DeclarationId(2585),
+                        ty: DeclarationId(2586),
                     },
                     Field {
                         label: "Stale".to_string(),
-                        ty: DeclarationId(2586),
+                        ty: DeclarationId(2587),
                     },
                 ],
             },
@@ -40703,7 +40703,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "observations".to_string(),
-                    ty: DeclarationId(2587),
+                    ty: DeclarationId(2588),
                 }],
             },
             type_params: vec![],
@@ -40893,7 +40893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("timing_lens_empty_corrections".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2581),
+                output: DeclarationId(2582),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(714))),
             },
             type_params: vec![],
@@ -41001,7 +41001,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("timing_lens_read".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2582),
+                output: DeclarationId(2583),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(793))),
             },
             type_params: vec![],
@@ -41039,183 +41039,183 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2599),
+                        ty: DeclarationId(2600),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2600),
+                        ty: DeclarationId(2601),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2601),
+                        ty: DeclarationId(2602),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2602),
+                        ty: DeclarationId(2603),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2603),
+                        ty: DeclarationId(2604),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2604),
+                        ty: DeclarationId(2605),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2605),
+                        ty: DeclarationId(2606),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2606),
+                        ty: DeclarationId(2607),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2607),
+                        ty: DeclarationId(2608),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2608),
+                        ty: DeclarationId(2609),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2609),
+                        ty: DeclarationId(2610),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2610),
+                        ty: DeclarationId(2611),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2611),
+                        ty: DeclarationId(2612),
                     },
                     Field {
                         label: "Ident".to_string(),
-                        ty: DeclarationId(2612),
+                        ty: DeclarationId(2613),
                     },
                     Field {
                         label: "IntLit".to_string(),
-                        ty: DeclarationId(2613),
+                        ty: DeclarationId(2614),
                     },
                     Field {
                         label: "StringLit".to_string(),
-                        ty: DeclarationId(2614),
+                        ty: DeclarationId(2615),
                     },
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2615),
+                        ty: DeclarationId(2616),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2616),
+                        ty: DeclarationId(2617),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2617),
+                        ty: DeclarationId(2618),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2618),
+                        ty: DeclarationId(2619),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2619),
+                        ty: DeclarationId(2620),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2620),
+                        ty: DeclarationId(2621),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2621),
+                        ty: DeclarationId(2622),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2622),
+                        ty: DeclarationId(2623),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2623),
+                        ty: DeclarationId(2624),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2624),
+                        ty: DeclarationId(2625),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2625),
+                        ty: DeclarationId(2626),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2626),
+                        ty: DeclarationId(2627),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2627),
+                        ty: DeclarationId(2628),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2628),
+                        ty: DeclarationId(2629),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2629),
+                        ty: DeclarationId(2630),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2630),
+                        ty: DeclarationId(2631),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2631),
+                        ty: DeclarationId(2632),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2632),
+                        ty: DeclarationId(2633),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2633),
+                        ty: DeclarationId(2634),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2634),
+                        ty: DeclarationId(2635),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2635),
+                        ty: DeclarationId(2636),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2636),
+                        ty: DeclarationId(2637),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2637),
+                        ty: DeclarationId(2638),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2638),
+                        ty: DeclarationId(2639),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2639),
+                        ty: DeclarationId(2640),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2640),
+                        ty: DeclarationId(2641),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2641),
+                        ty: DeclarationId(2642),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2642),
+                        ty: DeclarationId(2643),
                     },
                     Field {
                         label: "Eof".to_string(),
-                        ty: DeclarationId(2643),
+                        ty: DeclarationId(2644),
                     },
                 ],
             },
@@ -41261,55 +41261,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2644),
+                        ty: DeclarationId(2645),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2645),
+                        ty: DeclarationId(2646),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2646),
+                        ty: DeclarationId(2647),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2647),
+                        ty: DeclarationId(2648),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2648),
+                        ty: DeclarationId(2649),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2649),
+                        ty: DeclarationId(2650),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2650),
+                        ty: DeclarationId(2651),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2651),
+                        ty: DeclarationId(2652),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2652),
+                        ty: DeclarationId(2653),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2653),
+                        ty: DeclarationId(2654),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2654),
+                        ty: DeclarationId(2655),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2655),
+                        ty: DeclarationId(2656),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2656),
+                        ty: DeclarationId(2657),
                     },
                 ],
             },
@@ -41330,115 +41330,115 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2657),
+                        ty: DeclarationId(2658),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2658),
+                        ty: DeclarationId(2659),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2659),
+                        ty: DeclarationId(2660),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2660),
+                        ty: DeclarationId(2661),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2661),
+                        ty: DeclarationId(2662),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2662),
+                        ty: DeclarationId(2663),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2663),
+                        ty: DeclarationId(2664),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2664),
+                        ty: DeclarationId(2665),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2665),
+                        ty: DeclarationId(2666),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2666),
+                        ty: DeclarationId(2667),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2667),
+                        ty: DeclarationId(2668),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2668),
+                        ty: DeclarationId(2669),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2669),
+                        ty: DeclarationId(2670),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2670),
+                        ty: DeclarationId(2671),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2671),
+                        ty: DeclarationId(2672),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2672),
+                        ty: DeclarationId(2673),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2673),
+                        ty: DeclarationId(2674),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2674),
+                        ty: DeclarationId(2675),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2675),
+                        ty: DeclarationId(2676),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2676),
+                        ty: DeclarationId(2677),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2677),
+                        ty: DeclarationId(2678),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2678),
+                        ty: DeclarationId(2679),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2679),
+                        ty: DeclarationId(2680),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2680),
+                        ty: DeclarationId(2681),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2681),
+                        ty: DeclarationId(2682),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2682),
+                        ty: DeclarationId(2683),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2683),
+                        ty: DeclarationId(2684),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2684),
+                        ty: DeclarationId(2685),
                     },
                 ],
             },
@@ -41653,43 +41653,43 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-                        ty: DeclarationId(2688),
+                        ty: DeclarationId(2689),
                     },
                     Field {
                         label: "ParseError".to_string(),
-                        ty: DeclarationId(2689),
+                        ty: DeclarationId(2690),
                     },
                     Field {
                         label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(2690),
+                        ty: DeclarationId(2691),
                     },
                     Field {
                         label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(2691),
+                        ty: DeclarationId(2692),
                     },
                     Field {
                         label: "ResolveError".to_string(),
-                        ty: DeclarationId(2692),
+                        ty: DeclarationId(2693),
                     },
                     Field {
                         label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(2693),
+                        ty: DeclarationId(2694),
                     },
                     Field {
                         label: "BranchConditionNotBool".to_string(),
-                        ty: DeclarationId(2694),
+                        ty: DeclarationId(2695),
                     },
                     Field {
                         label: "MagnitudeOutOfRange".to_string(),
-                        ty: DeclarationId(2695),
+                        ty: DeclarationId(2696),
                     },
                     Field {
                         label: "MalformedIntegerRangeFact".to_string(),
-                        ty: DeclarationId(2696),
+                        ty: DeclarationId(2697),
                     },
                     Field {
                         label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(2697),
+                        ty: DeclarationId(2698),
                     },
                 ],
             },
@@ -41710,11 +41710,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "AnyDetail".to_string(),
-                        ty: DeclarationId(2698),
+                        ty: DeclarationId(2699),
                     },
                     Field {
                         label: "Contains".to_string(),
-                        ty: DeclarationId(2699),
+                        ty: DeclarationId(2700),
                     },
                 ],
             },
@@ -41760,11 +41760,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(2700),
+                        ty: DeclarationId(2701),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(2701),
+                        ty: DeclarationId(2702),
                     },
                 ],
             },
@@ -41784,7 +41784,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "AtMostBudget".to_string(),
-                    ty: DeclarationId(2702),
+                    ty: DeclarationId(2703),
                 }],
             },
             type_params: vec![],
@@ -41804,15 +41804,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Associativity".to_string(),
-                        ty: DeclarationId(2703),
+                        ty: DeclarationId(2704),
                     },
                     Field {
                         label: "Commutativity".to_string(),
-                        ty: DeclarationId(2704),
+                        ty: DeclarationId(2705),
                     },
                     Field {
                         label: "Identity".to_string(),
-                        ty: DeclarationId(2705),
+                        ty: DeclarationId(2706),
                     },
                 ],
             },
@@ -41851,7 +41851,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "LiteralProgram".to_string(),
-                    ty: DeclarationId(2706),
+                    ty: DeclarationId(2707),
                 }],
             },
             type_params: vec![],
@@ -41870,7 +41870,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "LinearCostForBindParam".to_string(),
-                    ty: DeclarationId(2707),
+                    ty: DeclarationId(2708),
                 }],
             },
             type_params: vec![],
@@ -41889,7 +41889,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "SelectedBindParamSizeVariable".to_string(),
-                    ty: DeclarationId(2708),
+                    ty: DeclarationId(2709),
                 }],
             },
             type_params: vec![],
@@ -41928,11 +41928,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LensCapabilityStructuralTerminal".to_string(),
-                        ty: DeclarationId(2709),
+                        ty: DeclarationId(2710),
                     },
                     Field {
                         label: "LensCapabilityStructuralPartial".to_string(),
-                        ty: DeclarationId(2710),
+                        ty: DeclarationId(2711),
                     },
                 ],
             },
@@ -41953,19 +41953,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LensCapabilityBehavioralComplete".to_string(),
-                        ty: DeclarationId(2711),
+                        ty: DeclarationId(2712),
                     },
                     Field {
                         label: "LensCapabilityBehavioralPartial".to_string(),
-                        ty: DeclarationId(2712),
+                        ty: DeclarationId(2713),
                     },
                     Field {
                         label: "LensCapabilityBehavioralStub".to_string(),
-                        ty: DeclarationId(2713),
+                        ty: DeclarationId(2714),
                     },
                     Field {
                         label: "LensCapabilityBehavioralNA".to_string(),
-                        ty: DeclarationId(2714),
+                        ty: DeclarationId(2715),
                     },
                 ],
             },
@@ -41986,15 +41986,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LensCapabilityV2RealV2".to_string(),
-                        ty: DeclarationId(2715),
+                        ty: DeclarationId(2716),
                     },
                     Field {
                         label: "LensCapabilityV2NoneV3Native".to_string(),
-                        ty: DeclarationId(2716),
+                        ty: DeclarationId(2717),
                     },
                     Field {
                         label: "LensCapabilityV2NotApplicable".to_string(),
-                        ty: DeclarationId(2717),
+                        ty: DeclarationId(2718),
                     },
                 ],
             },
@@ -42053,7 +42053,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2757)),
+            meta_tag: Some(DeclarationId(2758)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -42065,21 +42065,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2709),
+                            constructor: DeclarationId(2710),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2711),
+                            constructor: DeclarationId(2712),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2715),
+                            constructor: DeclarationId(2716),
                             payload: vec![],
                         },
                     ),
@@ -42092,21 +42092,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2709),
+                            constructor: DeclarationId(2710),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2711),
+                            constructor: DeclarationId(2712),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2715),
+                            constructor: DeclarationId(2716),
                             payload: vec![],
                         },
                     ),
@@ -42121,21 +42121,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2709),
+                            constructor: DeclarationId(2710),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2714),
+                            constructor: DeclarationId(2715),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2716),
+                            constructor: DeclarationId(2717),
                             payload: vec![],
                         },
                     ),
@@ -42150,21 +42150,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2709),
+                            constructor: DeclarationId(2710),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2712),
+                            constructor: DeclarationId(2713),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2716),
+                            constructor: DeclarationId(2717),
                             payload: vec![],
                         },
                     ),
@@ -42177,21 +42177,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2709),
+                            constructor: DeclarationId(2710),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2711),
+                            constructor: DeclarationId(2712),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2716),
+                            constructor: DeclarationId(2717),
                             payload: vec![],
                         },
                     ),
@@ -42211,14 +42211,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2713),
+                            constructor: DeclarationId(2712),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2716),
+                            constructor: DeclarationId(2717),
                             payload: vec![],
                         },
                     ),
@@ -42231,21 +42231,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2709),
+                            constructor: DeclarationId(2710),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2711),
+                            constructor: DeclarationId(2712),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2716),
+                            constructor: DeclarationId(2717),
                             payload: vec![],
                         },
                     ),
@@ -42260,21 +42260,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2709),
+                            constructor: DeclarationId(2710),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2711),
+                            constructor: DeclarationId(2712),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2716),
+                            constructor: DeclarationId(2717),
                             payload: vec![],
                         },
                     ),
@@ -42287,21 +42287,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2709),
+                            constructor: DeclarationId(2710),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2711),
+                            constructor: DeclarationId(2712),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2716),
+                            constructor: DeclarationId(2717),
                             payload: vec![],
                         },
                     ),
@@ -42316,21 +42316,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2709),
+                            constructor: DeclarationId(2710),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2711),
+                            constructor: DeclarationId(2712),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2716),
+                            constructor: DeclarationId(2717),
                             payload: vec![],
                         },
                     ),
@@ -42343,21 +42343,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2710),
+                            constructor: DeclarationId(2711),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2714),
+                            constructor: DeclarationId(2715),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2717),
+                            constructor: DeclarationId(2718),
                             payload: vec![],
                         },
                     ),
@@ -42370,21 +42370,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2710),
+                            constructor: DeclarationId(2711),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2714),
+                            constructor: DeclarationId(2715),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2717),
+                            constructor: DeclarationId(2718),
                             payload: vec![],
                         },
                     ),
@@ -42399,21 +42399,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2709),
+                            constructor: DeclarationId(2710),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2714),
+                            constructor: DeclarationId(2715),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2717),
+                            constructor: DeclarationId(2718),
                             payload: vec![],
                         },
                     ),
@@ -42421,7 +42421,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ])),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 6971, 9554),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6971, 9559),
         });
         declarations.push(Declaration {
             id: DeclarationId(1288),
@@ -42430,107 +42430,107 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Compiles".to_string(),
-                        ty: DeclarationId(2718),
+                        ty: DeclarationId(2719),
                     },
                     Field {
                         label: "FailsWithDiagnostic".to_string(),
-                        ty: DeclarationId(2719),
+                        ty: DeclarationId(2720),
                     },
                     Field {
                         label: "OutputEquals".to_string(),
-                        ty: DeclarationId(2720),
+                        ty: DeclarationId(2721),
                     },
                     Field {
                         label: "PortHasState".to_string(),
-                        ty: DeclarationId(2721),
+                        ty: DeclarationId(2722),
                     },
                     Field {
                         label: "DeclarationHasRefinement".to_string(),
-                        ty: DeclarationId(2722),
+                        ty: DeclarationId(2723),
                     },
                     Field {
                         label: "CostBounded".to_string(),
-                        ty: DeclarationId(2723),
+                        ty: DeclarationId(2724),
                     },
                     Field {
                         label: "BehavioralObservation".to_string(),
-                        ty: DeclarationId(2724),
+                        ty: DeclarationId(2725),
                     },
                     Field {
                         label: "MockBackedInvariant".to_string(),
-                        ty: DeclarationId(2725),
+                        ty: DeclarationId(2726),
                     },
                     Field {
                         label: "ExecuteCommand".to_string(),
-                        ty: DeclarationId(2727),
+                        ty: DeclarationId(2728),
                     },
                     Field {
                         label: "ForAllTargets".to_string(),
-                        ty: DeclarationId(2729),
+                        ty: DeclarationId(2730),
                     },
                     Field {
                         label: "LensOutputEquals".to_string(),
-                        ty: DeclarationId(2730),
+                        ty: DeclarationId(2731),
                     },
                     Field {
                         label: "DifferentialEquals".to_string(),
-                        ty: DeclarationId(2731),
+                        ty: DeclarationId(2732),
                     },
                     Field {
                         label: "SymbolicCostExprEquals".to_string(),
-                        ty: DeclarationId(2732),
+                        ty: DeclarationId(2733),
                     },
                     Field {
                         label: "SymbolicCostExprEqualsForBindParam".to_string(),
-                        ty: DeclarationId(2733),
+                        ty: DeclarationId(2734),
                     },
                     Field {
                         label: "PerfWithinBaseline".to_string(),
-                        ty: DeclarationId(2734),
+                        ty: DeclarationId(2735),
                     },
                     Field {
                         label: "BinaryDimensionReportEquals".to_string(),
-                        ty: DeclarationId(2735),
+                        ty: DeclarationId(2736),
                     },
                     Field {
                         label: "AlgebraicLaw".to_string(),
-                        ty: DeclarationId(2736),
+                        ty: DeclarationId(2737),
                     },
                     Field {
                         label: "CensusBoundCheck".to_string(),
-                        ty: DeclarationId(2737),
+                        ty: DeclarationId(2738),
                     },
                     Field {
                         label: "CensusSubsetCount".to_string(),
-                        ty: DeclarationId(2738),
+                        ty: DeclarationId(2739),
                     },
                     Field {
                         label: "FixedPointConverges".to_string(),
-                        ty: DeclarationId(2739),
+                        ty: DeclarationId(2740),
                     },
                     Field {
                         label: "RatchetZero".to_string(),
-                        ty: DeclarationId(2740),
+                        ty: DeclarationId(2741),
                     },
                     Field {
                         label: "GeneratedFromDag".to_string(),
-                        ty: DeclarationId(2742),
+                        ty: DeclarationId(2743),
                     },
                     Field {
                         label: "CementingDispatchMatchesProjection".to_string(),
-                        ty: DeclarationId(2743),
+                        ty: DeclarationId(2744),
                     },
                     Field {
                         label: "ReleaseDeferredClaim".to_string(),
-                        ty: DeclarationId(2744),
+                        ty: DeclarationId(2745),
                     },
                     Field {
                         label: "SubstrateResearchDeferredClaim".to_string(),
-                        ty: DeclarationId(2745),
+                        ty: DeclarationId(2746),
                     },
                     Field {
                         label: "BridgeLedgerZero".to_string(),
-                        ty: DeclarationId(2746),
+                        ty: DeclarationId(2747),
                     },
                 ],
             },
@@ -42542,7 +42542,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9556, 21968),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9561, 21973),
         });
         declarations.push(Declaration {
             id: DeclarationId(1289),
@@ -42556,7 +42556,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 22076, 22096),
+            span: SourceSpan::new("src/v3/std/verification.dag", 22081, 22101),
         });
         declarations.push(Declaration {
             id: DeclarationId(1290),
@@ -42575,7 +42575,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 22239, 22294),
+            span: SourceSpan::new("src/v3/std/verification.dag", 22244, 22299),
         });
         declarations.push(Declaration {
             id: DeclarationId(1291),
@@ -42600,7 +42600,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "requires".to_string(),
-                        ty: DeclarationId(2747),
+                        ty: DeclarationId(2748),
                     },
                 ],
             },
@@ -42612,7 +42612,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 22904, 23037),
+            span: SourceSpan::new("src/v3/std/verification.dag", 22909, 23042),
         });
         declarations.push(Declaration {
             id: DeclarationId(1292),
@@ -42621,11 +42621,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ForAll".to_string(),
-                        ty: DeclarationId(2748),
+                        ty: DeclarationId(2749),
                     },
                     Field {
                         label: "Exists".to_string(),
-                        ty: DeclarationId(2749),
+                        ty: DeclarationId(2750),
                     },
                 ],
             },
@@ -42637,7 +42637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 23218, 23255),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23223, 23260),
         });
         declarations.push(Declaration {
             id: DeclarationId(1293),
@@ -42662,7 +42662,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "requires".to_string(),
-                        ty: DeclarationId(2750),
+                        ty: DeclarationId(2751),
                     },
                 ],
             },
@@ -42674,7 +42674,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 23257, 23418),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23262, 23423),
         });
         declarations.push(Declaration {
             id: DeclarationId(1294),
@@ -42683,11 +42683,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "EnumeratedTestNode".to_string(),
-                        ty: DeclarationId(2751),
+                        ty: DeclarationId(2752),
                     },
                     Field {
                         label: "QuantifiedTestNode".to_string(),
-                        ty: DeclarationId(2752),
+                        ty: DeclarationId(2753),
                     },
                 ],
             },
@@ -42699,7 +42699,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 25118, 25212),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25123, 25217),
         });
         declarations.push(Declaration {
             id: DeclarationId(1295),
@@ -42728,7 +42728,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 25214, 25317),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25219, 25322),
         });
         declarations.push(Declaration {
             id: DeclarationId(1296),
@@ -42737,11 +42737,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Enumerated".to_string(),
-                        ty: DeclarationId(2753),
+                        ty: DeclarationId(2754),
                     },
                     Field {
                         label: "Quantified".to_string(),
-                        ty: DeclarationId(2754),
+                        ty: DeclarationId(2755),
                     },
                 ],
             },
@@ -42753,7 +42753,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26050, 26127),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26055, 26132),
         });
         declarations.push(Declaration {
             id: DeclarationId(1297),
@@ -42766,7 +42766,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "claims".to_string(),
-                        ty: DeclarationId(2755),
+                        ty: DeclarationId(2756),
                     },
                 ],
             },
@@ -42778,7 +42778,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26129, 26189),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26134, 26194),
         });
         declarations.push(Declaration {
             id: DeclarationId(1298),
@@ -42791,7 +42791,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "resources".to_string(),
-                        ty: DeclarationId(2756),
+                        ty: DeclarationId(2757),
                     },
                 ],
             },
@@ -42803,18 +42803,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26387, 26468),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26392, 26473),
         });
         declarations.push(Declaration {
             id: DeclarationId(1299),
             name: Some("claim_obligation_resources".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1291)],
-                output: DeclarationId(2685),
+                output: DeclarationId(2686),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    26910,
-                    26926,
+                    26915,
+                    26931,
                 )),
             },
             type_params: vec![],
@@ -42825,7 +42825,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26839, 26926),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26844, 26931),
         });
         declarations.push(Declaration {
             id: DeclarationId(1300),
@@ -42835,8 +42835,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 output: DeclarationId(1298),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    26984,
-                    27069,
+                    26989,
+                    27074,
                 )),
             },
             type_params: vec![],
@@ -42847,7 +42847,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26928, 27069),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26933, 27074),
         });
         declarations.push(Declaration {
             id: DeclarationId(1301),
@@ -42857,8 +42857,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 output: DeclarationId(1298),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    27376,
-                    27442,
+                    27381,
+                    27447,
                 )),
             },
             type_params: vec![],
@@ -42869,7 +42869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 27299, 27442),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27304, 27447),
         });
         declarations.push(Declaration {
             id: DeclarationId(1302),
@@ -42887,18 +42887,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 27747, 27936),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27752, 27941),
         });
         declarations.push(Declaration {
             id: DeclarationId(1303),
             name: Some("materialize_test_obligations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2686)],
-                output: DeclarationId(2687),
+                inputs: vec![DeclarationId(2687)],
+                output: DeclarationId(2688),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    28020,
-                    28065,
+                    28025,
+                    28070,
                 )),
             },
             type_params: vec![],
@@ -42909,14 +42909,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 27938, 28065),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27943, 28070),
         });
         declarations.push(Declaration {
             id: DeclarationId(1304),
             name: Some("behavior_spine".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828)],
-                output: DeclarationId(2758),
+                output: DeclarationId(2759),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(813))),
             },
             type_params: vec![],
@@ -43044,14 +43044,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2240),
+                            constructor: DeclarationId(2241),
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2243),
+                            constructor: DeclarationId(2244),
                             payload: vec![],
                         },
                     ),
@@ -43223,17 +43223,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2321),
+                            constructor: DeclarationId(2322),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1908),
+                                constructor: DeclarationId(1909),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(
                                         "-2147483648".to_string(),
                                     )),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1907),
+                                        constructor: DeclarationId(1908),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1905),
+                                            constructor: DeclarationId(1906),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 "4294967295".to_string(),
                                             ))],
@@ -43282,7 +43282,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2322),
+                            constructor: DeclarationId(2323),
                             payload: vec![],
                         },
                     ),
@@ -43582,7 +43582,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2323),
+                                    constructor: DeclarationId(2324),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "declaration".to_string(),
                                     ))],
@@ -43686,7 +43686,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -43705,7 +43705,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "state".to_string(),
                                         ))],
@@ -43726,7 +43726,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "produced_by".to_string(),
                                         ))],
@@ -43790,7 +43790,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "file".to_string(),
                                         ))],
@@ -43809,7 +43809,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_start".to_string(),
                                         ))],
@@ -43828,7 +43828,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_end".to_string(),
                                         ))],
@@ -44140,7 +44140,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -44159,7 +44159,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -44225,7 +44225,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -44244,7 +44244,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -44310,7 +44310,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -44329,7 +44329,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "algebra".to_string(),
                                         ))],
@@ -44394,7 +44394,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2323),
+                                    constructor: DeclarationId(2324),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "permitted_accessors".to_string(),
                                     ))],
@@ -44457,7 +44457,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -44476,7 +44476,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -44540,7 +44540,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -44559,7 +44559,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -44623,7 +44623,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -44642,7 +44642,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "second".to_string(),
                                         ))],
@@ -44661,7 +44661,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -44725,7 +44725,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2325),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "member_of".to_string(),
                                         ))],
@@ -44744,7 +44744,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2325),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "slot_of".to_string(),
                                         ))],
@@ -44807,7 +44807,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2324),
+                                    constructor: DeclarationId(2325),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "node_id".to_string(),
                                     ))],
@@ -44869,7 +44869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2323),
+                                    constructor: DeclarationId(2324),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "param".to_string(),
                                     ))],
@@ -44931,7 +44931,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2323),
+                                    constructor: DeclarationId(2324),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "transform".to_string(),
                                     ))],
@@ -44994,7 +44994,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "members".to_string(),
                                         ))],
@@ -45015,7 +45015,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "intra_cluster_calls".to_string(),
                                         ))],
@@ -45243,7 +45243,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -45262,7 +45262,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -45283,7 +45283,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "connective".to_string(),
                                         ))],
@@ -45304,7 +45304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "type_params".to_string(),
                                         ))],
@@ -45325,7 +45325,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "phantom_params".to_string(),
                                         ))],
@@ -45346,7 +45346,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "meta_tag".to_string(),
                                         ))],
@@ -45367,7 +45367,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inhabits".to_string(),
                                         ))],
@@ -45388,7 +45388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value_body".to_string(),
                                         ))],
@@ -45409,7 +45409,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nominal_opacity".to_string(),
                                         ))],
@@ -45428,7 +45428,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -45740,7 +45740,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding_name".to_string(),
                                         ))],
@@ -45761,7 +45761,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload_port".to_string(),
                                         ))],
@@ -45825,7 +45825,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -45846,7 +45846,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -45865,7 +45865,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -45884,7 +45884,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -45989,7 +45989,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -46008,7 +46008,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -46029,7 +46029,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -46048,7 +46048,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -46112,7 +46112,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -46131,7 +46131,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "target".to_string(),
                                         ))],
@@ -46150,7 +46150,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inputs".to_string(),
                                         ))],
@@ -46171,7 +46171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -46190,7 +46190,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -46254,7 +46254,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -46273,7 +46273,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "input".to_string(),
                                         ))],
@@ -46292,7 +46292,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "paths".to_string(),
                                         ))],
@@ -46313,7 +46313,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -46332,7 +46332,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -46353,7 +46353,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -46417,7 +46417,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -46436,7 +46436,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "source".to_string(),
                                         ))],
@@ -46455,7 +46455,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "init".to_string(),
                                         ))],
@@ -46474,7 +46474,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -46493,7 +46493,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "bound".to_string(),
                                         ))],
@@ -46514,7 +46514,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -46533,7 +46533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -46597,7 +46597,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -46616,7 +46616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -46637,7 +46637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -46656,7 +46656,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "params".to_string(),
                                         ))],
@@ -46675,7 +46675,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -46696,7 +46696,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -46803,7 +46803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "declarations".to_string(),
                                         ))],
@@ -46822,7 +46822,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nodes".to_string(),
                                         ))],
@@ -46841,7 +46841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ports".to_string(),
                                         ))],
@@ -46862,7 +46862,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "clusters".to_string(),
                                         ))],
@@ -46925,7 +46925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2323),
+                                    constructor: DeclarationId(2324),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "items".to_string(),
                                     ))],
@@ -47029,7 +47029,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -47048,7 +47048,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -47069,7 +47069,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "refinement".to_string(),
                                         ))],
@@ -47133,7 +47133,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -47152,7 +47152,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -47216,7 +47216,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -47235,7 +47235,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -47254,7 +47254,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -47400,7 +47400,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -47419,7 +47419,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -47438,7 +47438,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -47502,7 +47502,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key".to_string(),
                                         ))],
@@ -47523,7 +47523,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key_span".to_string(),
                                         ))],
@@ -47542,7 +47542,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -47561,7 +47561,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -47625,7 +47625,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -47644,7 +47644,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -47663,7 +47663,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -47727,7 +47727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -47746,7 +47746,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -47765,7 +47765,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -48718,7 +48718,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2336),
+                            constructor: DeclarationId(2337),
                             payload: vec![],
                         },
                     ),
@@ -48758,7 +48758,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2337),
+                            constructor: DeclarationId(2338),
                             payload: vec![],
                         },
                     ),
@@ -48772,7 +48772,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2327),
+                                    constructor: DeclarationId(2328),
                                     payload: vec![],
                                 },
                             ),
@@ -48813,7 +48813,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2338),
+                            constructor: DeclarationId(2339),
                             payload: vec![],
                         },
                     ),
@@ -48828,7 +48828,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2328),
                                         payload: vec![],
                                     },
                                 ),
@@ -48841,7 +48841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2328),
                                         payload: vec![],
                                     },
                                 ),
@@ -48883,7 +48883,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2339),
+                            constructor: DeclarationId(2340),
                             payload: vec![],
                         },
                     ),
@@ -48898,7 +48898,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2328),
                                         payload: vec![],
                                     },
                                 ),
@@ -48911,7 +48911,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2328),
                                         payload: vec![],
                                     },
                                 ),
@@ -48953,7 +48953,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2340),
+                            constructor: DeclarationId(2341),
                             payload: vec![],
                         },
                     ),
@@ -48967,7 +48967,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2326),
+                                    constructor: DeclarationId(2327),
                                     payload: vec![],
                                 },
                             ),
@@ -49118,7 +49118,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2341),
+                            constructor: DeclarationId(2342),
                             payload: vec![],
                         },
                     ),
@@ -49132,7 +49132,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2326),
+                                    constructor: DeclarationId(2327),
                                     payload: vec![],
                                 },
                             ),
@@ -49173,7 +49173,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2342),
+                            constructor: DeclarationId(2343),
                             payload: vec![],
                         },
                     ),
@@ -49188,7 +49188,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2326),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![],
                                     },
                                 ),
@@ -49201,7 +49201,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2328),
                                         payload: vec![],
                                     },
                                 ),
@@ -49214,7 +49214,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2326),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![],
                                     },
                                 ),
@@ -49256,7 +49256,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2343),
+                            constructor: DeclarationId(2344),
                             payload: vec![],
                         },
                     ),
@@ -49271,7 +49271,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2326),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![],
                                     },
                                 ),
@@ -49284,7 +49284,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2326),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![],
                                     },
                                 ),
@@ -49326,7 +49326,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2344),
+                            constructor: DeclarationId(2345),
                             payload: vec![],
                         },
                     ),
@@ -49341,7 +49341,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2326),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![],
                                     },
                                 ),
@@ -49354,7 +49354,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2326),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![],
                                     },
                                 ),
@@ -49396,7 +49396,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2345),
+                            constructor: DeclarationId(2346),
                             payload: vec![],
                         },
                     ),
@@ -49411,7 +49411,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2326),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![],
                                     },
                                 ),
@@ -49424,7 +49424,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2326),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![],
                                     },
                                 ),
@@ -49466,17 +49466,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2347),
+                            constructor: DeclarationId(2348),
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1813)),
+                        FieldValue::Reference(DeclarationId(1814)),
                     ),
                     (
                         "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1815)),
+                        FieldValue::Reference(DeclarationId(1816)),
                     ),
                     (
                         "scrutinee".to_string(),
@@ -50114,49 +50114,49 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2174),
+                            constructor: DeclarationId(2175),
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2177),
+                            constructor: DeclarationId(2178),
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2180),
+                            constructor: DeclarationId(2181),
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2183),
+                            constructor: DeclarationId(2184),
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2187),
+                            constructor: DeclarationId(2188),
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2189),
+                            constructor: DeclarationId(2190),
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2193),
+                            constructor: DeclarationId(2194),
                             payload: vec![],
                         },
                     ),
@@ -50188,7 +50188,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2196),
+                                    constructor: DeclarationId(2197),
                                     payload: vec![],
                                 },
                             ),
@@ -50792,14 +50792,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2240),
+                            constructor: DeclarationId(2241),
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2243),
+                            constructor: DeclarationId(2244),
                             payload: vec![],
                         },
                     ),
@@ -50928,17 +50928,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2321),
+                            constructor: DeclarationId(2322),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1908),
+                                constructor: DeclarationId(1909),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(
                                         "-2147483648".to_string(),
                                     )),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1907),
+                                        constructor: DeclarationId(1908),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1905),
+                                            constructor: DeclarationId(1906),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 "4294967295".to_string(),
                                             ))],
@@ -50987,9 +50987,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2321),
+                            constructor: DeclarationId(2322),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1909),
+                                constructor: DeclarationId(1910),
                                 payload: vec![],
                             }],
                         },
@@ -51700,7 +51700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2323),
+                                    constructor: DeclarationId(2324),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "items".to_string(),
                                     ))],
@@ -51804,7 +51804,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -51823,7 +51823,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -51844,7 +51844,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "refinement".to_string(),
                                         ))],
@@ -51908,7 +51908,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -51927,7 +51927,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -51991,7 +51991,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -52010,7 +52010,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -52029,7 +52029,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -52175,7 +52175,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -52194,7 +52194,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -52213,7 +52213,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -52277,7 +52277,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key".to_string(),
                                         ))],
@@ -52298,7 +52298,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key_span".to_string(),
                                         ))],
@@ -52317,7 +52317,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -52336,7 +52336,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -52400,7 +52400,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -52419,7 +52419,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -52438,7 +52438,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -52502,7 +52502,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -52521,7 +52521,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -52540,7 +52540,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -53268,7 +53268,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2336),
+                            constructor: DeclarationId(2337),
                             payload: vec![],
                         },
                     ),
@@ -53308,7 +53308,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2337),
+                            constructor: DeclarationId(2338),
                             payload: vec![],
                         },
                     ),
@@ -53322,7 +53322,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2327),
+                                    constructor: DeclarationId(2328),
                                     payload: vec![],
                                 },
                             ),
@@ -53363,7 +53363,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2338),
+                            constructor: DeclarationId(2339),
                             payload: vec![],
                         },
                     ),
@@ -53378,7 +53378,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2328),
                                         payload: vec![],
                                     },
                                 ),
@@ -53391,7 +53391,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2328),
                                         payload: vec![],
                                     },
                                 ),
@@ -53433,7 +53433,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2339),
+                            constructor: DeclarationId(2340),
                             payload: vec![],
                         },
                     ),
@@ -53448,7 +53448,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2328),
                                         payload: vec![],
                                     },
                                 ),
@@ -53461,7 +53461,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2328),
                                         payload: vec![],
                                     },
                                 ),
@@ -53503,7 +53503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2340),
+                            constructor: DeclarationId(2341),
                             payload: vec![],
                         },
                     ),
@@ -53517,7 +53517,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2326),
+                                    constructor: DeclarationId(2327),
                                     payload: vec![],
                                 },
                             ),
@@ -53558,7 +53558,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2341),
+                            constructor: DeclarationId(2342),
                             payload: vec![],
                         },
                     ),
@@ -53572,7 +53572,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2326),
+                                    constructor: DeclarationId(2327),
                                     payload: vec![],
                                 },
                             ),
@@ -53613,7 +53613,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2342),
+                            constructor: DeclarationId(2343),
                             payload: vec![],
                         },
                     ),
@@ -53628,7 +53628,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2326),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![],
                                     },
                                 ),
@@ -53641,7 +53641,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2328),
                                         payload: vec![],
                                     },
                                 ),
@@ -53654,7 +53654,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2326),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![],
                                     },
                                 ),
@@ -53696,7 +53696,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2343),
+                            constructor: DeclarationId(2344),
                             payload: vec![],
                         },
                     ),
@@ -53711,7 +53711,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2326),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![],
                                     },
                                 ),
@@ -53724,7 +53724,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2326),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![],
                                     },
                                 ),
@@ -53766,7 +53766,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2344),
+                            constructor: DeclarationId(2345),
                             payload: vec![],
                         },
                     ),
@@ -53781,7 +53781,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2326),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![],
                                     },
                                 ),
@@ -53794,7 +53794,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2326),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![],
                                     },
                                 ),
@@ -53836,7 +53836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2345),
+                            constructor: DeclarationId(2346),
                             payload: vec![],
                         },
                     ),
@@ -53851,7 +53851,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2326),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![],
                                     },
                                 ),
@@ -53864,7 +53864,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2326),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![],
                                     },
                                 ),
@@ -54019,17 +54019,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2347),
+                            constructor: DeclarationId(2348),
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1813)),
+                        FieldValue::Reference(DeclarationId(1814)),
                     ),
                     (
                         "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1815)),
+                        FieldValue::Reference(DeclarationId(1816)),
                     ),
                     (
                         "scrutinee".to_string(),
@@ -54114,49 +54114,49 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2174),
+                            constructor: DeclarationId(2175),
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2179),
+                            constructor: DeclarationId(2180),
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2180),
+                            constructor: DeclarationId(2181),
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2183),
+                            constructor: DeclarationId(2184),
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2187),
+                            constructor: DeclarationId(2188),
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2188),
+                            constructor: DeclarationId(2189),
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2193),
+                            constructor: DeclarationId(2194),
                             payload: vec![],
                         },
                     ),
@@ -54191,7 +54191,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2195),
+                                    constructor: DeclarationId(2196),
                                     payload: vec![],
                                 },
                             ),
@@ -54248,14 +54248,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2242),
+                            constructor: DeclarationId(2243),
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2243),
+                            constructor: DeclarationId(2244),
                             payload: vec![],
                         },
                     ),
@@ -54673,15 +54673,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2321),
+                            constructor: DeclarationId(2322),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1908),
+                                constructor: DeclarationId(1909),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int("0".to_string())),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1907),
+                                        constructor: DeclarationId(1908),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1905),
+                                            constructor: DeclarationId(1906),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 "4294967295".to_string(),
                                             ))],
@@ -54730,17 +54730,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2321),
+                            constructor: DeclarationId(2322),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1908),
+                                constructor: DeclarationId(1909),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(
                                         "-2147483648".to_string(),
                                     )),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1907),
+                                        constructor: DeclarationId(1908),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1905),
+                                            constructor: DeclarationId(1906),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 "4294967295".to_string(),
                                             ))],
@@ -54789,7 +54789,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2320),
+                            constructor: DeclarationId(2321),
                             payload: vec![],
                         },
                     ),
@@ -54832,7 +54832,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2320),
+                            constructor: DeclarationId(2321),
                             payload: vec![],
                         },
                     ),
@@ -54875,7 +54875,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2320),
+                            constructor: DeclarationId(2321),
                             payload: vec![],
                         },
                     ),
@@ -54918,7 +54918,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2320),
+                            constructor: DeclarationId(2321),
                             payload: vec![],
                         },
                     ),
@@ -54961,7 +54961,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2322),
+                            constructor: DeclarationId(2323),
                             payload: vec![],
                         },
                     ),
@@ -55004,7 +55004,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2322),
+                            constructor: DeclarationId(2323),
                             payload: vec![],
                         },
                     ),
@@ -55304,7 +55304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2323),
+                                    constructor: DeclarationId(2324),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "declaration".to_string(),
                                     ))],
@@ -55408,7 +55408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2325),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -55427,7 +55427,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2325),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "state_value".to_string(),
                                         ))],
@@ -55448,7 +55448,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "produced_by".to_string(),
                                         ))],
@@ -55512,7 +55512,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "file".to_string(),
                                         ))],
@@ -55531,7 +55531,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_start".to_string(),
                                         ))],
@@ -55550,7 +55550,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_end".to_string(),
                                         ))],
@@ -55862,7 +55862,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -55881,7 +55881,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -55947,7 +55947,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -55966,7 +55966,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -56032,7 +56032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -56051,7 +56051,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "algebra".to_string(),
                                         ))],
@@ -56116,7 +56116,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2323),
+                                    constructor: DeclarationId(2324),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "permitted_accessors".to_string(),
                                     ))],
@@ -56181,7 +56181,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "0".to_string(),
                                         ))],
@@ -56200,7 +56200,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "1".to_string(),
                                         ))],
@@ -56264,7 +56264,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -56283,7 +56283,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -56347,7 +56347,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -56366,7 +56366,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "second".to_string(),
                                         ))],
@@ -56385,7 +56385,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -56448,7 +56448,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2324),
+                                    constructor: DeclarationId(2325),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "index_of".to_string(),
                                     ))],
@@ -56511,7 +56511,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2325),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "member_of".to_string(),
                                         ))],
@@ -56530,7 +56530,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2325),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "slot_of".to_string(),
                                         ))],
@@ -56593,7 +56593,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2324),
+                                    constructor: DeclarationId(2325),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "node_id".to_string(),
                                     ))],
@@ -56655,7 +56655,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2323),
+                                    constructor: DeclarationId(2324),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "param".to_string(),
                                     ))],
@@ -56717,7 +56717,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2323),
+                                    constructor: DeclarationId(2324),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "transform".to_string(),
                                     ))],
@@ -56780,7 +56780,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "members".to_string(),
                                         ))],
@@ -56801,7 +56801,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "intra_cluster_calls".to_string(),
                                         ))],
@@ -57029,7 +57029,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -57048,7 +57048,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -57069,7 +57069,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "connective".to_string(),
                                         ))],
@@ -57090,7 +57090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "type_params".to_string(),
                                         ))],
@@ -57111,7 +57111,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "phantom_params".to_string(),
                                         ))],
@@ -57132,7 +57132,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "meta_tag".to_string(),
                                         ))],
@@ -57153,7 +57153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inhabits".to_string(),
                                         ))],
@@ -57174,7 +57174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value_body".to_string(),
                                         ))],
@@ -57195,7 +57195,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nominal_opacity".to_string(),
                                         ))],
@@ -57214,7 +57214,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -57526,7 +57526,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding_name".to_string(),
                                         ))],
@@ -57547,7 +57547,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload_port".to_string(),
                                         ))],
@@ -57611,7 +57611,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -57632,7 +57632,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2325),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -57651,7 +57651,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -57670,7 +57670,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -57775,7 +57775,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -57794,7 +57794,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "data".to_string(),
                                         ))],
@@ -57815,7 +57815,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2325),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -57834,7 +57834,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -57855,7 +57855,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2325),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "lane2_workflow".to_string(),
                                         ))],
@@ -57919,7 +57919,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -57938,7 +57938,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "target".to_string(),
                                         ))],
@@ -57957,7 +57957,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inputs".to_string(),
                                         ))],
@@ -57978,7 +57978,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2325),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -57997,7 +57997,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -58061,7 +58061,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -58080,7 +58080,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "input".to_string(),
                                         ))],
@@ -58099,7 +58099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "paths".to_string(),
                                         ))],
@@ -58120,7 +58120,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2325),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -58139,7 +58139,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -58160,7 +58160,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2325),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -58224,7 +58224,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -58243,7 +58243,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "source".to_string(),
                                         ))],
@@ -58262,7 +58262,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "init".to_string(),
                                         ))],
@@ -58281,7 +58281,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -58300,7 +58300,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "bound".to_string(),
                                         ))],
@@ -58321,7 +58321,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2325),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -58340,7 +58340,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -58404,7 +58404,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -58423,7 +58423,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -58444,7 +58444,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2325),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -58463,7 +58463,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "params".to_string(),
                                         ))],
@@ -58482,7 +58482,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -58503,7 +58503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2325),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "lane2_workflow".to_string(),
                                         ))],
@@ -58524,7 +58524,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2325),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -58631,7 +58631,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2325),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "declarations".to_string(),
                                         ))],
@@ -58650,7 +58650,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2325),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nodes".to_string(),
                                         ))],
@@ -58669,7 +58669,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2325),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ports".to_string(),
                                         ))],
@@ -58690,7 +58690,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2325),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "clusters".to_string(),
                                         ))],
@@ -58755,7 +58755,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2323),
+                                    constructor: DeclarationId(2324),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "items".to_string(),
                                     ))],
@@ -58863,7 +58863,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -58882,7 +58882,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -58903,7 +58903,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "refinement".to_string(),
                                         ))],
@@ -58969,7 +58969,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -58988,7 +58988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -59054,7 +59054,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -59073,7 +59073,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -59092,7 +59092,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -59244,7 +59244,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -59263,7 +59263,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -59282,7 +59282,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -59348,7 +59348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key".to_string(),
                                         ))],
@@ -59369,7 +59369,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key_span".to_string(),
                                         ))],
@@ -59388,7 +59388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -59407,7 +59407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -59473,7 +59473,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -59492,7 +59492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -59511,7 +59511,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -59577,7 +59577,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -59596,7 +59596,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -59615,7 +59615,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2323),
+                                        constructor: DeclarationId(2324),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -60612,7 +60612,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2336),
+                            constructor: DeclarationId(2337),
                             payload: vec![],
                         },
                     ),
@@ -60649,61 +60649,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(691)),
                     ),
-                    (
-                        "strategy".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2337),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "parameters".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "slot".to_string(),
-                                FieldValue::Literal(LiteralBits::Int("0".to_string())),
-                            ),
-                            (
-                                "disposition".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2327),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                    (
-                        "cost".to_string(),
-                        FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                    ),
-                ],
-            }),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 37227, 37423),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1622),
-            name: Some("rust_cons_callable".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
-                arguments: vec![],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
-            specialization_parent: None,
-            inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![
-                    (
-                        "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
-                    ),
-                    (
-                        "target".to_string(),
-                        FieldValue::Reference(DeclarationId(689)),
-                    ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
@@ -60711,146 +60656,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             payload: vec![],
                         },
                     ),
-                    (
-                        "parameters".to_string(),
-                        FieldValue::List(vec![
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("0".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                        ]),
-                    ),
-                    (
-                        "cost".to_string(),
-                        FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                    ),
-                ],
-            }),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 37425, 37646),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1623),
-            name: Some("rust_concat_callable".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
-                arguments: vec![],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
-            specialization_parent: None,
-            inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![
-                    (
-                        "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
-                    ),
-                    (
-                        "target".to_string(),
-                        FieldValue::Reference(DeclarationId(699)),
-                    ),
-                    (
-                        "strategy".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2339),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "parameters".to_string(),
-                        FieldValue::List(vec![
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("0".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                        ]),
-                    ),
-                    (
-                        "cost".to_string(),
-                        FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                    ),
-                ],
-            }),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 37648, 37875),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1624),
-            name: Some("rust_length_callable".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
-                arguments: vec![],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
-            specialization_parent: None,
-            inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![
-                    (
-                        "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
-                    ),
-                    (
-                        "target".to_string(),
-                        FieldValue::Reference(DeclarationId(709)),
-                    ),
-                    (
-                        "strategy".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2340),
-                            payload: vec![],
-                        },
-                    ),
                     (
                         "parameters".to_string(),
                         FieldValue::List(vec![FieldValue::Record(vec![
@@ -60861,7 +60666,202 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2326),
+                                    constructor: DeclarationId(2328),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                    (
+                        "cost".to_string(),
+                        FieldValue::Literal(LiteralBits::Int("1".to_string())),
+                    ),
+                ],
+            }),
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/spec/rust.dag", 37227, 37423),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1622),
+            name: Some("rust_cons_callable".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1023),
+                arguments: vec![],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: Some(DeclarationId(1023)),
+            specialization_parent: None,
+            inhabits: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "language".to_string(),
+                        FieldValue::Reference(DeclarationId(1658)),
+                    ),
+                    (
+                        "target".to_string(),
+                        FieldValue::Reference(DeclarationId(689)),
+                    ),
+                    (
+                        "strategy".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2339),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "parameters".to_string(),
+                        FieldValue::List(vec![
+                            FieldValue::Record(vec![
+                                (
+                                    "slot".to_string(),
+                                    FieldValue::Literal(LiteralBits::Int("0".to_string())),
+                                ),
+                                (
+                                    "disposition".to_string(),
+                                    FieldValue::Variant {
+                                        constructor: DeclarationId(2328),
+                                        payload: vec![],
+                                    },
+                                ),
+                            ]),
+                            FieldValue::Record(vec![
+                                (
+                                    "slot".to_string(),
+                                    FieldValue::Literal(LiteralBits::Int("1".to_string())),
+                                ),
+                                (
+                                    "disposition".to_string(),
+                                    FieldValue::Variant {
+                                        constructor: DeclarationId(2328),
+                                        payload: vec![],
+                                    },
+                                ),
+                            ]),
+                        ]),
+                    ),
+                    (
+                        "cost".to_string(),
+                        FieldValue::Literal(LiteralBits::Int("1".to_string())),
+                    ),
+                ],
+            }),
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/spec/rust.dag", 37425, 37646),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1623),
+            name: Some("rust_concat_callable".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1023),
+                arguments: vec![],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: Some(DeclarationId(1023)),
+            specialization_parent: None,
+            inhabits: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "language".to_string(),
+                        FieldValue::Reference(DeclarationId(1658)),
+                    ),
+                    (
+                        "target".to_string(),
+                        FieldValue::Reference(DeclarationId(699)),
+                    ),
+                    (
+                        "strategy".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2340),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "parameters".to_string(),
+                        FieldValue::List(vec![
+                            FieldValue::Record(vec![
+                                (
+                                    "slot".to_string(),
+                                    FieldValue::Literal(LiteralBits::Int("0".to_string())),
+                                ),
+                                (
+                                    "disposition".to_string(),
+                                    FieldValue::Variant {
+                                        constructor: DeclarationId(2328),
+                                        payload: vec![],
+                                    },
+                                ),
+                            ]),
+                            FieldValue::Record(vec![
+                                (
+                                    "slot".to_string(),
+                                    FieldValue::Literal(LiteralBits::Int("1".to_string())),
+                                ),
+                                (
+                                    "disposition".to_string(),
+                                    FieldValue::Variant {
+                                        constructor: DeclarationId(2328),
+                                        payload: vec![],
+                                    },
+                                ),
+                            ]),
+                        ]),
+                    ),
+                    (
+                        "cost".to_string(),
+                        FieldValue::Literal(LiteralBits::Int("1".to_string())),
+                    ),
+                ],
+            }),
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/spec/rust.dag", 37648, 37875),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1624),
+            name: Some("rust_length_callable".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1023),
+                arguments: vec![],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: Some(DeclarationId(1023)),
+            specialization_parent: None,
+            inhabits: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "language".to_string(),
+                        FieldValue::Reference(DeclarationId(1658)),
+                    ),
+                    (
+                        "target".to_string(),
+                        FieldValue::Reference(DeclarationId(709)),
+                    ),
+                    (
+                        "strategy".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2341),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "parameters".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "slot".to_string(),
+                                FieldValue::Literal(LiteralBits::Int("0".to_string())),
+                            ),
+                            (
+                                "disposition".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2327),
                                     payload: vec![],
                                 },
                             ),
@@ -61234,7 +61234,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2341),
+                            constructor: DeclarationId(2342),
                             payload: vec![],
                         },
                     ),
@@ -61248,7 +61248,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2326),
+                                    constructor: DeclarationId(2327),
                                     payload: vec![],
                                 },
                             ),
@@ -61289,7 +61289,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2342),
+                            constructor: DeclarationId(2343),
                             payload: vec![],
                         },
                     ),
@@ -61304,7 +61304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2326),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![],
                                     },
                                 ),
@@ -61317,7 +61317,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2328),
                                         payload: vec![],
                                     },
                                 ),
@@ -61330,7 +61330,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2326),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![],
                                     },
                                 ),
@@ -61372,7 +61372,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2343),
+                            constructor: DeclarationId(2344),
                             payload: vec![],
                         },
                     ),
@@ -61387,7 +61387,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2326),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![],
                                     },
                                 ),
@@ -61400,7 +61400,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2326),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![],
                                     },
                                 ),
@@ -61442,7 +61442,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2344),
+                            constructor: DeclarationId(2345),
                             payload: vec![],
                         },
                     ),
@@ -61457,7 +61457,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2326),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![],
                                     },
                                 ),
@@ -61470,7 +61470,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2326),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![],
                                     },
                                 ),
@@ -61512,7 +61512,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2345),
+                            constructor: DeclarationId(2346),
                             payload: vec![],
                         },
                     ),
@@ -61527,7 +61527,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2326),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![],
                                     },
                                 ),
@@ -61540,7 +61540,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2326),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![],
                                     },
                                 ),
@@ -61582,17 +61582,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2347),
+                            constructor: DeclarationId(2348),
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1813)),
+                        FieldValue::Reference(DeclarationId(1814)),
                     ),
                     (
                         "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1815)),
+                        FieldValue::Reference(DeclarationId(1816)),
                     ),
                     (
                         "scrutinee".to_string(),
@@ -62026,7 +62026,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{ let mut __left = {left}; __left.extend({right}); __left }"
                                     .to_string(),
@@ -62040,7 +62040,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -62080,7 +62080,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).len() as i64".to_string(),
                             ))],
@@ -62093,7 +62093,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -62131,7 +62131,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).is_empty()".to_string(),
                             ))],
@@ -62144,7 +62144,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -62184,7 +62184,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).iter().fold({init}, {body})".to_string(),
                             ))],
@@ -62197,7 +62197,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -62237,7 +62237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2355),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).iter().map({body}).collect::<Vec<_>>()".to_string(),
                             ))],
@@ -62250,7 +62250,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
@@ -62322,14 +62322,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "read".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2348),
+                            constructor: DeclarationId(2349),
                             payload: vec![],
                         },
                     ),
                     (
                         "construct".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2350),
+                            constructor: DeclarationId(2351),
                             payload: vec![],
                         },
                     ),
@@ -62460,49 +62460,49 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2174),
+                            constructor: DeclarationId(2175),
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2177),
+                            constructor: DeclarationId(2178),
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2181),
+                            constructor: DeclarationId(2182),
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2183),
+                            constructor: DeclarationId(2184),
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2186),
+                            constructor: DeclarationId(2187),
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2189),
+                            constructor: DeclarationId(2190),
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2192),
+                            constructor: DeclarationId(2193),
                             payload: vec![],
                         },
                     ),
@@ -62540,7 +62540,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2195),
+                                    constructor: DeclarationId(2196),
                                     payload: vec![],
                                 },
                             ),
@@ -63151,15 +63151,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "SnapshotSurface".to_string(),
-                        ty: DeclarationId(2759),
+                        ty: DeclarationId(2760),
                     },
                     Field {
                         label: "SnapshotDag".to_string(),
-                        ty: DeclarationId(2760),
+                        ty: DeclarationId(2761),
                     },
                     Field {
                         label: "SnapshotText".to_string(),
-                        ty: DeclarationId(2761),
+                        ty: DeclarationId(2762),
                     },
                 ],
             },
@@ -63375,7 +63375,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2759),
+                            constructor: DeclarationId(2760),
                             payload: vec![],
                         },
                     ),
@@ -63410,7 +63410,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2760),
+                            constructor: DeclarationId(2761),
                             payload: vec![],
                         },
                     ),
@@ -63445,7 +63445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2760),
+                            constructor: DeclarationId(2761),
                             payload: vec![],
                         },
                     ),
@@ -63480,7 +63480,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2760),
+                            constructor: DeclarationId(2761),
                             payload: vec![],
                         },
                     ),
@@ -63515,7 +63515,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2760),
+                            constructor: DeclarationId(2761),
                             payload: vec![],
                         },
                     ),
@@ -63550,7 +63550,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2761),
+                            constructor: DeclarationId(2762),
                             payload: vec![],
                         },
                     ),
@@ -63700,7 +63700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("from_symbol".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230)],
-                output: DeclarationId(2762),
+                output: DeclarationId(2763),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/compiler/operators.dag",
                     156,
@@ -63931,6 +63931,42 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         });
         declarations.push(Declaration {
             id: DeclarationId(1711),
+            name: Some("lens_parallelism_entry".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1706),
+                arguments: vec![],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: Some(DeclarationId(1706)),
+            specialization_parent: None,
+            inhabits: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "name".to_string(),
+                        FieldValue::Literal(LiteralBits::String("parallelism".to_string())),
+                    ),
+                    (
+                        "lens_file".to_string(),
+                        FieldValue::Literal(LiteralBits::String(
+                            "src/v3/lenses/parallelism.dag".to_string(),
+                        )),
+                    ),
+                    (
+                        "generated_file".to_string(),
+                        FieldValue::Literal(LiteralBits::String(
+                            "src/v3/compiler/src/lens_parallelism_generated.rs".to_string(),
+                        )),
+                    ),
+                ],
+            }),
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 3037, 3226),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1712),
             name: Some("lens_provenance_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1706),
@@ -63963,10 +63999,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 3037, 3222),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 3228, 3413),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1712),
+            id: DeclarationId(1713),
             name: Some("lens_structural_resolution_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1706),
@@ -64002,10 +64038,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 3224, 3453),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 3415, 3644),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1713),
+            id: DeclarationId(1714),
             name: Some("lens_unused_parameters_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1706),
@@ -64038,10 +64074,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 3455, 3668),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 3646, 3859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1714),
+            id: DeclarationId(1715),
             name: Some("lens_infer_helpers_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1706),
@@ -64074,10 +64110,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 4295, 4487),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 4486, 4678),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1715),
+            id: DeclarationId(1716),
             name: Some("lens_variant_payload_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1706),
@@ -64110,10 +64146,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 4489, 4689),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 4680, 4880),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1716),
+            id: DeclarationId(1717),
             name: Some("lens_lower_helpers_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1706),
@@ -64146,20 +64182,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 4939, 5131),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 5130, 5322),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1717),
+            id: DeclarationId(1718),
             name: Some("IntegerAlgebra".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "OrderedRingAlgebra".to_string(),
-                        ty: DeclarationId(2763),
+                        ty: DeclarationId(2764),
                     },
                     Field {
                         label: "SemiringAlgebra".to_string(),
-                        ty: DeclarationId(2764),
+                        ty: DeclarationId(2765),
                     },
                 ],
             },
@@ -64174,21 +64210,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6404, 6466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1718),
+            id: DeclarationId(1719),
             name: Some("NonIntegerAlgebra".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ApproximateFieldAlgebra".to_string(),
-                        ty: DeclarationId(2765),
+                        ty: DeclarationId(2766),
                     },
                     Field {
                         label: "BooleanAlgebraAlgebra".to_string(),
-                        ty: DeclarationId(2766),
+                        ty: DeclarationId(2767),
                     },
                     Field {
                         label: "TerminalAlgebra".to_string(),
-                        ty: DeclarationId(2767),
+                        ty: DeclarationId(2768),
                     },
                 ],
             },
@@ -64203,37 +64239,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6468, 6564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1719),
+            id: DeclarationId(1720),
             name: Some("TargetCarrier".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BitCarrier".to_string(),
-                        ty: DeclarationId(2768),
+                        ty: DeclarationId(2769),
                     },
                     Field {
                         label: "ByteCarrier".to_string(),
-                        ty: DeclarationId(2769),
+                        ty: DeclarationId(2770),
                     },
                     Field {
                         label: "Word16Carrier".to_string(),
-                        ty: DeclarationId(2770),
+                        ty: DeclarationId(2771),
                     },
                     Field {
                         label: "Word32Carrier".to_string(),
-                        ty: DeclarationId(2771),
+                        ty: DeclarationId(2772),
                     },
                     Field {
                         label: "Word64Carrier".to_string(),
-                        ty: DeclarationId(2772),
+                        ty: DeclarationId(2773),
                     },
                     Field {
                         label: "Word128Carrier".to_string(),
-                        ty: DeclarationId(2773),
+                        ty: DeclarationId(2774),
                     },
                     Field {
                         label: "TerminalCarrier".to_string(),
-                        ty: DeclarationId(2774),
+                        ty: DeclarationId(2775),
                     },
                 ],
             },
@@ -64248,21 +64284,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8154, 8296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1720),
+            id: DeclarationId(1721),
             name: Some("IntegerOverflow".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TwoComplementWrap".to_string(),
-                        ty: DeclarationId(2775),
+                        ty: DeclarationId(2776),
                     },
                     Field {
                         label: "Saturating".to_string(),
-                        ty: DeclarationId(2776),
+                        ty: DeclarationId(2777),
                     },
                     Field {
                         label: "Trap".to_string(),
-                        ty: DeclarationId(2777),
+                        ty: DeclarationId(2778),
                     },
                 ],
             },
@@ -64277,17 +64313,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9013, 9079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1721),
+            id: DeclarationId(1722),
             name: Some("RustPrimitive".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IntegerPrimitive".to_string(),
-                        ty: DeclarationId(2778),
+                        ty: DeclarationId(2779),
                     },
                     Field {
                         label: "NonIntegerPrimitive".to_string(),
-                        ty: DeclarationId(2779),
+                        ty: DeclarationId(2780),
                     },
                 ],
             },
@@ -64302,94 +64338,94 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9834, 10616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1722),
+            id: DeclarationId(1723),
             name: Some("rust_pilot_primitives".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1721),
+                    value: DeclarationId(1722),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2780)),
+            meta_tag: Some(DeclarationId(2781)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
                 FieldValue::Variant {
-                    constructor: DeclarationId(2778),
+                    constructor: DeclarationId(2779),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2763),
+                            constructor: DeclarationId(2764),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2769),
+                            constructor: DeclarationId(2770),
                             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(2775),
+                            constructor: DeclarationId(2776),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2778),
+                    constructor: DeclarationId(2779),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2763),
+                            constructor: DeclarationId(2764),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2770),
+                            constructor: DeclarationId(2771),
                             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(2775),
+                            constructor: DeclarationId(2776),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2778),
+                    constructor: DeclarationId(2779),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2763),
+                            constructor: DeclarationId(2764),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2771),
+                            constructor: DeclarationId(2772),
                             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(2775),
+                            constructor: DeclarationId(2776),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2778),
+                    constructor: DeclarationId(2779),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2763),
+                            constructor: DeclarationId(2764),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2772),
+                            constructor: DeclarationId(2773),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -64398,21 +64434,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         FieldValue::Literal(LiteralBits::String("9223372036854775807".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2775),
+                            constructor: DeclarationId(2776),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2778),
+                    constructor: DeclarationId(2779),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i128".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2763),
+                            constructor: DeclarationId(2764),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2773),
+                            constructor: DeclarationId(2774),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -64423,84 +64459,84 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2775),
+                            constructor: DeclarationId(2776),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2778),
+                    constructor: DeclarationId(2779),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2764),
+                            constructor: DeclarationId(2765),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2769),
+                            constructor: DeclarationId(2770),
                             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(2775),
+                            constructor: DeclarationId(2776),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2778),
+                    constructor: DeclarationId(2779),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2764),
+                            constructor: DeclarationId(2765),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2770),
+                            constructor: DeclarationId(2771),
                             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(2775),
+                            constructor: DeclarationId(2776),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2778),
+                    constructor: DeclarationId(2779),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2764),
+                            constructor: DeclarationId(2765),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2771),
+                            constructor: DeclarationId(2772),
                             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(2775),
+                            constructor: DeclarationId(2776),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2778),
+                    constructor: DeclarationId(2779),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2764),
+                            constructor: DeclarationId(2765),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2772),
+                            constructor: DeclarationId(2773),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
@@ -64509,21 +64545,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2775),
+                            constructor: DeclarationId(2776),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2778),
+                    constructor: DeclarationId(2779),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u128".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2764),
+                            constructor: DeclarationId(2765),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2773),
+                            constructor: DeclarationId(2774),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
@@ -64532,66 +64568,66 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2775),
+                            constructor: DeclarationId(2776),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2779),
+                    constructor: DeclarationId(2780),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("f32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2765),
+                            constructor: DeclarationId(2766),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2771),
+                            constructor: DeclarationId(2772),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2779),
+                    constructor: DeclarationId(2780),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("f64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2765),
+                            constructor: DeclarationId(2766),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2772),
+                            constructor: DeclarationId(2773),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2779),
+                    constructor: DeclarationId(2780),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("bool".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2766),
+                            constructor: DeclarationId(2767),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2768),
+                            constructor: DeclarationId(2769),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2779),
+                    constructor: DeclarationId(2780),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("()".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2767),
+                            constructor: DeclarationId(2768),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2774),
+                            constructor: DeclarationId(2775),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
@@ -64603,29 +64639,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10937, 15660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1723),
+            id: DeclarationId(1724),
             name: Some("CronField".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Wildcard".to_string(),
-                        ty: DeclarationId(2781),
+                        ty: DeclarationId(2782),
                     },
                     Field {
                         label: "Exact".to_string(),
-                        ty: DeclarationId(2782),
+                        ty: DeclarationId(2783),
                     },
                     Field {
                         label: "Listed".to_string(),
-                        ty: DeclarationId(2784),
+                        ty: DeclarationId(2785),
                     },
                     Field {
                         label: "Ranged".to_string(),
-                        ty: DeclarationId(2785),
+                        ty: DeclarationId(2786),
                     },
                     Field {
                         label: "Step".to_string(),
-                        ty: DeclarationId(2786),
+                        ty: DeclarationId(2787),
                     },
                 ],
             },
@@ -64640,29 +64676,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4214, 4433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1724),
+            id: DeclarationId(1725),
             name: Some("CronSchedule".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "minute".to_string(),
-                        ty: DeclarationId(1723),
+                        ty: DeclarationId(1724),
                     },
                     Field {
                         label: "hour".to_string(),
-                        ty: DeclarationId(1723),
+                        ty: DeclarationId(1724),
                     },
                     Field {
                         label: "day_of_month".to_string(),
-                        ty: DeclarationId(1723),
+                        ty: DeclarationId(1724),
                     },
                     Field {
                         label: "month".to_string(),
-                        ty: DeclarationId(1723),
+                        ty: DeclarationId(1724),
                     },
                     Field {
                         label: "day_of_week".to_string(),
-                        ty: DeclarationId(1723),
+                        ty: DeclarationId(1724),
                     },
                 ],
             },
@@ -64677,7 +64713,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4435, 4564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1725),
+            id: DeclarationId(1726),
             name: Some("CronEntry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64687,7 +64723,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "schedule".to_string(),
-                        ty: DeclarationId(1724),
+                        ty: DeclarationId(1725),
                     },
                     Field {
                         label: "command".to_string(),
@@ -64706,10 +64742,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4566, 4641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1726),
+            id: DeclarationId(1727),
             name: Some("render_cron_field".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1723)],
+                inputs: vec![DeclarationId(1724)],
                 output: DeclarationId(230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "dsl/extdeps/cron_schedule_model.dag",
@@ -64728,10 +64764,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4643, 4963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1727),
+            id: DeclarationId(1728),
             name: Some("render_cron_schedule".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1724)],
+                inputs: vec![DeclarationId(1725)],
                 output: DeclarationId(230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "dsl/extdeps/cron_schedule_model.dag",
@@ -64750,7 +64786,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4965, 5253),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1728),
+            id: DeclarationId(1729),
             name: Some("wire_contract".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(312),
@@ -64771,21 +64807,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 684, 758),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1729),
+            id: DeclarationId(1730),
             name: Some("UserType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "User".to_string(),
-                        ty: DeclarationId(2787),
+                        ty: DeclarationId(2788),
                     },
                     Field {
                         label: "Bot".to_string(),
-                        ty: DeclarationId(2788),
+                        ty: DeclarationId(2789),
                     },
                     Field {
                         label: "Organization".to_string(),
-                        ty: DeclarationId(2789),
+                        ty: DeclarationId(2790),
                     },
                 ],
             },
@@ -64800,7 +64836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 831, 872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1730),
+            id: DeclarationId(1731),
             name: Some("GitHubUser".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64814,7 +64850,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type".to_string(),
-                        ty: DeclarationId(1729),
+                        ty: DeclarationId(1730),
                     },
                 ],
             },
@@ -64829,7 +64865,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 874, 936),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1731),
+            id: DeclarationId(1732),
             name: Some("Repository".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64866,7 +64902,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1009, 1120),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1732),
+            id: DeclarationId(1733),
             name: Some("GitHubAuthToken".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64876,11 +64912,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "scopes".to_string(),
-                        ty: DeclarationId(2790),
+                        ty: DeclarationId(2791),
                     },
                     Field {
                         label: "expires_at".to_string(),
-                        ty: DeclarationId(2791),
+                        ty: DeclarationId(2792),
                     },
                 ],
             },
@@ -64895,29 +64931,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1193, 1286),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1733),
+            id: DeclarationId(1734),
             name: Some("GitHubScope".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ScopeRepo".to_string(),
-                        ty: DeclarationId(2792),
+                        ty: DeclarationId(2793),
                     },
                     Field {
                         label: "ScopeGist".to_string(),
-                        ty: DeclarationId(2793),
+                        ty: DeclarationId(2794),
                     },
                     Field {
                         label: "ScopeWorkflow".to_string(),
-                        ty: DeclarationId(2794),
+                        ty: DeclarationId(2795),
                     },
                     Field {
                         label: "ScopeReadOrg".to_string(),
-                        ty: DeclarationId(2795),
+                        ty: DeclarationId(2796),
                     },
                     Field {
                         label: "ScopeReadUser".to_string(),
-                        ty: DeclarationId(2796),
+                        ty: DeclarationId(2797),
                     },
                 ],
             },
@@ -64932,7 +64968,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1288, 1385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1734),
+            id: DeclarationId(1735),
             name: Some("Pagination".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64942,7 +64978,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "cursor".to_string(),
-                        ty: DeclarationId(2797),
+                        ty: DeclarationId(2798),
                     },
                     Field {
                         label: "has_next".to_string(),
@@ -64961,21 +64997,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1510, 1580),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1735),
+            id: DeclarationId(1736),
             name: Some("GitHubPermission".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PermRead".to_string(),
-                        ty: DeclarationId(2798),
+                        ty: DeclarationId(2799),
                     },
                     Field {
                         label: "PermWrite".to_string(),
-                        ty: DeclarationId(2799),
+                        ty: DeclarationId(2800),
                     },
                     Field {
                         label: "PermAdmin".to_string(),
-                        ty: DeclarationId(2800),
+                        ty: DeclarationId(2801),
                     },
                 ],
             },
@@ -64990,7 +65026,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1653, 1709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1736),
+            id: DeclarationId(1737),
             name: Some("default_api_base".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65009,7 +65045,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1782, 1838),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1737),
+            id: DeclarationId(1738),
             name: Some("default_per_page".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -65026,7 +65062,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1840, 1871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1738),
+            id: DeclarationId(1739),
             name: Some("max_per_page".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -65043,7 +65079,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1873, 1901),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1739),
+            id: DeclarationId(1740),
             name: Some("Workflow".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65053,23 +65089,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "on".to_string(),
-                        ty: DeclarationId(2801),
+                        ty: DeclarationId(2802),
                     },
                     Field {
                         label: "concurrency".to_string(),
-                        ty: DeclarationId(2802),
+                        ty: DeclarationId(2803),
                     },
                     Field {
                         label: "jobs".to_string(),
-                        ty: DeclarationId(2803),
+                        ty: DeclarationId(2804),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(2805),
+                        ty: DeclarationId(2806),
                     },
                     Field {
                         label: "permissions".to_string(),
-                        ty: DeclarationId(2806),
+                        ty: DeclarationId(2807),
                     },
                 ],
             },
@@ -65084,25 +65120,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1484, 1748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1740),
+            id: DeclarationId(1741),
             name: Some("WorkflowPermissions".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "contents".to_string(),
-                        ty: DeclarationId(1741),
+                        ty: DeclarationId(1742),
                     },
                     Field {
                         label: "pull_requests".to_string(),
-                        ty: DeclarationId(1741),
+                        ty: DeclarationId(1742),
                     },
                     Field {
                         label: "issues".to_string(),
-                        ty: DeclarationId(1741),
+                        ty: DeclarationId(1742),
                     },
                     Field {
                         label: "actions".to_string(),
-                        ty: DeclarationId(1741),
+                        ty: DeclarationId(1742),
                     },
                 ],
             },
@@ -65117,21 +65153,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1750, 1892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1741),
+            id: DeclarationId(1742),
             name: Some("PermissionLevel".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PermRead".to_string(),
-                        ty: DeclarationId(2807),
+                        ty: DeclarationId(2808),
                     },
                     Field {
                         label: "PermWrite".to_string(),
-                        ty: DeclarationId(2808),
+                        ty: DeclarationId(2809),
                     },
                     Field {
                         label: "PermNone".to_string(),
-                        ty: DeclarationId(2809),
+                        ty: DeclarationId(2810),
                     },
                 ],
             },
@@ -65146,29 +65182,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1894, 1948),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1742),
+            id: DeclarationId(1743),
             name: Some("WorkflowTrigger".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Push".to_string(),
-                        ty: DeclarationId(2812),
+                        ty: DeclarationId(2813),
                     },
                     Field {
                         label: "PullRequest".to_string(),
-                        ty: DeclarationId(2815),
+                        ty: DeclarationId(2816),
                     },
                     Field {
                         label: "Schedule".to_string(),
-                        ty: DeclarationId(2816),
+                        ty: DeclarationId(2817),
                     },
                     Field {
                         label: "WorkflowDispatch".to_string(),
-                        ty: DeclarationId(2818),
+                        ty: DeclarationId(2819),
                     },
                     Field {
                         label: "WorkflowCall".to_string(),
-                        ty: DeclarationId(2820),
+                        ty: DeclarationId(2821),
                     },
                 ],
             },
@@ -65183,29 +65219,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2064, 2356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1743),
+            id: DeclarationId(1744),
             name: Some("PullRequestActivity".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Opened".to_string(),
-                        ty: DeclarationId(2821),
+                        ty: DeclarationId(2822),
                     },
                     Field {
                         label: "Synchronize".to_string(),
-                        ty: DeclarationId(2822),
+                        ty: DeclarationId(2823),
                     },
                     Field {
                         label: "Reopened".to_string(),
-                        ty: DeclarationId(2823),
+                        ty: DeclarationId(2824),
                     },
                     Field {
                         label: "ReadyForReview".to_string(),
-                        ty: DeclarationId(2824),
+                        ty: DeclarationId(2825),
                     },
                     Field {
                         label: "Closed".to_string(),
-                        ty: DeclarationId(2825),
+                        ty: DeclarationId(2826),
                     },
                 ],
             },
@@ -65220,7 +65256,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2358, 2452),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1744),
+            id: DeclarationId(1745),
             name: Some("DispatchInput".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65230,7 +65266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "description".to_string(),
-                        ty: DeclarationId(2826),
+                        ty: DeclarationId(2827),
                     },
                     Field {
                         label: "required".to_string(),
@@ -65238,11 +65274,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "default".to_string(),
-                        ty: DeclarationId(2827),
+                        ty: DeclarationId(2828),
                     },
                     Field {
                         label: "type".to_string(),
-                        ty: DeclarationId(1745),
+                        ty: DeclarationId(1746),
                     },
                 ],
             },
@@ -65257,25 +65293,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2454, 2576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1745),
+            id: DeclarationId(1746),
             name: Some("DispatchInputType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "InputString".to_string(),
-                        ty: DeclarationId(2828),
+                        ty: DeclarationId(2829),
                     },
                     Field {
                         label: "InputBoolean".to_string(),
-                        ty: DeclarationId(2829),
+                        ty: DeclarationId(2830),
                     },
                     Field {
                         label: "InputChoice".to_string(),
-                        ty: DeclarationId(2830),
+                        ty: DeclarationId(2831),
                     },
                     Field {
                         label: "InputEnvironment".to_string(),
-                        ty: DeclarationId(2831),
+                        ty: DeclarationId(2832),
                     },
                 ],
             },
@@ -65290,21 +65326,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2578, 2662),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1746),
+            id: DeclarationId(1747),
             name: Some("SecretScope".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "StepScope".to_string(),
-                        ty: DeclarationId(2832),
+                        ty: DeclarationId(2833),
                     },
                     Field {
                         label: "JobScope".to_string(),
-                        ty: DeclarationId(2833),
+                        ty: DeclarationId(2834),
                     },
                     Field {
                         label: "WorkflowScope".to_string(),
-                        ty: DeclarationId(2834),
+                        ty: DeclarationId(2835),
                     },
                 ],
             },
@@ -65319,7 +65355,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4765, 4820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1747),
+            id: DeclarationId(1748),
             name: Some("WorkflowSecret".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65329,7 +65365,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "scope".to_string(),
-                        ty: DeclarationId(1746),
+                        ty: DeclarationId(1747),
                     },
                 ],
             },
@@ -65344,7 +65380,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5095, 5158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1748),
+            id: DeclarationId(1749),
             name: Some("Job".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65354,39 +65390,39 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(2835),
+                        ty: DeclarationId(2836),
                     },
                     Field {
                         label: "runner".to_string(),
-                        ty: DeclarationId(1752),
+                        ty: DeclarationId(1753),
                     },
                     Field {
                         label: "steps".to_string(),
-                        ty: DeclarationId(2836),
+                        ty: DeclarationId(2837),
                     },
                     Field {
                         label: "needs".to_string(),
-                        ty: DeclarationId(2837),
+                        ty: DeclarationId(2838),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(2839),
+                        ty: DeclarationId(2840),
                     },
                     Field {
                         label: "outputs".to_string(),
-                        ty: DeclarationId(2841),
+                        ty: DeclarationId(2842),
                     },
                     Field {
                         label: "if_condition".to_string(),
-                        ty: DeclarationId(2842),
+                        ty: DeclarationId(2843),
                     },
                     Field {
                         label: "strategy".to_string(),
-                        ty: DeclarationId(2843),
+                        ty: DeclarationId(2844),
                     },
                     Field {
                         label: "timeout_minutes".to_string(),
-                        ty: DeclarationId(2844),
+                        ty: DeclarationId(2845),
                     },
                     Field {
                         label: "continue_on_error".to_string(),
@@ -65394,7 +65430,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "concurrency".to_string(),
-                        ty: DeclarationId(2845),
+                        ty: DeclarationId(2846),
                     },
                 ],
             },
@@ -65409,17 +65445,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5302, 5771),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1749),
+            id: DeclarationId(1750),
             name: Some("CancelInProgressSpec".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "CancelInProgressBool".to_string(),
-                        ty: DeclarationId(2846),
+                        ty: DeclarationId(2847),
                     },
                     Field {
                         label: "CancelInProgressExpression".to_string(),
-                        ty: DeclarationId(2847),
+                        ty: DeclarationId(2848),
                     },
                 ],
             },
@@ -65434,17 +65470,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6589, 6709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1750),
+            id: DeclarationId(1751),
             name: Some("CancelInProgressWhenQueueMax".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "QueueMaxCancelInProgressFalse".to_string(),
-                        ty: DeclarationId(2848),
+                        ty: DeclarationId(2849),
                     },
                     Field {
                         label: "QueueMaxCancelInProgressExpression".to_string(),
-                        ty: DeclarationId(2849),
+                        ty: DeclarationId(2850),
                     },
                 ],
             },
@@ -65459,21 +65495,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7517, 7646),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1751),
+            id: DeclarationId(1752),
             name: Some("ConcurrencySpec".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ConcurrencyScalar".to_string(),
-                        ty: DeclarationId(2850),
+                        ty: DeclarationId(2851),
                     },
                     Field {
                         label: "ConcurrencyMappingQueueMax".to_string(),
-                        ty: DeclarationId(2852),
+                        ty: DeclarationId(2853),
                     },
                     Field {
                         label: "ConcurrencyMappingQueueNotMax".to_string(),
-                        ty: DeclarationId(2855),
+                        ty: DeclarationId(2856),
                     },
                 ],
             },
@@ -65488,21 +65524,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8199, 8845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1752),
+            id: DeclarationId(1753),
             name: Some("RunnerSpec".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "HostedRunner".to_string(),
-                        ty: DeclarationId(2856),
+                        ty: DeclarationId(2857),
                     },
                     Field {
                         label: "SelfHosted".to_string(),
-                        ty: DeclarationId(2858),
+                        ty: DeclarationId(2859),
                     },
                     Field {
                         label: "RunsOnExpression".to_string(),
-                        ty: DeclarationId(2859),
+                        ty: DeclarationId(2860),
                     },
                 ],
             },
@@ -65517,33 +65553,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10017, 10240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1753),
+            id: DeclarationId(1754),
             name: Some("RunnerLabel".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "UbuntuLatest".to_string(),
-                        ty: DeclarationId(2860),
+                        ty: DeclarationId(2861),
                     },
                     Field {
                         label: "Ubuntu2404".to_string(),
-                        ty: DeclarationId(2861),
+                        ty: DeclarationId(2862),
                     },
                     Field {
                         label: "Ubuntu2204".to_string(),
-                        ty: DeclarationId(2862),
+                        ty: DeclarationId(2863),
                     },
                     Field {
                         label: "MacosLatest".to_string(),
-                        ty: DeclarationId(2863),
+                        ty: DeclarationId(2864),
                     },
                     Field {
                         label: "Macos14".to_string(),
-                        ty: DeclarationId(2864),
+                        ty: DeclarationId(2865),
                     },
                     Field {
                         label: "WindowsLatest".to_string(),
-                        ty: DeclarationId(2865),
+                        ty: DeclarationId(2866),
                     },
                 ],
             },
@@ -65558,17 +65594,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10242, 10351),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1754),
+            id: DeclarationId(1755),
             name: Some("Step".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "RunStep".to_string(),
-                        ty: DeclarationId(2873),
+                        ty: DeclarationId(2874),
                     },
                     Field {
                         label: "UsesStep".to_string(),
-                        ty: DeclarationId(2881),
+                        ty: DeclarationId(2882),
                     },
                 ],
             },
@@ -65583,29 +65619,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10496, 11001),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1755),
+            id: DeclarationId(1756),
             name: Some("ShellType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Bash".to_string(),
-                        ty: DeclarationId(2882),
+                        ty: DeclarationId(2883),
                     },
                     Field {
                         label: "Sh".to_string(),
-                        ty: DeclarationId(2883),
+                        ty: DeclarationId(2884),
                     },
                     Field {
                         label: "Pwsh".to_string(),
-                        ty: DeclarationId(2884),
+                        ty: DeclarationId(2885),
                     },
                     Field {
                         label: "Python".to_string(),
-                        ty: DeclarationId(2885),
+                        ty: DeclarationId(2886),
                     },
                     Field {
                         label: "Cmd".to_string(),
-                        ty: DeclarationId(2886),
+                        ty: DeclarationId(2887),
                     },
                 ],
             },
@@ -65620,7 +65656,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11003, 11051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1756),
+            id: DeclarationId(1757),
             name: Some("ActionRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65649,41 +65685,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11053, 11116),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1757),
+            id: DeclarationId(1758),
             name: Some("LogAnnotation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "AnnotationError".to_string(),
-                        ty: DeclarationId(2890),
+                        ty: DeclarationId(2891),
                     },
                     Field {
                         label: "AnnotationWarning".to_string(),
-                        ty: DeclarationId(2894),
+                        ty: DeclarationId(2895),
                     },
                     Field {
                         label: "AnnotationNotice".to_string(),
-                        ty: DeclarationId(2898),
+                        ty: DeclarationId(2899),
                     },
                     Field {
                         label: "AnnotationGroup".to_string(),
-                        ty: DeclarationId(2899),
+                        ty: DeclarationId(2900),
                     },
                     Field {
                         label: "AnnotationEndGroup".to_string(),
-                        ty: DeclarationId(2900),
+                        ty: DeclarationId(2901),
                     },
                     Field {
                         label: "SetOutput".to_string(),
-                        ty: DeclarationId(2901),
+                        ty: DeclarationId(2902),
                     },
                     Field {
                         label: "AddMask".to_string(),
-                        ty: DeclarationId(2902),
+                        ty: DeclarationId(2903),
                     },
                     Field {
                         label: "StopCommands".to_string(),
-                        ty: DeclarationId(2903),
+                        ty: DeclarationId(2904),
                     },
                 ],
             },
@@ -65698,7 +65734,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11350, 11777),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1758),
+            id: DeclarationId(1759),
             name: Some("annotation_error_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65717,7 +65753,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11843, 11892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1759),
+            id: DeclarationId(1760),
             name: Some("annotation_warning_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65736,7 +65772,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11893, 11946),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1760),
+            id: DeclarationId(1761),
             name: Some("annotation_notice_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65755,7 +65791,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11947, 11998),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1761),
+            id: DeclarationId(1762),
             name: Some("annotation_group_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65774,7 +65810,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11999, 12049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1762),
+            id: DeclarationId(1763),
             name: Some("annotation_endgroup".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65793,7 +65829,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12050, 12099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1763),
+            id: DeclarationId(1764),
             name: Some("annotation_set_output_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65812,7 +65848,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12100, 12164),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1764),
+            id: DeclarationId(1765),
             name: Some("annotation_add_mask_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65831,7 +65867,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12165, 12221),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1765),
+            id: DeclarationId(1766),
             name: Some("annotation_stop_commands_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65850,17 +65886,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12222, 12288),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1766),
+            id: DeclarationId(1767),
             name: Some("ArtifactOp".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Upload".to_string(),
-                        ty: DeclarationId(2905),
+                        ty: DeclarationId(2906),
                     },
                     Field {
                         label: "Download".to_string(),
-                        ty: DeclarationId(2907),
+                        ty: DeclarationId(2908),
                     },
                 ],
             },
@@ -65875,21 +65911,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12510, 12675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1767),
+            id: DeclarationId(1768),
             name: Some("MissingFilesBehavior".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Warn".to_string(),
-                        ty: DeclarationId(2908),
+                        ty: DeclarationId(2909),
                     },
                     Field {
                         label: "ErrorOut".to_string(),
-                        ty: DeclarationId(2909),
+                        ty: DeclarationId(2910),
                     },
                     Field {
                         label: "Ignore".to_string(),
-                        ty: DeclarationId(2910),
+                        ty: DeclarationId(2911),
                     },
                 ],
             },
@@ -65904,15 +65940,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12677, 12729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1768),
+            id: DeclarationId(1769),
             name: Some("upload_artifact_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1756),
+                template: DeclarationId(1757),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1756)),
+            meta_tag: Some(DeclarationId(1757)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -65925,15 +65961,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12780, 12889),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1769),
+            id: DeclarationId(1770),
             name: Some("download_artifact_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1756),
+                template: DeclarationId(1757),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1756)),
+            meta_tag: Some(DeclarationId(1757)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -65946,21 +65982,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12891, 13004),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1770),
+            id: DeclarationId(1771),
             name: Some("MatrixStrategy".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "dimensions".to_string(),
-                        ty: DeclarationId(2912),
+                        ty: DeclarationId(2913),
                     },
                     Field {
                         label: "include".to_string(),
-                        ty: DeclarationId(2914),
+                        ty: DeclarationId(2915),
                     },
                     Field {
                         label: "exclude".to_string(),
-                        ty: DeclarationId(2916),
+                        ty: DeclarationId(2917),
                     },
                     Field {
                         label: "fail_fast".to_string(),
@@ -65968,7 +66004,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "max_parallel".to_string(),
-                        ty: DeclarationId(2917),
+                        ty: DeclarationId(2918),
                     },
                 ],
             },
@@ -65983,33 +66019,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13143, 13319),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1771),
+            id: DeclarationId(1772),
             name: Some("CheckConclusion".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Success".to_string(),
-                        ty: DeclarationId(2918),
+                        ty: DeclarationId(2919),
                     },
                     Field {
                         label: "Failure".to_string(),
-                        ty: DeclarationId(2919),
+                        ty: DeclarationId(2920),
                     },
                     Field {
                         label: "Cancelled".to_string(),
-                        ty: DeclarationId(2920),
+                        ty: DeclarationId(2921),
                     },
                     Field {
                         label: "Skipped".to_string(),
-                        ty: DeclarationId(2921),
+                        ty: DeclarationId(2922),
                     },
                     Field {
                         label: "TimedOut".to_string(),
-                        ty: DeclarationId(2922),
+                        ty: DeclarationId(2923),
                     },
                     Field {
                         label: "ActionRequired".to_string(),
-                        ty: DeclarationId(2923),
+                        ty: DeclarationId(2924),
                     },
                 ],
             },
@@ -66024,15 +66060,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13448, 13550),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1772),
+            id: DeclarationId(1773),
             name: Some("checkout_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1756),
+                template: DeclarationId(1757),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1756)),
+            meta_tag: Some(DeclarationId(1757)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -66045,15 +66081,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13676, 13771),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1773),
+            id: DeclarationId(1774),
             name: Some("setup_rust_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1756),
+                template: DeclarationId(1757),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1756)),
+            meta_tag: Some(DeclarationId(1757)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -66066,15 +66102,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13773, 13897),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1774),
+            id: DeclarationId(1775),
             name: Some("cache_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1756),
+                template: DeclarationId(1757),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1756)),
+            meta_tag: Some(DeclarationId(1757)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -66087,7 +66123,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13899, 13988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1775),
+            id: DeclarationId(1776),
             name: Some("max_job_timeout_minutes".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -66104,7 +66140,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14064, 14103),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1776),
+            id: DeclarationId(1777),
             name: Some("default_job_timeout_minutes".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -66121,7 +66157,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14105, 14148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1777),
+            id: DeclarationId(1778),
             name: Some("max_matrix_combinations".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -66138,7 +66174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14150, 14189),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1778),
+            id: DeclarationId(1779),
             name: Some("github_actions_workflows_dir".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -66157,17 +66193,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1207, 1270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1779),
+            id: DeclarationId(1780),
             name: Some("GitHubActionsWorkflowExtension".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "GitHubActionsWorkflowYml".to_string(),
-                        ty: DeclarationId(2924),
+                        ty: DeclarationId(2925),
                     },
                     Field {
                         label: "GitHubActionsWorkflowYaml".to_string(),
-                        ty: DeclarationId(2925),
+                        ty: DeclarationId(2926),
                     },
                 ],
             },
@@ -66182,7 +66218,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1895, 1989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1780),
+            id: DeclarationId(1781),
             name: Some("GitHubActionsWorkflowStemSegment".to_string()),
             connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
@@ -66191,17 +66227,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(2926)),
+            refinement: Some(DeclarationId(2927)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2615, 2714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1781),
+            id: DeclarationId(1782),
             name: Some("GitHubActionsWorkflowStem".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "segment".to_string(),
-                    ty: DeclarationId(1780),
+                    ty: DeclarationId(1781),
                 }],
             },
             type_params: vec![],
@@ -66215,17 +66251,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2916, 2994),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1782),
+            id: DeclarationId(1783),
             name: Some("GitHubActionsWorkflowFileRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "stem".to_string(),
-                        ty: DeclarationId(1781),
+                        ty: DeclarationId(1782),
                     },
                     Field {
                         label: "extension".to_string(),
-                        ty: DeclarationId(1779),
+                        ty: DeclarationId(1780),
                     },
                 ],
             },
@@ -66240,7 +66276,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 3398, 3513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1783),
+            id: DeclarationId(1784),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66260,7 +66296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3259, 3272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1784),
+            id: DeclarationId(1785),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66280,7 +66316,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3421, 3434),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1785),
+            id: DeclarationId(1786),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66300,7 +66336,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3439, 3452),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1786),
+            id: DeclarationId(1787),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66320,7 +66356,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3556, 3569),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1787),
+            id: DeclarationId(1788),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66340,7 +66376,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4162, 4169),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1788),
+            id: DeclarationId(1789),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(695), DeclarationId(694)],
@@ -66358,7 +66394,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1789),
+            id: DeclarationId(1790),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66378,7 +66414,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4617, 4624),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1790),
+            id: DeclarationId(1791),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(697), DeclarationId(698)],
@@ -66396,7 +66432,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4638, 4651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1791),
+            id: DeclarationId(1792),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66416,7 +66452,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5336, 5349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1792),
+            id: DeclarationId(1793),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66436,7 +66472,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5354, 5367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1793),
+            id: DeclarationId(1794),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66456,7 +66492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5372, 5385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1794),
+            id: DeclarationId(1795),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66476,7 +66512,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5686, 5693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1795),
+            id: DeclarationId(1796),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(702)],
@@ -66494,7 +66530,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5698, 5708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1796),
+            id: DeclarationId(1797),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66514,7 +66550,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5713, 5720),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1797),
+            id: DeclarationId(1798),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66534,7 +66570,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5867, 5874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1798),
+            id: DeclarationId(1799),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(705)],
@@ -66552,7 +66588,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1799),
+            id: DeclarationId(1800),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66572,7 +66608,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5897, 5904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1800),
+            id: DeclarationId(1801),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66592,7 +66628,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6130, 6137),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1801),
+            id: DeclarationId(1802),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66612,11 +66648,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6151, 6158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1802),
+            id: DeclarationId(1803),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(707)],
-                output: DeclarationId(1801),
+                output: DeclarationId(1802),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -66630,7 +66666,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6142, 6158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1803),
+            id: DeclarationId(1804),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66650,7 +66686,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6163, 6170),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1804),
+            id: DeclarationId(1805),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66670,7 +66706,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6356, 6363),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1805),
+            id: DeclarationId(1806),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66690,7 +66726,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6588, 6595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1806),
+            id: DeclarationId(1807),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66710,7 +66746,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7202, 7209),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1807),
+            id: DeclarationId(1808),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(713),
@@ -66730,13 +66766,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7219, 7236),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1808),
+            id: DeclarationId(1809),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1807),
+                    value: DeclarationId(1808),
                 }],
             },
             type_params: vec![],
@@ -66750,7 +66786,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7214, 7237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1809),
+            id: DeclarationId(1810),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66770,7 +66806,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7415, 7422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1810),
+            id: DeclarationId(1811),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(713),
@@ -66790,13 +66826,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7444, 7461),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1811),
+            id: DeclarationId(1812),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1810),
+                    value: DeclarationId(1811),
                 }],
             },
             type_params: vec![],
@@ -66810,7 +66846,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7439, 7462),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1812),
+            id: DeclarationId(1813),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66830,7 +66866,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 8177, 8184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1813),
+            id: DeclarationId(1814),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66844,7 +66880,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 2106, 2111),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1814),
+            id: DeclarationId(1815),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66864,7 +66900,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 2144, 2157),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1815),
+            id: DeclarationId(1816),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -66874,7 +66910,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "tail".to_string(),
-                        ty: DeclarationId(1814),
+                        ty: DeclarationId(1815),
                     },
                 ],
             },
@@ -66889,7 +66925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 2116, 2159),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1816),
+            id: DeclarationId(1817),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66909,7 +66945,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1477, 1490),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1817),
+            id: DeclarationId(1818),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66929,7 +66965,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1570, 1583),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1818),
+            id: DeclarationId(1819),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -66948,7 +66984,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1819),
+            id: DeclarationId(1820),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -66968,7 +67004,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20916, 20943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1820),
+            id: DeclarationId(1821),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(713),
@@ -66988,7 +67024,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20995, 21026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1821),
+            id: DeclarationId(1822),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -67008,11 +67044,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21058),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1822),
+            id: DeclarationId(1823),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1821),
+                    DeclarationId(1822),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -67027,7 +67063,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1823),
+            id: DeclarationId(1824),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67047,7 +67083,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21185, 21206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1824),
+            id: DeclarationId(1825),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -67067,11 +67103,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1825),
+            id: DeclarationId(1826),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1824),
+                    DeclarationId(1825),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -67086,7 +67122,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1826),
+            id: DeclarationId(1827),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67106,7 +67142,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 22268, 22289),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1827),
+            id: DeclarationId(1828),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -67125,7 +67161,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1828),
+            id: DeclarationId(1829),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -67144,7 +67180,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1829),
+            id: DeclarationId(1830),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -67163,7 +67199,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1830),
+            id: DeclarationId(1831),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67183,7 +67219,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 36581, 36602),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1831),
+            id: DeclarationId(1832),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67203,7 +67239,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 36608, 36639),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1832),
+            id: DeclarationId(1833),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67222,7 +67258,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 7532, 7561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1833),
+            id: DeclarationId(1834),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67241,7 +67277,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 7566, 7595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1834),
+            id: DeclarationId(1835),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67261,7 +67297,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 7627, 7645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1835),
+            id: DeclarationId(1836),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67281,12 +67317,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8066, 8084),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1836),
+            id: DeclarationId(1837),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tokens".to_string(),
-                    ty: DeclarationId(1835),
+                    ty: DeclarationId(1836),
                 }],
             },
             type_params: vec![],
@@ -67300,7 +67336,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8036, 8086),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1837),
+            id: DeclarationId(1838),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -67325,7 +67361,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8091, 8147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1838),
+            id: DeclarationId(1839),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67344,7 +67380,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8510, 8555),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1839),
+            id: DeclarationId(1840),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -67373,7 +67409,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8560, 8630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1840),
+            id: DeclarationId(1841),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67387,7 +67423,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 14355, 14365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1841),
+            id: DeclarationId(1842),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67406,7 +67442,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 14370, 14408),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1842),
+            id: DeclarationId(1843),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67425,7 +67461,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 14413, 14451),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1843),
+            id: DeclarationId(1844),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67444,7 +67480,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 14697, 14732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1844),
+            id: DeclarationId(1845),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67458,7 +67494,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 14737, 14749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1845),
+            id: DeclarationId(1846),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67477,7 +67513,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 15171, 15200),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1846),
+            id: DeclarationId(1847),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67496,7 +67532,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 15205, 15230),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1847),
+            id: DeclarationId(1848),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67510,7 +67546,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 15743, 15753),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1848),
+            id: DeclarationId(1849),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67529,7 +67565,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 15758, 15796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1849),
+            id: DeclarationId(1850),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67548,7 +67584,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 16501, 16528),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1850),
+            id: DeclarationId(1851),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67567,7 +67603,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 16533, 16561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1851),
+            id: DeclarationId(1852),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67587,12 +67623,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 16589, 16601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1852),
+            id: DeclarationId(1853),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "fields".to_string(),
-                    ty: DeclarationId(1851),
+                    ty: DeclarationId(1852),
                 }],
             },
             type_params: vec![],
@@ -67606,7 +67642,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 16566, 16603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1853),
+            id: DeclarationId(1854),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67620,7 +67656,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 17280, 17293),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1854),
+            id: DeclarationId(1855),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67634,7 +67670,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 17298, 17312),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1855),
+            id: DeclarationId(1856),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67653,7 +67689,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 17317, 17349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1856),
+            id: DeclarationId(1857),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67672,7 +67708,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 19519, 19560),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1857),
+            id: DeclarationId(1858),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -67697,7 +67733,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 19565, 19634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1858),
+            id: DeclarationId(1859),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -67734,7 +67770,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 19639, 19789),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1859),
+            id: DeclarationId(1860),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67748,7 +67784,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20538, 20559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1860),
+            id: DeclarationId(1861),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -67768,12 +67804,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20590, 20617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1861),
+            id: DeclarationId(1862),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "first_breaker".to_string(),
-                    ty: DeclarationId(1860),
+                    ty: DeclarationId(1861),
                 }],
             },
             type_params: vec![],
@@ -67787,7 +67823,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20564, 20619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1862),
+            id: DeclarationId(1863),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67807,12 +67843,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24543, 24564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1863),
+            id: DeclarationId(1864),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "ops".to_string(),
-                    ty: DeclarationId(1862),
+                    ty: DeclarationId(1863),
                 }],
             },
             type_params: vec![],
@@ -67826,7 +67862,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24523, 24566),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1864),
+            id: DeclarationId(1865),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -67846,12 +67882,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24592, 24619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1865),
+            id: DeclarationId(1866),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "arms".to_string(),
-                    ty: DeclarationId(1864),
+                    ty: DeclarationId(1865),
                 }],
             },
             type_params: vec![],
@@ -67865,7 +67901,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24571, 24621),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1866),
+            id: DeclarationId(1867),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67884,7 +67920,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24626, 24661),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1867),
+            id: DeclarationId(1868),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -67904,12 +67940,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24693, 24725),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1868),
+            id: DeclarationId(1869),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "branches".to_string(),
-                    ty: DeclarationId(1867),
+                    ty: DeclarationId(1868),
                 }],
             },
             type_params: vec![],
@@ -67923,7 +67959,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24666, 24727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1869),
+            id: DeclarationId(1870),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67942,7 +67978,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 25364, 25410),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1870),
+            id: DeclarationId(1871),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67961,7 +67997,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 25415, 25467),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1871),
+            id: DeclarationId(1872),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67975,7 +68011,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 25964, 25984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1872),
+            id: DeclarationId(1873),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67989,7 +68025,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 25989, 26010),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1873),
+            id: DeclarationId(1874),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68003,7 +68039,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26015, 26038),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1874),
+            id: DeclarationId(1875),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68017,7 +68053,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26043, 26061),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1875),
+            id: DeclarationId(1876),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68031,7 +68067,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26066, 26084),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1876),
+            id: DeclarationId(1877),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68050,7 +68086,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26401, 26447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1877),
+            id: DeclarationId(1878),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68069,7 +68105,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26452, 26504),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1878),
+            id: DeclarationId(1879),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68083,7 +68119,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 32458, 32464),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1879),
+            id: DeclarationId(1880),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68102,7 +68138,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 32469, 32506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1880),
+            id: DeclarationId(1881),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68121,7 +68157,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 32511, 32548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1881),
+            id: DeclarationId(1882),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68135,7 +68171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 33022, 33041),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1882),
+            id: DeclarationId(1883),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68154,7 +68190,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 33046, 33095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1883),
+            id: DeclarationId(1884),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68173,7 +68209,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1884),
+            id: DeclarationId(1885),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68192,7 +68228,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1885),
+            id: DeclarationId(1886),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68211,7 +68247,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1886),
+            id: DeclarationId(1887),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68230,7 +68266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1887),
+            id: DeclarationId(1888),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68249,7 +68285,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1888),
+            id: DeclarationId(1889),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68268,7 +68304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1889),
+            id: DeclarationId(1890),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -68288,7 +68324,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 28003, 28024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1890),
+            id: DeclarationId(1891),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -68308,7 +68344,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 28088, 28109),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1891),
+            id: DeclarationId(1892),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68322,7 +68358,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 754, 764),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1892),
+            id: DeclarationId(1893),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68341,7 +68377,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 769, 788),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1893),
+            id: DeclarationId(1894),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68355,7 +68391,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 793, 803),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1894),
+            id: DeclarationId(1895),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68374,7 +68410,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1895),
+            id: DeclarationId(1896),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68393,7 +68429,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 1379, 1393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1896),
+            id: DeclarationId(1897),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68412,7 +68448,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 1398, 1411),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1897),
+            id: DeclarationId(1898),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68431,7 +68467,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 1416, 1433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1898),
+            id: DeclarationId(1899),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68450,7 +68486,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3566, 3586),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1899),
+            id: DeclarationId(1900),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68469,7 +68505,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3591, 3619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1900),
+            id: DeclarationId(1901),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68488,7 +68524,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3624, 3658),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1901),
+            id: DeclarationId(1902),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68507,7 +68543,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3663, 3692),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1902),
+            id: DeclarationId(1903),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68526,7 +68562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3697, 3714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1903),
+            id: DeclarationId(1904),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68540,7 +68576,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 4338, 4345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1904),
+            id: DeclarationId(1905),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68559,7 +68595,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 4350, 4400),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1905),
+            id: DeclarationId(1906),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68578,7 +68614,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 5964, 5988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1906),
+            id: DeclarationId(1907),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68592,7 +68628,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6013, 6022),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1907),
+            id: DeclarationId(1908),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68611,7 +68647,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6027, 6063),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1908),
+            id: DeclarationId(1909),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -68636,7 +68672,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6375, 6425),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1909),
+            id: DeclarationId(1910),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68650,7 +68686,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6430, 6439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1910),
+            id: DeclarationId(1911),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(786),
@@ -68670,12 +68706,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7015, 7028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1911),
+            id: DeclarationId(1912),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1910),
+                    ty: DeclarationId(1911),
                 }],
             },
             type_params: vec![],
@@ -68689,7 +68725,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7003, 7029),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1912),
+            id: DeclarationId(1913),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68703,7 +68739,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7034, 7051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1913),
+            id: DeclarationId(1914),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68722,7 +68758,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7302, 7312),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1914),
+            id: DeclarationId(1915),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68736,7 +68772,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7317, 7326),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1915),
+            id: DeclarationId(1916),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68750,7 +68786,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7331, 7340),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1916),
+            id: DeclarationId(1917),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68769,7 +68805,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7767, 7787),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1917),
+            id: DeclarationId(1918),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68788,7 +68824,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7792, 7816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1918),
+            id: DeclarationId(1919),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -68808,12 +68844,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7828, 7844),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1919),
+            id: DeclarationId(1920),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1918),
+                    ty: DeclarationId(1919),
                 }],
             },
             type_params: vec![],
@@ -68827,7 +68863,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7821, 7845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1920),
+            id: DeclarationId(1921),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -68847,12 +68883,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7855, 7871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1921),
+            id: DeclarationId(1922),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1920),
+                    ty: DeclarationId(1921),
                 }],
             },
             type_params: vec![],
@@ -68866,7 +68902,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7850, 7872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1922),
+            id: DeclarationId(1923),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -68886,12 +68922,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7881, 7897),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1923),
+            id: DeclarationId(1924),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1922),
+                    ty: DeclarationId(1923),
                 }],
             },
             type_params: vec![],
@@ -68905,7 +68941,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7877, 7898),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1924),
+            id: DeclarationId(1925),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -68925,7 +68961,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7961, 7977),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1925),
+            id: DeclarationId(1926),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -68935,7 +68971,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "payload".to_string(),
-                        ty: DeclarationId(1924),
+                        ty: DeclarationId(1925),
                     },
                 ],
             },
@@ -68950,7 +68986,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7903, 7983),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1926),
+            id: DeclarationId(1927),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68969,7 +69005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9596, 9625),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1927),
+            id: DeclarationId(1928),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -68989,12 +69025,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9660, 9676),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1928),
+            id: DeclarationId(1929),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "fields".to_string(),
-                    ty: DeclarationId(1927),
+                    ty: DeclarationId(1928),
                 }],
             },
             type_params: vec![],
@@ -69008,7 +69044,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9630, 9678),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1929),
+            id: DeclarationId(1930),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69027,7 +69063,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9683, 9711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1930),
+            id: DeclarationId(1931),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69047,12 +69083,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9730, 9746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1931),
+            id: DeclarationId(1932),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1930),
+                    ty: DeclarationId(1931),
                 }],
             },
             type_params: vec![],
@@ -69066,7 +69102,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9716, 9747),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1932),
+            id: DeclarationId(1933),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69086,12 +69122,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9765, 9781),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1933),
+            id: DeclarationId(1934),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1932),
+                    ty: DeclarationId(1933),
                 }],
             },
             type_params: vec![],
@@ -69105,7 +69141,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9752, 9782),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1934),
+            id: DeclarationId(1935),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69124,7 +69160,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11036, 11059),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1935),
+            id: DeclarationId(1936),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69143,7 +69179,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11064, 11098),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1936),
+            id: DeclarationId(1937),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69157,7 +69193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11103, 11110),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1937),
+            id: DeclarationId(1938),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69171,7 +69207,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11115, 11121),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1938),
+            id: DeclarationId(1939),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69190,7 +69226,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11126, 11146),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1939),
+            id: DeclarationId(1940),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69209,7 +69245,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11375, 11392),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1940),
+            id: DeclarationId(1941),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69229,12 +69265,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11414, 11429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1941),
+            id: DeclarationId(1942),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "children".to_string(),
-                    ty: DeclarationId(1940),
+                    ty: DeclarationId(1941),
                 }],
             },
             type_params: vec![],
@@ -69248,7 +69284,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11397, 11431),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1942),
+            id: DeclarationId(1943),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69268,12 +69304,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11453, 11468),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1943),
+            id: DeclarationId(1944),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "variants".to_string(),
-                    ty: DeclarationId(1942),
+                    ty: DeclarationId(1943),
                 }],
             },
             type_params: vec![],
@@ -69287,7 +69323,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11436, 11470),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1944),
+            id: DeclarationId(1945),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69307,13 +69343,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11497, 11516),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1945),
+            id: DeclarationId(1946),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(1944),
+                        ty: DeclarationId(1945),
                     },
                     Field {
                         label: "output".to_string(),
@@ -69336,7 +69372,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11475, 11572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1946),
+            id: DeclarationId(1947),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -69361,7 +69397,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11577, 11655),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1947),
+            id: DeclarationId(1948),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69381,7 +69417,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11723, 11745),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1948),
+            id: DeclarationId(1949),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -69391,7 +69427,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "arguments".to_string(),
-                        ty: DeclarationId(1947),
+                        ty: DeclarationId(1948),
                     },
                 ],
             },
@@ -69406,7 +69442,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11660, 11751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1949),
+            id: DeclarationId(1950),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -69425,7 +69461,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1950),
+            id: DeclarationId(1951),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69445,7 +69481,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11852, 11871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1951),
+            id: DeclarationId(1952),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69465,7 +69501,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11890, 11912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1952),
+            id: DeclarationId(1953),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -69484,7 +69520,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1953),
+            id: DeclarationId(1954),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -69503,7 +69539,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1954),
+            id: DeclarationId(1955),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -69522,7 +69558,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1955),
+            id: DeclarationId(1956),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -69541,7 +69577,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1956),
+            id: DeclarationId(1957),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69561,7 +69597,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13149, 13168),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1957),
+            id: DeclarationId(1958),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69575,7 +69611,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13449, 13452),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1958),
+            id: DeclarationId(1959),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69589,7 +69625,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13457, 13460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1959),
+            id: DeclarationId(1960),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69603,7 +69639,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13465, 13468),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1960),
+            id: DeclarationId(1961),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69617,7 +69653,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13473, 13476),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1961),
+            id: DeclarationId(1962),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69631,7 +69667,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13600, 13602),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1962),
+            id: DeclarationId(1963),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69645,7 +69681,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13607, 13609),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1963),
+            id: DeclarationId(1964),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69659,7 +69695,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13614, 13616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1964),
+            id: DeclarationId(1965),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69673,7 +69709,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13621, 13623),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1965),
+            id: DeclarationId(1966),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69687,7 +69723,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13628, 13630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1966),
+            id: DeclarationId(1967),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69701,7 +69737,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13635, 13637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1967),
+            id: DeclarationId(1968),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69715,7 +69751,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14414, 14417),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1968),
+            id: DeclarationId(1969),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69729,7 +69765,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14422, 14424),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1969),
+            id: DeclarationId(1970),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69748,7 +69784,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14660, 14684),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1970),
+            id: DeclarationId(1971),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69767,7 +69803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14689, 14713),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1971),
+            id: DeclarationId(1972),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69786,7 +69822,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14718, 14736),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1972),
+            id: DeclarationId(1973),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69805,7 +69841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14923, 14946),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1973),
+            id: DeclarationId(1974),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69824,7 +69860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14951, 15007),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1974),
+            id: DeclarationId(1975),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69843,7 +69879,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15012, 15066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1975),
+            id: DeclarationId(1976),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69862,7 +69898,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15071, 15093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1976),
+            id: DeclarationId(1977),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -69887,7 +69923,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15218, 15270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1977),
+            id: DeclarationId(1978),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69906,7 +69942,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15275, 15305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1978),
+            id: DeclarationId(1979),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -69925,7 +69961,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1979),
+            id: DeclarationId(1980),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -69945,7 +69981,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 17460, 17491),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1980),
+            id: DeclarationId(1981),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(725),
@@ -69965,7 +70001,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 17515, 17545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1981),
+            id: DeclarationId(1982),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69984,7 +70020,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18168, 18197),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1982),
+            id: DeclarationId(1983),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -70009,7 +70045,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18202, 18249),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1983),
+            id: DeclarationId(1984),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -70028,7 +70064,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1984),
+            id: DeclarationId(1985),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70048,7 +70084,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18607, 18619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1985),
+            id: DeclarationId(1986),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70062,7 +70098,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18860, 18869),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1986),
+            id: DeclarationId(1987),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70082,7 +70118,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18927, 18943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1987),
+            id: DeclarationId(1988),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -70101,7 +70137,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1988),
+            id: DeclarationId(1989),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70115,7 +70151,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19445, 19457),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1989),
+            id: DeclarationId(1990),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70135,7 +70171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19535, 19547),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1990),
+            id: DeclarationId(1991),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -70154,7 +70190,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1991),
+            id: DeclarationId(1992),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -70173,7 +70209,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1992),
+            id: DeclarationId(1993),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70192,7 +70228,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19737, 19753),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1993),
+            id: DeclarationId(1994),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70211,7 +70247,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19758, 19782),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1994),
+            id: DeclarationId(1995),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70230,7 +70266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19787, 19805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1995),
+            id: DeclarationId(1996),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70249,7 +70285,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19810, 19824),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1996),
+            id: DeclarationId(1997),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70268,7 +70304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19829, 19843),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1997),
+            id: DeclarationId(1998),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70288,7 +70324,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19872, 19889),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1998),
+            id: DeclarationId(1999),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70308,7 +70344,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19899, 19913),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1999),
+            id: DeclarationId(2000),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70328,7 +70364,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19923, 19936),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2000),
+            id: DeclarationId(2001),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70348,7 +70384,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19949, 19962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2001),
+            id: DeclarationId(2002),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70367,7 +70403,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 26045, 26063),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2002),
+            id: DeclarationId(2003),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70381,7 +70417,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 26068, 26074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2003),
+            id: DeclarationId(2004),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -70401,12 +70437,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 26107, 26131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2004),
+            id: DeclarationId(2005),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "candidates".to_string(),
-                    ty: DeclarationId(2003),
+                    ty: DeclarationId(2004),
                 }],
             },
             type_params: vec![],
@@ -70420,7 +70456,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 26079, 26133),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2005),
+            id: DeclarationId(2006),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -70440,7 +70476,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 10942, 10962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2006),
+            id: DeclarationId(2007),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -70460,7 +70496,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11026, 11046),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2007),
+            id: DeclarationId(2008),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -70480,7 +70516,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11114, 11144),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2008),
+            id: DeclarationId(2009),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70500,7 +70536,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11611, 11629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2009),
+            id: DeclarationId(2010),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -70520,7 +70556,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11635, 11665),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2010),
+            id: DeclarationId(2011),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70540,7 +70576,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 14162, 14180),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2011),
+            id: DeclarationId(2012),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -70560,7 +70596,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22217, 22247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2012),
+            id: DeclarationId(2013),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70580,7 +70616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22252, 22270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2013),
+            id: DeclarationId(2014),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70600,7 +70636,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22530, 22548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2014),
+            id: DeclarationId(2015),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70620,7 +70656,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22553, 22571),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2015),
+            id: DeclarationId(2016),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70640,7 +70676,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23044, 23062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2016),
+            id: DeclarationId(2017),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70660,7 +70696,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23067, 23085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2017),
+            id: DeclarationId(2018),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70680,7 +70716,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23186, 23204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2018),
+            id: DeclarationId(2019),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70700,7 +70736,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23524, 23542),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2019),
+            id: DeclarationId(2020),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70720,7 +70756,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23547, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2020),
+            id: DeclarationId(2021),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70740,7 +70776,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 25113, 25131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2021),
+            id: DeclarationId(2022),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70760,7 +70796,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 25384, 25402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2022),
+            id: DeclarationId(2023),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70780,7 +70816,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 25850, 25868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2023),
+            id: DeclarationId(2024),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70800,7 +70836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 27885, 27903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2024),
+            id: DeclarationId(2025),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70820,7 +70856,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 27933, 27951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2025),
+            id: DeclarationId(2026),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70840,7 +70876,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28238, 28256),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2026),
+            id: DeclarationId(2027),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70860,7 +70896,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28284, 28302),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2027),
+            id: DeclarationId(2028),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70880,7 +70916,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28662, 28680),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2028),
+            id: DeclarationId(2029),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70900,7 +70936,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28685, 28703),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2029),
+            id: DeclarationId(2030),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70914,7 +70950,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 4953, 4965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2030),
+            id: DeclarationId(2031),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70928,7 +70964,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 4970, 4986),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2031),
+            id: DeclarationId(2032),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70942,7 +70978,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 4991, 5005),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2032),
+            id: DeclarationId(2033),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70956,7 +70992,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 5855, 5868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2033),
+            id: DeclarationId(2034),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70970,7 +71006,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 5873, 5888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2034),
+            id: DeclarationId(2035),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70984,7 +71020,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 5893, 5909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2035),
+            id: DeclarationId(2036),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70998,7 +71034,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 5914, 5927),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2036),
+            id: DeclarationId(2037),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -71017,7 +71053,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2037),
+            id: DeclarationId(2038),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -71036,7 +71072,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2038),
+            id: DeclarationId(2039),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -71055,7 +71091,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2039),
+            id: DeclarationId(2040),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -71074,7 +71110,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2040),
+            id: DeclarationId(2041),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71088,7 +71124,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 8405, 8414),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2041),
+            id: DeclarationId(2042),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71107,7 +71143,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 8419, 8465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2042),
+            id: DeclarationId(2043),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71126,7 +71162,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9506, 9523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2043),
+            id: DeclarationId(2044),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71145,7 +71181,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9528, 9552),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2044),
+            id: DeclarationId(2045),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -71170,7 +71206,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9557, 9619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2045),
+            id: DeclarationId(2046),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -71190,12 +71226,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9636, 9666),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2046),
+            id: DeclarationId(2047),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2045),
+                    ty: DeclarationId(2046),
                 }],
             },
             type_params: vec![],
@@ -71209,7 +71245,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9624, 9667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2047),
+            id: DeclarationId(2048),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -71229,12 +71265,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9680, 9710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2048),
+            id: DeclarationId(2049),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2047),
+                    ty: DeclarationId(2048),
                 }],
             },
             type_params: vec![],
@@ -71248,7 +71284,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9672, 9711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2049),
+            id: DeclarationId(2050),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71267,7 +71303,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9716, 9737),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2050),
+            id: DeclarationId(2051),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71286,7 +71322,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9742, 9761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2051),
+            id: DeclarationId(2052),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(31),
@@ -71306,7 +71342,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9479, 9501),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2052),
+            id: DeclarationId(2053),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71320,7 +71356,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18143, 18156),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2053),
+            id: DeclarationId(2054),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71334,7 +71370,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18161, 18169),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2054),
+            id: DeclarationId(2055),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71348,7 +71384,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18174, 18185),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2055),
+            id: DeclarationId(2056),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71362,7 +71398,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18190, 18207),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2056),
+            id: DeclarationId(2057),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71376,7 +71412,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18212, 18226),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2057),
+            id: DeclarationId(2058),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71395,7 +71431,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18231, 18280),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2058),
+            id: DeclarationId(2059),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71409,7 +71445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18285, 18301),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2059),
+            id: DeclarationId(2060),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71423,7 +71459,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18306, 18318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2060),
+            id: DeclarationId(2061),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(43),
@@ -71443,7 +71479,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18107, 18138),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2061),
+            id: DeclarationId(2062),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(691),
@@ -71463,7 +71499,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11495, 11507),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2062),
+            id: DeclarationId(2063),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(728)],
@@ -71481,7 +71517,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2063),
+            id: DeclarationId(2064),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(704),
@@ -71491,7 +71527,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         value: DeclarationId(849),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1798),
+                        parameter: DeclarationId(1799),
                         value: DeclarationId(856),
                     },
                 ],
@@ -71507,7 +71543,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11488, 11535),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2064),
+            id: DeclarationId(2065),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(691),
@@ -71527,7 +71563,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11795, 11810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2065),
+            id: DeclarationId(2066),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(849), DeclarationId(849)],
@@ -71545,7 +71581,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2066),
+            id: DeclarationId(2067),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
@@ -71559,7 +71595,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         value: DeclarationId(849),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1788),
+                        parameter: DeclarationId(1789),
                         value: DeclarationId(860),
                     },
                 ],
@@ -71575,7 +71611,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 14202, 14245),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2067),
+            id: DeclarationId(2068),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(850), DeclarationId(694)],
@@ -71593,7 +71629,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2068),
+            id: DeclarationId(2069),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
@@ -71603,7 +71639,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         value: DeclarationId(850),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1788),
+                        parameter: DeclarationId(1789),
                         value: DeclarationId(886),
                     },
                     TemplateArgument {
@@ -71623,7 +71659,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 16911, 17021),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2069),
+            id: DeclarationId(2070),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(850), DeclarationId(694)],
@@ -71641,7 +71677,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2070),
+            id: DeclarationId(2071),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
@@ -71651,7 +71687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         value: DeclarationId(850),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1788),
+                        parameter: DeclarationId(1789),
                         value: DeclarationId(886),
                     },
                     TemplateArgument {
@@ -71671,7 +71707,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 17076, 17186),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2071),
+            id: DeclarationId(2072),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -71691,7 +71727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22293, 22323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2072),
+            id: DeclarationId(2073),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -71711,7 +71747,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22275, 22324),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2073),
+            id: DeclarationId(2074),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -71731,7 +71767,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22603, 22610),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2074),
+            id: DeclarationId(2075),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -71751,7 +71787,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22737, 22789),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2075),
+            id: DeclarationId(2076),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -71771,7 +71807,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23140, 23147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2076),
+            id: DeclarationId(2077),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -71791,7 +71827,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23118, 23148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2077),
+            id: DeclarationId(2078),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -71811,7 +71847,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23597, 23604),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2078),
+            id: DeclarationId(2079),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -71831,7 +71867,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23735, 23792),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2079),
+            id: DeclarationId(2080),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -71851,7 +71887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 25317, 25349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2080),
+            id: DeclarationId(2081),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -71871,7 +71907,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 27988, 27995),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2081),
+            id: DeclarationId(2082),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -71891,7 +71927,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28136, 28201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2082),
+            id: DeclarationId(2083),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(850), DeclarationId(849)],
@@ -71909,7 +71945,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2083),
+            id: DeclarationId(2084),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
@@ -71923,7 +71959,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         value: DeclarationId(849),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1788),
+                        parameter: DeclarationId(1789),
                         value: DeclarationId(886),
                     },
                 ],
@@ -71939,7 +71975,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28319, 28377),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2084),
+            id: DeclarationId(2085),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -71959,7 +71995,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28403, 28449),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2085),
+            id: DeclarationId(2086),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -71979,11 +72015,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28720, 28727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2086),
+            id: DeclarationId(2087),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2028), DeclarationId(849)],
-                output: DeclarationId(2028),
+                inputs: vec![DeclarationId(2029), DeclarationId(849)],
+                output: DeclarationId(2029),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -71997,21 +72033,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2087),
+            id: DeclarationId(2088),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
                 arguments: vec![
                     TemplateArgument {
                         parameter: DeclarationId(695),
-                        value: DeclarationId(2028),
+                        value: DeclarationId(2029),
                     },
                     TemplateArgument {
                         parameter: DeclarationId(694),
                         value: DeclarationId(849),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1788),
+                        parameter: DeclarationId(1789),
                         value: DeclarationId(889),
                     },
                 ],
@@ -72027,7 +72063,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28708, 28749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2088),
+            id: DeclarationId(2089),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -72047,7 +72083,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4503, 4529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2089),
+            id: DeclarationId(2090),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72066,7 +72102,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2090),
+            id: DeclarationId(2091),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72085,7 +72121,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2091),
+            id: DeclarationId(2092),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -72105,7 +72141,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_operations.dag", 6546, 6561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2092),
+            id: DeclarationId(2093),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -72125,12 +72161,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2718, 2749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2093),
+            id: DeclarationId(2094),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "content".to_string(),
-                    ty: DeclarationId(2092),
+                    ty: DeclarationId(2093),
                 }],
             },
             type_params: vec![],
@@ -72144,7 +72180,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2690, 2751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2094),
+            id: DeclarationId(2095),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -72164,12 +72200,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2784, 2820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2095),
+            id: DeclarationId(2096),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "content".to_string(),
-                    ty: DeclarationId(2094),
+                    ty: DeclarationId(2095),
                 }],
             },
             type_params: vec![],
@@ -72183,7 +72219,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2756, 2822),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2096),
+            id: DeclarationId(2097),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72208,7 +72244,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3211, 3276),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2097),
+            id: DeclarationId(2098),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72227,7 +72263,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3281, 3305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2098),
+            id: DeclarationId(2099),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72246,7 +72282,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3568, 3596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2099),
+            id: DeclarationId(2100),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72265,7 +72301,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3601, 3637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2100),
+            id: DeclarationId(2101),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72284,7 +72320,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4332, 4354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2101),
+            id: DeclarationId(2102),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -72304,12 +72340,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4376, 4406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2102),
+            id: DeclarationId(2103),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2101),
+                    ty: DeclarationId(2102),
                 }],
             },
             type_params: vec![],
@@ -72323,7 +72359,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4359, 4407),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2103),
+            id: DeclarationId(2104),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72337,7 +72373,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5616, 5623),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2104),
+            id: DeclarationId(2105),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72351,7 +72387,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5749, 5761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2105),
+            id: DeclarationId(2106),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72370,7 +72406,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5979, 6014),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2106),
+            id: DeclarationId(2107),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72389,7 +72425,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6019, 6062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2107),
+            id: DeclarationId(2108),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72408,7 +72444,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6067, 6144),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2108),
+            id: DeclarationId(2109),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -72428,7 +72464,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6234, 6268),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2109),
+            id: DeclarationId(2110),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72447,7 +72483,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2110),
+            id: DeclarationId(2111),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72466,7 +72502,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2111),
+            id: DeclarationId(2112),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72480,15 +72516,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(2108),
+                        ty: DeclarationId(2109),
                     },
                     Field {
                         label: "citations".to_string(),
-                        ty: DeclarationId(2109),
+                        ty: DeclarationId(2110),
                     },
                     Field {
                         label: "cache_control".to_string(),
-                        ty: DeclarationId(2110),
+                        ty: DeclarationId(2111),
                     },
                 ],
             },
@@ -72503,7 +72539,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6149, 6364),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2112),
+            id: DeclarationId(2113),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72522,7 +72558,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6369, 6418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2113),
+            id: DeclarationId(2114),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72541,7 +72577,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6926, 6962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2114),
+            id: DeclarationId(2115),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72560,7 +72596,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2115),
+            id: DeclarationId(2116),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72579,7 +72615,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2116),
+            id: DeclarationId(2117),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72589,11 +72625,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(2114),
+                        ty: DeclarationId(2115),
                     },
                     Field {
                         label: "is_error".to_string(),
-                        ty: DeclarationId(2115),
+                        ty: DeclarationId(2116),
                     },
                 ],
             },
@@ -72608,7 +72644,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6967, 7085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2117),
+            id: DeclarationId(2118),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72627,7 +72663,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7532, 7570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2118),
+            id: DeclarationId(2119),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72656,7 +72692,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7575, 7658),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2119),
+            id: DeclarationId(2120),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72670,7 +72706,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8016, 8023),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2120),
+            id: DeclarationId(2121),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72684,7 +72720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8028, 8037),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2121),
+            id: DeclarationId(2122),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72698,7 +72734,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8042, 8054),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2122),
+            id: DeclarationId(2123),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72712,7 +72748,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8059, 8066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2123),
+            id: DeclarationId(2124),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72726,7 +72762,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8071, 8080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2124),
+            id: DeclarationId(2125),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72740,7 +72776,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8085, 8092),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2125),
+            id: DeclarationId(2126),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72754,7 +72790,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8097, 8123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2126),
+            id: DeclarationId(2127),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72773,7 +72809,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2127),
+            id: DeclarationId(2128),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72792,7 +72828,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2128),
+            id: DeclarationId(2129),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72806,11 +72842,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "document_title".to_string(),
-                        ty: DeclarationId(2126),
+                        ty: DeclarationId(2127),
                     },
                     Field {
                         label: "file_id".to_string(),
-                        ty: DeclarationId(2127),
+                        ty: DeclarationId(2128),
                     },
                     Field {
                         label: "start_char_index".to_string(),
@@ -72833,7 +72869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8363, 8506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2129),
+            id: DeclarationId(2130),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72852,7 +72888,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2130),
+            id: DeclarationId(2131),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72871,7 +72907,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2131),
+            id: DeclarationId(2132),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72885,11 +72921,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "document_title".to_string(),
-                        ty: DeclarationId(2129),
+                        ty: DeclarationId(2130),
                     },
                     Field {
                         label: "file_id".to_string(),
-                        ty: DeclarationId(2130),
+                        ty: DeclarationId(2131),
                     },
                     Field {
                         label: "start_page_number".to_string(),
@@ -72912,7 +72948,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8511, 8656),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2132),
+            id: DeclarationId(2133),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72931,7 +72967,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2133),
+            id: DeclarationId(2134),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72950,7 +72986,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2134),
+            id: DeclarationId(2135),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72964,11 +73000,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "document_title".to_string(),
-                        ty: DeclarationId(2132),
+                        ty: DeclarationId(2133),
                     },
                     Field {
                         label: "file_id".to_string(),
-                        ty: DeclarationId(2133),
+                        ty: DeclarationId(2134),
                     },
                     Field {
                         label: "start_block_index".to_string(),
@@ -72991,7 +73027,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8661, 8814),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2135),
+            id: DeclarationId(2136),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73010,7 +73046,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2136),
+            id: DeclarationId(2137),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73024,7 +73060,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "title".to_string(),
-                        ty: DeclarationId(2135),
+                        ty: DeclarationId(2136),
                     },
                     Field {
                         label: "url".to_string(),
@@ -73043,7 +73079,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8819, 8919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2137),
+            id: DeclarationId(2138),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73062,7 +73098,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2138),
+            id: DeclarationId(2139),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73076,7 +73112,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "title".to_string(),
-                        ty: DeclarationId(2137),
+                        ty: DeclarationId(2138),
                     },
                     Field {
                         label: "search_result_index".to_string(),
@@ -73103,7 +73139,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8924, 9071),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2139),
+            id: DeclarationId(2140),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -73123,11 +73159,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2140),
+            id: DeclarationId(2141),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2139),
+                    DeclarationId(2140),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -73142,7 +73178,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2141),
+            id: DeclarationId(2142),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73152,7 +73188,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "citations".to_string(),
-                        ty: DeclarationId(2140),
+                        ty: DeclarationId(2141),
                     },
                 ],
             },
@@ -73167,7 +73203,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9650, 9732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2142),
+            id: DeclarationId(2143),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73192,7 +73228,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9737, 9798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2143),
+            id: DeclarationId(2144),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -73211,7 +73247,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9803, 9858),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2144),
+            id: DeclarationId(2145),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73230,7 +73266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2145),
+            id: DeclarationId(2146),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73248,7 +73284,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "caller".to_string(),
-                        ty: DeclarationId(2144),
+                        ty: DeclarationId(2145),
                     },
                 ],
             },
@@ -73263,7 +73299,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9863, 9940),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2146),
+            id: DeclarationId(2147),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73282,7 +73318,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2147),
+            id: DeclarationId(2148),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73300,7 +73336,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "caller".to_string(),
-                        ty: DeclarationId(2146),
+                        ty: DeclarationId(2147),
                     },
                 ],
             },
@@ -73315,7 +73351,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9945, 10045),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2148),
+            id: DeclarationId(2149),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73334,7 +73370,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2149),
+            id: DeclarationId(2150),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73348,7 +73384,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "caller".to_string(),
-                        ty: DeclarationId(2148),
+                        ty: DeclarationId(2149),
                     },
                 ],
             },
@@ -73363,7 +73399,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10050, 10136),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2150),
+            id: DeclarationId(2151),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73377,7 +73413,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10357, 10366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2151),
+            id: DeclarationId(2152),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73391,7 +73427,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10371, 10379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2152),
+            id: DeclarationId(2153),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73405,7 +73441,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10384, 10397),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2153),
+            id: DeclarationId(2154),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73419,7 +73455,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10402, 10419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2154),
+            id: DeclarationId(2155),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73433,7 +73469,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10424, 10447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2155),
+            id: DeclarationId(2156),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73447,7 +73483,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10452, 10471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2156),
+            id: DeclarationId(2157),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73461,7 +73497,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10476, 10494),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2157),
+            id: DeclarationId(2158),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73475,7 +73511,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10499, 10506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2158),
+            id: DeclarationId(2159),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73494,7 +73530,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2159),
+            id: DeclarationId(2160),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73513,7 +73549,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2160),
+            id: DeclarationId(2161),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73532,7 +73568,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2161),
+            id: DeclarationId(2162),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73546,7 +73582,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11192, 11201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2162),
+            id: DeclarationId(2163),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -73566,7 +73602,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11687, 11725),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2163),
+            id: DeclarationId(2164),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73585,7 +73621,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2164),
+            id: DeclarationId(2165),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73604,7 +73640,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2165),
+            id: DeclarationId(2166),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73618,7 +73654,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1013, 1025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2166),
+            id: DeclarationId(2167),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73632,7 +73668,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1030, 1044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2167),
+            id: DeclarationId(2168),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73646,7 +73682,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1049, 1064),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2168),
+            id: DeclarationId(2169),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73660,7 +73696,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1069, 1086),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2169),
+            id: DeclarationId(2170),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73674,7 +73710,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1091, 1114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2170),
+            id: DeclarationId(2171),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73688,7 +73724,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4719, 4726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2171),
+            id: DeclarationId(2172),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73702,7 +73738,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4731, 4735),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2172),
+            id: DeclarationId(2173),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -73722,7 +73758,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6983, 7004),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2173),
+            id: DeclarationId(2174),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73736,7 +73772,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2224, 2238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2174),
+            id: DeclarationId(2175),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73750,7 +73786,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2243, 2268),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2175),
+            id: DeclarationId(2176),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73764,7 +73800,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2273, 2283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2176),
+            id: DeclarationId(2177),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73778,7 +73814,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2548, 2565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2177),
+            id: DeclarationId(2178),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73792,7 +73828,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2570, 2594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2178),
+            id: DeclarationId(2179),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73806,7 +73842,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2599, 2631),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2179),
+            id: DeclarationId(2180),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73820,7 +73856,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2636, 2663),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2180),
+            id: DeclarationId(2181),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73834,7 +73870,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3369, 3393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2181),
+            id: DeclarationId(2182),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73848,7 +73884,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3398, 3430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2182),
+            id: DeclarationId(2183),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73862,7 +73898,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3564, 3588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2183),
+            id: DeclarationId(2184),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73876,7 +73912,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3593, 3614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2184),
+            id: DeclarationId(2185),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73890,7 +73926,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3619, 3637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2185),
+            id: DeclarationId(2186),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73904,7 +73940,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3781, 3796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2186),
+            id: DeclarationId(2187),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73918,7 +73954,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3801, 3831),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2187),
+            id: DeclarationId(2188),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73932,7 +73968,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3836, 3857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2188),
+            id: DeclarationId(2189),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73946,7 +73982,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4024, 4044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2189),
+            id: DeclarationId(2190),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73960,7 +73996,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4049, 4076),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2190),
+            id: DeclarationId(2191),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73974,7 +74010,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4081, 4095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2191),
+            id: DeclarationId(2192),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73988,7 +74024,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4354, 4362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2192),
+            id: DeclarationId(2193),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74002,7 +74038,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4367, 4393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2193),
+            id: DeclarationId(2194),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74016,7 +74052,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4398, 4423),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2194),
+            id: DeclarationId(2195),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -74036,7 +74072,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5320, 5332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2195),
+            id: DeclarationId(2196),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74050,7 +74086,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5693, 5713),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2196),
+            id: DeclarationId(2197),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74064,7 +74100,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5718, 5736),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2197),
+            id: DeclarationId(2198),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74078,7 +74114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5741, 5759),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2198),
+            id: DeclarationId(2199),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74092,7 +74128,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5764, 5791),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2199),
+            id: DeclarationId(2200),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -74111,7 +74147,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2200),
+            id: DeclarationId(2201),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -74130,7 +74166,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2201),
+            id: DeclarationId(2202),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -74149,7 +74185,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2202),
+            id: DeclarationId(2203),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -74168,7 +74204,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2203),
+            id: DeclarationId(2204),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -74187,7 +74223,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2204),
+            id: DeclarationId(2205),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -74206,7 +74242,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2205),
+            id: DeclarationId(2206),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74225,7 +74261,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1430, 1462),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2206),
+            id: DeclarationId(2207),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74244,7 +74280,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1467, 1503),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2207),
+            id: DeclarationId(2208),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74263,7 +74299,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1508, 1545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2208),
+            id: DeclarationId(2209),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74282,7 +74318,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1550, 1576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2209),
+            id: DeclarationId(2210),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74301,7 +74337,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1581, 1614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2210),
+            id: DeclarationId(2211),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74315,7 +74351,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1619, 1636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2211),
+            id: DeclarationId(2212),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74334,7 +74370,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1641, 1695),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2212),
+            id: DeclarationId(2213),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74348,7 +74384,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1700, 1707),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2213),
+            id: DeclarationId(2214),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74367,7 +74403,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2059, 2097),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2214),
+            id: DeclarationId(2215),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -74392,7 +74428,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2102, 2176),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2215),
+            id: DeclarationId(2216),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -74417,7 +74453,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2181, 2256),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2216),
+            id: DeclarationId(2217),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -74442,7 +74478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2261, 2334),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2217),
+            id: DeclarationId(2218),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74461,7 +74497,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2339, 2376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2218),
+            id: DeclarationId(2219),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74480,7 +74516,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2381, 2418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2219),
+            id: DeclarationId(2220),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74499,7 +74535,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2423, 2464),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2220),
+            id: DeclarationId(2221),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74513,7 +74549,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2469, 2485),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2221),
+            id: DeclarationId(2222),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74527,7 +74563,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3221, 3231),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2222),
+            id: DeclarationId(2223),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74546,7 +74582,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3236, 3283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2223),
+            id: DeclarationId(2224),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74565,7 +74601,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3288, 3339),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2224),
+            id: DeclarationId(2225),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74579,7 +74615,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3529, 3533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2225),
+            id: DeclarationId(2226),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74593,7 +74629,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3538, 3545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2226),
+            id: DeclarationId(2227),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74607,7 +74643,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3550, 3556),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2227),
+            id: DeclarationId(2228),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -74626,7 +74662,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2228),
+            id: DeclarationId(2229),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74640,7 +74676,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7493, 7504),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2229),
+            id: DeclarationId(2230),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74654,7 +74690,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7553, 7567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2230),
+            id: DeclarationId(2231),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74668,7 +74704,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7632, 7648),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2231),
+            id: DeclarationId(2232),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74682,7 +74718,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 360, 369),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2232),
+            id: DeclarationId(2233),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74696,7 +74732,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 374, 381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2233),
+            id: DeclarationId(2234),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74710,7 +74746,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 614, 618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2234),
+            id: DeclarationId(2235),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74724,7 +74760,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 623, 632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2235),
+            id: DeclarationId(2236),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74738,7 +74774,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 910, 921),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2236),
+            id: DeclarationId(2237),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74752,7 +74788,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 926, 935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2237),
+            id: DeclarationId(2238),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74766,7 +74802,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 1166, 1173),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2238),
+            id: DeclarationId(2239),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74780,7 +74816,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 1178, 1187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2239),
+            id: DeclarationId(2240),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74794,7 +74830,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2035, 2044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2240),
+            id: DeclarationId(2241),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74808,7 +74844,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2049, 2065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2241),
+            id: DeclarationId(2242),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74822,7 +74858,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2070, 2080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2242),
+            id: DeclarationId(2243),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74836,7 +74872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2085, 2099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2243),
+            id: DeclarationId(2244),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74850,7 +74886,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2385, 2399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2244),
+            id: DeclarationId(2245),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74864,7 +74900,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2404, 2418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2245),
+            id: DeclarationId(2246),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -74884,7 +74920,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2818, 2830),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2246),
+            id: DeclarationId(2247),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -74904,7 +74940,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3210, 3222),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2247),
+            id: DeclarationId(2248),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74918,7 +74954,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3694, 3708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2248),
+            id: DeclarationId(2249),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74932,7 +74968,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3713, 3729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2249),
+            id: DeclarationId(2250),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74951,7 +74987,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 6759, 6786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2250),
+            id: DeclarationId(2251),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74965,7 +75001,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7611, 7616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2251),
+            id: DeclarationId(2252),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74979,7 +75015,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7621, 7630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2252),
+            id: DeclarationId(2253),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -75005,7 +75041,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 9513, 9555),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2253),
+            id: DeclarationId(2254),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75019,7 +75055,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3853, 3857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2254),
+            id: DeclarationId(2255),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75033,7 +75069,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3860, 3864),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2255),
+            id: DeclarationId(2256),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75047,7 +75083,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3867, 3871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2256),
+            id: DeclarationId(2257),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75061,7 +75097,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3874, 3879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2257),
+            id: DeclarationId(2258),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75075,7 +75111,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3882, 3893),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2258),
+            id: DeclarationId(2259),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75089,7 +75125,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3896, 3909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2259),
+            id: DeclarationId(2260),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75103,7 +75139,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4489, 4494),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2260),
+            id: DeclarationId(2261),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75117,7 +75153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4497, 4506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2261),
+            id: DeclarationId(2262),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75131,7 +75167,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4509, 4515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2262),
+            id: DeclarationId(2263),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75145,7 +75181,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4518, 4522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2263),
+            id: DeclarationId(2264),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75159,7 +75195,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4525, 4529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2264),
+            id: DeclarationId(2265),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75179,7 +75215,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5923, 5941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2265),
+            id: DeclarationId(2266),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75199,7 +75235,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6396, 6424),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2266),
+            id: DeclarationId(2267),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75213,7 +75249,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1099, 1113),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2267),
+            id: DeclarationId(2268),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75227,7 +75263,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1118, 1128),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2268),
+            id: DeclarationId(2269),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75241,7 +75277,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1133, 1145),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2269),
+            id: DeclarationId(2270),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75255,7 +75291,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1150, 1163),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2270),
+            id: DeclarationId(2271),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75269,7 +75305,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1168, 1180),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2271),
+            id: DeclarationId(2272),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75283,7 +75319,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1185, 1197),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2272),
+            id: DeclarationId(2273),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75297,7 +75333,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1202, 1224),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2273),
+            id: DeclarationId(2274),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75311,7 +75347,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1229, 1248),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2274),
+            id: DeclarationId(2275),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75325,7 +75361,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1253, 1278),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2275),
+            id: DeclarationId(2276),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75339,7 +75375,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1283, 1306),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2276),
+            id: DeclarationId(2277),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -75358,7 +75394,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5506, 5542),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2277),
+            id: DeclarationId(2278),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -75377,7 +75413,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5547, 5588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2278),
+            id: DeclarationId(2279),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75397,7 +75433,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 6047, 6063),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2279),
+            id: DeclarationId(2280),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -75416,7 +75452,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9175, 9216),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2280),
+            id: DeclarationId(2281),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75430,7 +75466,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9513, 9525),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2281),
+            id: DeclarationId(2282),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75450,7 +75486,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9795, 9807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2282),
+            id: DeclarationId(2283),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -75460,7 +75496,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "sites".to_string(),
-                        ty: DeclarationId(2281),
+                        ty: DeclarationId(2282),
                     },
                 ],
             },
@@ -75475,7 +75511,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9752, 9809),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2283),
+            id: DeclarationId(2284),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -75494,7 +75530,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10119, 10153),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2284),
+            id: DeclarationId(2285),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -75513,7 +75549,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10556, 10607),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2285),
+            id: DeclarationId(2286),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75527,7 +75563,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10950, 10968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2286),
+            id: DeclarationId(2287),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -75556,7 +75592,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 11357, 11469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2287),
+            id: DeclarationId(2288),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -75576,7 +75612,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4846, 4866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2288),
+            id: DeclarationId(2289),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -75602,7 +75638,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4876, 4900),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2289),
+            id: DeclarationId(2290),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -75628,7 +75664,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4911, 4935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2290),
+            id: DeclarationId(2291),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -75654,7 +75690,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4941, 4965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2291),
+            id: DeclarationId(2292),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -75674,7 +75710,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5042, 5062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2292),
+            id: DeclarationId(2293),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -75700,7 +75736,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5072, 5096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2293),
+            id: DeclarationId(2294),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -75726,7 +75762,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5107, 5131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2294),
+            id: DeclarationId(2295),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -75752,7 +75788,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5137, 5161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2295),
+            id: DeclarationId(2296),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -75772,7 +75808,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5245, 5265),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2296),
+            id: DeclarationId(2297),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -75798,7 +75834,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5276, 5300),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2297),
+            id: DeclarationId(2298),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -75824,7 +75860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5325, 5349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2298),
+            id: DeclarationId(2299),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -75844,7 +75880,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5440, 5460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2299),
+            id: DeclarationId(2300),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -75870,7 +75906,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5471, 5495),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2300),
+            id: DeclarationId(2301),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -75896,7 +75932,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5520, 5544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2301),
+            id: DeclarationId(2302),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -75915,7 +75951,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1634, 1651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2302),
+            id: DeclarationId(2303),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -75940,7 +75976,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1656, 1697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2303),
+            id: DeclarationId(2304),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75954,7 +75990,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1879, 1891),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2304),
+            id: DeclarationId(2305),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -75973,7 +76009,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1896, 1932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2305),
+            id: DeclarationId(2306),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -75993,13 +76029,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2414, 2430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2306),
+            id: DeclarationId(2307),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2305),
+                    value: DeclarationId(2306),
                 }],
             },
             type_params: vec![],
@@ -76013,7 +76049,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2409, 2431),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2307),
+            id: DeclarationId(2308),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -76027,7 +76063,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "witnesses".to_string(),
-                        ty: DeclarationId(2306),
+                        ty: DeclarationId(2307),
                     },
                 ],
             },
@@ -76042,7 +76078,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2325, 2437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2308),
+            id: DeclarationId(2309),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -76062,7 +76098,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2505, 2521),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2309),
+            id: DeclarationId(2310),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -76082,13 +76118,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2544, 2560),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2310),
+            id: DeclarationId(2311),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2309),
+                    value: DeclarationId(2310),
                 }],
             },
             type_params: vec![],
@@ -76102,7 +76138,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2539, 2561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2311),
+            id: DeclarationId(2312),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -76112,11 +76148,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "violations".to_string(),
-                        ty: DeclarationId(2308),
+                        ty: DeclarationId(2309),
                     },
                     Field {
                         label: "witnesses".to_string(),
-                        ty: DeclarationId(2310),
+                        ty: DeclarationId(2311),
                     },
                 ],
             },
@@ -76131,7 +76167,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2442, 2567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2312),
+            id: DeclarationId(2313),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -76151,11 +76187,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3902, 3918),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2313),
+            id: DeclarationId(2314),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2312),
+                output: DeclarationId(2313),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -76169,7 +76205,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3881, 3918),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2314),
+            id: DeclarationId(2315),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
@@ -76189,7 +76225,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3930, 3945),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2315),
+            id: DeclarationId(2316),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(827), DeclarationId(990)],
@@ -76207,7 +76243,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3966, 4009),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2316),
+            id: DeclarationId(2317),
             name: Some("DimensionUnitAbelianGroup".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(25),
@@ -76227,7 +76263,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2317),
+            id: DeclarationId(2318),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76241,7 +76277,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3709, 3721),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2318),
+            id: DeclarationId(2319),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -76260,7 +76296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3726, 3762),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2319),
+            id: DeclarationId(2320),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -76280,7 +76316,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 855, 873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2320),
+            id: DeclarationId(2321),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76294,7 +76330,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4373, 4389),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2321),
+            id: DeclarationId(2322),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -76313,7 +76349,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4394, 4422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2322),
+            id: DeclarationId(2323),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76327,7 +76363,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4665, 4686),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2323),
+            id: DeclarationId(2324),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -76346,7 +76382,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5176, 5195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2324),
+            id: DeclarationId(2325),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -76365,7 +76401,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5200, 5222),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2325),
+            id: DeclarationId(2326),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -76385,7 +76421,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5591, 5614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2326),
+            id: DeclarationId(2327),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76399,7 +76435,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6611, 6619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2327),
+            id: DeclarationId(2328),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76413,7 +76449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6624, 6632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2328),
+            id: DeclarationId(2329),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76427,7 +76463,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7073, 7078),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2329),
+            id: DeclarationId(2330),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76441,7 +76477,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7083, 7091),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2330),
+            id: DeclarationId(2331),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76455,7 +76491,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7427, 7440),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2331),
+            id: DeclarationId(2332),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76469,7 +76505,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7445, 7451),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2332),
+            id: DeclarationId(2333),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76483,7 +76519,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7709, 7717),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2333),
+            id: DeclarationId(2334),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76497,7 +76533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7722, 7727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2334),
+            id: DeclarationId(2335),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76511,7 +76547,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7732, 7745),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2335),
+            id: DeclarationId(2336),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76525,7 +76561,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8082, 8100),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2336),
+            id: DeclarationId(2337),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76539,7 +76575,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9475, 9484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2337),
+            id: DeclarationId(2338),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76553,7 +76589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9489, 9502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2338),
+            id: DeclarationId(2339),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76567,7 +76603,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9507, 9515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2339),
+            id: DeclarationId(2340),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76581,7 +76617,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9520, 9530),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2340),
+            id: DeclarationId(2341),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76595,7 +76631,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9535, 9545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2341),
+            id: DeclarationId(2342),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76609,7 +76645,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9550, 9561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2342),
+            id: DeclarationId(2343),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76623,7 +76659,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9566, 9574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2343),
+            id: DeclarationId(2344),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76637,7 +76673,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9579, 9586),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2344),
+            id: DeclarationId(2345),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76651,7 +76687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9591, 9601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2345),
+            id: DeclarationId(2346),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76665,7 +76701,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9606, 9618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2346),
+            id: DeclarationId(2347),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76679,7 +76715,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12311, 12337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2347),
+            id: DeclarationId(2348),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76693,7 +76729,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12342, 12352),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2348),
+            id: DeclarationId(2349),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76707,7 +76743,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17117, 17123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2349),
+            id: DeclarationId(2350),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76721,7 +76757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17128, 17139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2350),
+            id: DeclarationId(2351),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76735,7 +76771,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17459, 17470),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2351),
+            id: DeclarationId(2352),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76749,7 +76785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17475, 17486),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2352),
+            id: DeclarationId(2353),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76763,7 +76799,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 19419, 19430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2353),
+            id: DeclarationId(2354),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76777,7 +76813,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 19435, 19443),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2354),
+            id: DeclarationId(2355),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -76796,7 +76832,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 20606, 20641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2355),
+            id: DeclarationId(2356),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -76821,7 +76857,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 20646, 20734),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2356),
+            id: DeclarationId(2357),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -76841,7 +76877,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6894, 6922),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2357),
+            id: DeclarationId(2358),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -76860,7 +76896,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2358),
+            id: DeclarationId(2359),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -76879,7 +76915,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2359),
+            id: DeclarationId(2360),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -76899,7 +76935,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27850, 27865),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2360),
+            id: DeclarationId(2361),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -76919,7 +76955,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 29879, 29895),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2361),
+            id: DeclarationId(2362),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -76939,7 +76975,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 29988, 30004),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2362),
+            id: DeclarationId(2363),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -76959,13 +76995,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 30102, 30118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2363),
+            id: DeclarationId(2364),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2362),
+                    value: DeclarationId(2363),
                 }],
             },
             type_params: vec![],
@@ -76979,7 +77015,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 30097, 30119),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2364),
+            id: DeclarationId(2365),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -76998,7 +77034,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2365),
+            id: DeclarationId(2366),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -77017,7 +77053,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2366),
+            id: DeclarationId(2367),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -77036,7 +77072,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2367),
+            id: DeclarationId(2368),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -77055,7 +77091,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2368),
+            id: DeclarationId(2369),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -77074,7 +77110,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2369),
+            id: DeclarationId(2370),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -77093,7 +77129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2370),
+            id: DeclarationId(2371),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77107,7 +77143,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5629, 5644),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2371),
+            id: DeclarationId(2372),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77121,7 +77157,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5684, 5697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2372),
+            id: DeclarationId(2373),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77135,7 +77171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5745, 5762),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2373),
+            id: DeclarationId(2374),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77149,7 +77185,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5801, 5813),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2374),
+            id: DeclarationId(2375),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77163,7 +77199,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5861, 5878),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2375),
+            id: DeclarationId(2376),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -77188,7 +77224,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 9971, 10033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2376),
+            id: DeclarationId(2377),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77207,7 +77243,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10038, 10080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2377),
+            id: DeclarationId(2378),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -77232,7 +77268,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10085, 10142),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2378),
+            id: DeclarationId(2379),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77246,7 +77282,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10147, 10161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2379),
+            id: DeclarationId(2380),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77260,7 +77296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10166, 10181),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2380),
+            id: DeclarationId(2381),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77274,7 +77310,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24135, 24149),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2381),
+            id: DeclarationId(2382),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77293,7 +77329,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24154, 24201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2382),
+            id: DeclarationId(2383),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -77318,7 +77354,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24206, 24283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2383),
+            id: DeclarationId(2384),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -77343,7 +77379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24288, 24362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2384),
+            id: DeclarationId(2385),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -77368,7 +77404,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24982, 25038),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2385),
+            id: DeclarationId(2386),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77387,7 +77423,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 25054, 25079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2386),
+            id: DeclarationId(2387),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77401,7 +77437,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26728, 26741),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2387),
+            id: DeclarationId(2388),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77420,7 +77456,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26785, 26817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2388),
+            id: DeclarationId(2389),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -77440,12 +77476,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26880, 26896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2389),
+            id: DeclarationId(2390),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "factors".to_string(),
-                    ty: DeclarationId(2388),
+                    ty: DeclarationId(2389),
                 }],
             },
             type_params: vec![],
@@ -77459,7 +77495,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26856, 26898),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2390),
+            id: DeclarationId(2391),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -77479,13 +77515,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26960, 26976),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2391),
+            id: DeclarationId(2392),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2390),
+                    value: DeclarationId(2391),
                 }],
             },
             type_params: vec![],
@@ -77499,12 +77535,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26955, 26977),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2392),
+            id: DeclarationId(2393),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-                    ty: DeclarationId(2391),
+                    ty: DeclarationId(2392),
                 }],
             },
             type_params: vec![],
@@ -77518,7 +77554,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26927, 26979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2393),
+            id: DeclarationId(2394),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -77538,12 +77574,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27277, 27292),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2394),
+            id: DeclarationId(2395),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-                    ty: DeclarationId(2393),
+                    ty: DeclarationId(2394),
                 }],
             },
             type_params: vec![],
@@ -77557,7 +77593,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27259, 27294),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2395),
+            id: DeclarationId(2396),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77571,7 +77607,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27377, 27389),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2396),
+            id: DeclarationId(2397),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77585,7 +77621,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27459, 27469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2397),
+            id: DeclarationId(2398),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -77605,7 +77641,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(2398),
+            id: DeclarationId(2399),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -77625,7 +77661,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(2399),
+            id: DeclarationId(2400),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -77645,11 +77681,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4180, 4190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2400),
+            id: DeclarationId(2401),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2399),
+                output: DeclarationId(2400),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -77663,7 +77699,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4159, 4190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2401),
+            id: DeclarationId(2402),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
@@ -77683,7 +77719,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4205, 4214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2402),
+            id: DeclarationId(2403),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1129), DeclarationId(1129)],
@@ -77701,7 +77737,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4225, 4238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2403),
+            id: DeclarationId(2404),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1129), DeclarationId(818)],
@@ -77719,7 +77755,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4250, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2404),
+            id: DeclarationId(2405),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(1129)],
@@ -77737,7 +77773,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4284, 4316),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2405),
+            id: DeclarationId(2406),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77756,7 +77792,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 3305, 3352),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2406),
+            id: DeclarationId(2407),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -77781,7 +77817,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 3357, 3418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2407),
+            id: DeclarationId(2408),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77795,7 +77831,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 4297, 4302),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2408),
+            id: DeclarationId(2409),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1133)],
@@ -77813,7 +77849,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 5301, 5321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2409),
+            id: DeclarationId(2410),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1134), DeclarationId(1134)],
@@ -77831,7 +77867,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 5334, 5360),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2410),
+            id: DeclarationId(2411),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1128),
@@ -77851,7 +77887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 7360, 7372),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2411),
+            id: DeclarationId(2412),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1132),
@@ -77877,7 +77913,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 7388, 7419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2412),
+            id: DeclarationId(2413),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1135),
@@ -77903,7 +77939,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 9093, 9124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2413),
+            id: DeclarationId(2414),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1128),
@@ -77923,7 +77959,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 10144, 10156),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2414),
+            id: DeclarationId(2415),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -77943,7 +77979,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4589, 4600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2415),
+            id: DeclarationId(2416),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -77963,7 +77999,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4642, 4653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2416),
+            id: DeclarationId(2417),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77977,7 +78013,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4544, 4548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2417),
+            id: DeclarationId(2418),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77996,7 +78032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4553, 4563),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2418),
+            id: DeclarationId(2419),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78016,7 +78052,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1179, 1196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2419),
+            id: DeclarationId(2420),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -78035,7 +78071,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2420),
+            id: DeclarationId(2421),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78055,12 +78091,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1747, 1764),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2421),
+            id: DeclarationId(2422),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2420),
+                    ty: DeclarationId(2421),
                 }],
             },
             type_params: vec![],
@@ -78074,7 +78110,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1736, 1765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2422),
+            id: DeclarationId(2423),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78094,12 +78130,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1777, 1795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2423),
+            id: DeclarationId(2424),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2422),
+                    ty: DeclarationId(2423),
                 }],
             },
             type_params: vec![],
@@ -78113,7 +78149,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1770, 1796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2424),
+            id: DeclarationId(2425),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78138,7 +78174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2073, 2113),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2425),
+            id: DeclarationId(2426),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78158,7 +78194,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2165, 2182),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2426),
+            id: DeclarationId(2427),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78168,7 +78204,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2425),
+                        ty: DeclarationId(2426),
                     },
                     Field {
                         label: "span".to_string(),
@@ -78187,7 +78223,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2118, 2211),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2427),
+            id: DeclarationId(2428),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78212,7 +78248,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2216, 2280),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2428),
+            id: DeclarationId(2429),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78232,13 +78268,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2307, 2324),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2429),
+            id: DeclarationId(2430),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(2428),
+                        ty: DeclarationId(2429),
                     },
                     Field {
                         label: "output".to_string(),
@@ -78261,7 +78297,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2285, 2379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2430),
+            id: DeclarationId(2431),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78286,7 +78322,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3749, 3795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2431),
+            id: DeclarationId(2432),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78315,7 +78351,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3800, 3883),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2432),
+            id: DeclarationId(2433),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78335,7 +78371,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3937, 3962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2433),
+            id: DeclarationId(2434),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78345,7 +78381,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2432),
+                        ty: DeclarationId(2433),
                     },
                     Field {
                         label: "span".to_string(),
@@ -78364,7 +78400,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3888, 3991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2434),
+            id: DeclarationId(2435),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -78383,7 +78419,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4663, 4674),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2435),
+            id: DeclarationId(2436),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -78402,7 +78438,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4679, 4689),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2436),
+            id: DeclarationId(2437),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -78421,7 +78457,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4694, 4708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2437),
+            id: DeclarationId(2438),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78446,7 +78482,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4822, 4873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2438),
+            id: DeclarationId(2439),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78471,7 +78507,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4878, 4916),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2439),
+            id: DeclarationId(2440),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78491,7 +78527,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4944, 4956),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2440),
+            id: DeclarationId(2441),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78511,17 +78547,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4978, 4994),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2441),
+            id: DeclarationId(2442),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "segments".to_string(),
-                        ty: DeclarationId(2439),
+                        ty: DeclarationId(2440),
                     },
                     Field {
                         label: "segment_spans".to_string(),
-                        ty: DeclarationId(2440),
+                        ty: DeclarationId(2441),
                     },
                     Field {
                         label: "span".to_string(),
@@ -78540,7 +78576,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4921, 5023),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2442),
+            id: DeclarationId(2443),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78560,7 +78596,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5068, 5085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2443),
+            id: DeclarationId(2444),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78570,7 +78606,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2442),
+                        ty: DeclarationId(2443),
                     },
                     Field {
                         label: "span".to_string(),
@@ -78589,7 +78625,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5028, 5114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2444),
+            id: DeclarationId(2445),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78609,7 +78645,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5685, 5697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2445),
+            id: DeclarationId(2446),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78629,7 +78665,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5719, 5735),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2446),
+            id: DeclarationId(2447),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78649,21 +78685,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5748, 5765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2447),
+            id: DeclarationId(2448),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "segments".to_string(),
-                        ty: DeclarationId(2444),
+                        ty: DeclarationId(2445),
                     },
                     Field {
                         label: "segment_spans".to_string(),
-                        ty: DeclarationId(2445),
+                        ty: DeclarationId(2446),
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2446),
+                        ty: DeclarationId(2447),
                     },
                     Field {
                         label: "span".to_string(),
@@ -78682,7 +78718,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5658, 5794),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2448),
+            id: DeclarationId(2449),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78702,7 +78738,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5850, 5874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2449),
+            id: DeclarationId(2450),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78712,7 +78748,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2448),
+                        ty: DeclarationId(2449),
                     },
                     Field {
                         label: "span".to_string(),
@@ -78731,7 +78767,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5799, 5903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2450),
+            id: DeclarationId(2451),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78751,7 +78787,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5954, 5971),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2451),
+            id: DeclarationId(2452),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78761,7 +78797,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2450),
+                        ty: DeclarationId(2451),
                     },
                     Field {
                         label: "span".to_string(),
@@ -78780,7 +78816,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5908, 6000),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2452),
+            id: DeclarationId(2453),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78800,13 +78836,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6028, 6040),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2453),
+            id: DeclarationId(2454),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(2452),
+                        ty: DeclarationId(2453),
                     },
                     Field {
                         label: "body".to_string(),
@@ -78829,7 +78865,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6005, 6093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2454),
+            id: DeclarationId(2455),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78862,7 +78898,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6098, 6217),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2455),
+            id: DeclarationId(2456),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78882,7 +78918,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6271, 6292),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2456),
+            id: DeclarationId(2457),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78892,7 +78928,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "arms".to_string(),
-                        ty: DeclarationId(2455),
+                        ty: DeclarationId(2456),
                     },
                     Field {
                         label: "span".to_string(),
@@ -78911,7 +78947,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6222, 6321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2457),
+            id: DeclarationId(2458),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78931,13 +78967,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6349, 6373),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2458),
+            id: DeclarationId(2459),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2457),
+                        ty: DeclarationId(2458),
                     },
                     Field {
                         label: "span".to_string(),
@@ -78956,7 +78992,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6326, 6402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2459),
+            id: DeclarationId(2460),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78976,13 +79012,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6430, 6447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2460),
+            id: DeclarationId(2461),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "elements".to_string(),
-                        ty: DeclarationId(2459),
+                        ty: DeclarationId(2460),
                     },
                     Field {
                         label: "span".to_string(),
@@ -79001,7 +79037,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6407, 6476),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2461),
+            id: DeclarationId(2462),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79021,13 +79057,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 8570, 8591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2462),
+            id: DeclarationId(2463),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "entries".to_string(),
-                        ty: DeclarationId(2461),
+                        ty: DeclarationId(2462),
                     },
                     Field {
                         label: "span".to_string(),
@@ -79046,7 +79082,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 8549, 8620),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2463),
+            id: DeclarationId(2464),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -79065,7 +79101,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2464),
+            id: DeclarationId(2465),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -79075,7 +79111,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_ann".to_string(),
-                        ty: DeclarationId(2463),
+                        ty: DeclarationId(2464),
                     },
                     Field {
                         label: "expr".to_string(),
@@ -79094,7 +79130,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9510, 9593),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2465),
+            id: DeclarationId(2466),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79114,7 +79150,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9641, 9653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2466),
+            id: DeclarationId(2467),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79134,7 +79170,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9668, 9686),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2467),
+            id: DeclarationId(2468),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -79144,11 +79180,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2465),
+                        ty: DeclarationId(2466),
                     },
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(2466),
+                        ty: DeclarationId(2467),
                     },
                     Field {
                         label: "return_type".to_string(),
@@ -79175,7 +79211,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9598, 9770),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2468),
+            id: DeclarationId(2469),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79195,7 +79231,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9830, 9842),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2469),
+            id: DeclarationId(2470),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79215,7 +79251,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9857, 9875),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2470),
+            id: DeclarationId(2471),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -79225,11 +79261,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2468),
+                        ty: DeclarationId(2469),
                     },
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(2469),
+                        ty: DeclarationId(2470),
                     },
                     Field {
                         label: "return_type".to_string(),
@@ -79256,7 +79292,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9775, 9963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2471),
+            id: DeclarationId(2472),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -79275,7 +79311,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2472),
+            id: DeclarationId(2473),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -79289,7 +79325,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(2471),
+                        ty: DeclarationId(2472),
                     },
                     Field {
                         label: "body_span".to_string(),
@@ -79312,7 +79348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9968, 10097),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2473),
+            id: DeclarationId(2474),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79332,13 +79368,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10117, 10129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2474),
+            id: DeclarationId(2475),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(2473),
+                        ty: DeclarationId(2474),
                     },
                     Field {
                         label: "span".to_string(),
@@ -79357,7 +79393,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10102, 10149),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2475),
+            id: DeclarationId(2476),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79377,7 +79413,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10175, 10187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2476),
+            id: DeclarationId(2477),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79397,17 +79433,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10201, 10213),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2477),
+            id: DeclarationId(2478),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(2475),
+                        ty: DeclarationId(2476),
                     },
                     Field {
                         label: "names".to_string(),
-                        ty: DeclarationId(2476),
+                        ty: DeclarationId(2477),
                     },
                     Field {
                         label: "span".to_string(),
@@ -79426,7 +79462,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10154, 10242),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2478),
+            id: DeclarationId(2479),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79446,7 +79482,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10296, 10308),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2479),
+            id: DeclarationId(2480),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -79456,7 +79492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2478),
+                        ty: DeclarationId(2479),
                     },
                     Field {
                         label: "span".to_string(),
@@ -79475,7 +79511,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10247, 10337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2480),
+            id: DeclarationId(2481),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79495,7 +79531,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10393, 10405),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2481),
+            id: DeclarationId(2482),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79515,7 +79551,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10420, 10438),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2482),
+            id: DeclarationId(2483),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -79525,11 +79561,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2480),
+                        ty: DeclarationId(2481),
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2481),
+                        ty: DeclarationId(2482),
                     },
                     Field {
                         label: "span".to_string(),
@@ -79548,7 +79584,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10342, 10467),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2483),
+            id: DeclarationId(2484),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79568,7 +79604,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10520, 10532),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2484),
+            id: DeclarationId(2485),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79588,7 +79624,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10549, 10569),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2485),
+            id: DeclarationId(2486),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -79607,7 +79643,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2486),
+            id: DeclarationId(2487),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -79617,15 +79653,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2483),
+                        ty: DeclarationId(2484),
                     },
                     Field {
                         label: "variants".to_string(),
-                        ty: DeclarationId(2484),
+                        ty: DeclarationId(2485),
                     },
                     Field {
                         label: "inhabits".to_string(),
-                        ty: DeclarationId(2485),
+                        ty: DeclarationId(2486),
                     },
                     Field {
                         label: "span".to_string(),
@@ -79644,7 +79680,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10472, 10627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2487),
+            id: DeclarationId(2488),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79664,7 +79700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10682, 10694),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2488),
+            id: DeclarationId(2489),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -79683,7 +79719,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2489),
+            id: DeclarationId(2490),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -79693,7 +79729,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2487),
+                        ty: DeclarationId(2488),
                     },
                     Field {
                         label: "nominal_opaque".to_string(),
@@ -79705,7 +79741,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "refinement".to_string(),
-                        ty: DeclarationId(2488),
+                        ty: DeclarationId(2489),
                     },
                     Field {
                         label: "span".to_string(),
@@ -79724,7 +79760,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10632, 10807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2490),
+            id: DeclarationId(2491),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79748,7 +79784,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2491),
+            id: DeclarationId(2492),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79768,7 +79804,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 11243, 11254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2492),
+            id: DeclarationId(2493),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -79787,7 +79823,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2137, 2162),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2493),
+            id: DeclarationId(2494),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79807,12 +79843,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2179, 2195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2494),
+            id: DeclarationId(2495),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2493),
+                    ty: DeclarationId(2494),
                 }],
             },
             type_params: vec![],
@@ -79826,7 +79862,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2167, 2196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2495),
+            id: DeclarationId(2496),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -79851,7 +79887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2201, 2252),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2496),
+            id: DeclarationId(2497),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -79870,7 +79906,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2257, 2272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2497),
+            id: DeclarationId(2498),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -79889,7 +79925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2277, 2304),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2498),
+            id: DeclarationId(2499),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -79915,7 +79951,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 3936, 3954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2499),
+            id: DeclarationId(2500),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79935,7 +79971,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 4542, 4557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2500),
+            id: DeclarationId(2501),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -79954,7 +79990,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 5388, 5442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2501),
+            id: DeclarationId(2502),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -79968,7 +80004,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 5682, 5691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2502),
+            id: DeclarationId(2503),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -79982,7 +80018,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 5694, 5704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2503),
+            id: DeclarationId(2504),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80002,7 +80038,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5769, 5797),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2504),
+            id: DeclarationId(2505),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -80028,7 +80064,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/services.dag", 6785, 6808),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2505),
+            id: DeclarationId(2506),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -80048,7 +80084,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2506),
+            id: DeclarationId(2507),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -80068,7 +80104,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4594, 4620),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2507),
+            id: DeclarationId(2508),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80088,7 +80124,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4888, 4905),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2508),
+            id: DeclarationId(2509),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80108,7 +80144,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4956, 4970),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2509),
+            id: DeclarationId(2510),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80128,7 +80164,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5020, 5033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2510),
+            id: DeclarationId(2511),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80148,7 +80184,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5083, 5096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2511),
+            id: DeclarationId(2512),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80168,7 +80204,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5144, 5160),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2512),
+            id: DeclarationId(2513),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -80188,13 +80224,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5213, 5239),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2513),
+            id: DeclarationId(2514),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2512),
+                    value: DeclarationId(2513),
                 }],
             },
             type_params: vec![],
@@ -80208,7 +80244,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5208, 5240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2514),
+            id: DeclarationId(2515),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -80228,13 +80264,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5314, 5340),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2515),
+            id: DeclarationId(2516),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2514),
+                    value: DeclarationId(2515),
                 }],
             },
             type_params: vec![],
@@ -80248,7 +80284,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5309, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2516),
+            id: DeclarationId(2517),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80268,7 +80304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5466, 5482),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2517),
+            id: DeclarationId(2518),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -80288,7 +80324,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5607, 5641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2518),
+            id: DeclarationId(2519),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -80308,7 +80344,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5853, 5887),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2519),
+            id: DeclarationId(2520),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -80328,7 +80364,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6372, 6406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2520),
+            id: DeclarationId(2521),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -80348,7 +80384,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6633, 6667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2521),
+            id: DeclarationId(2522),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -80368,7 +80404,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6923, 6957),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2522),
+            id: DeclarationId(2523),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -80388,7 +80424,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7137, 7163),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2523),
+            id: DeclarationId(2524),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -80408,7 +80444,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7168, 7202),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2524),
+            id: DeclarationId(2525),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -80428,10 +80464,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8437, 8471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2525),
+            id: DeclarationId(2526),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2301),
+                template: DeclarationId(2302),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -80448,10 +80484,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2526),
+            id: DeclarationId(2527),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2301),
+                template: DeclarationId(2302),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -80468,10 +80504,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2527),
+            id: DeclarationId(2528),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2301),
+                template: DeclarationId(2302),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -80488,10 +80524,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2528),
+            id: DeclarationId(2529),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2301),
+                template: DeclarationId(2302),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -80508,10 +80544,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2529),
+            id: DeclarationId(2530),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2301),
+                template: DeclarationId(2302),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -80528,10 +80564,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2530),
+            id: DeclarationId(2531),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2301),
+                template: DeclarationId(2302),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -80548,10 +80584,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2531),
+            id: DeclarationId(2532),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2301),
+                template: DeclarationId(2302),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -80568,10 +80604,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2532),
+            id: DeclarationId(2533),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2301),
+                template: DeclarationId(2302),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -80588,10 +80624,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2533),
+            id: DeclarationId(2534),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2301),
+                template: DeclarationId(2302),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -80608,10 +80644,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2534),
+            id: DeclarationId(2535),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2301),
+                template: DeclarationId(2302),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -80628,10 +80664,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2535),
+            id: DeclarationId(2536),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1813),
+                template: DeclarationId(1814),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(799),
@@ -80648,10 +80684,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4888, 4905),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2536),
+            id: DeclarationId(2537),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1813),
+                template: DeclarationId(1814),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(827),
@@ -80668,10 +80704,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4956, 4970),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2537),
+            id: DeclarationId(2538),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1813),
+                template: DeclarationId(1814),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(781),
@@ -80688,10 +80724,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5020, 5033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2538),
+            id: DeclarationId(2539),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1813),
+                template: DeclarationId(1814),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(817),
@@ -80708,10 +80744,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5083, 5096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2539),
+            id: DeclarationId(2540),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1813),
+                template: DeclarationId(1814),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(982),
@@ -80728,13 +80764,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5144, 5160),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2540),
+            id: DeclarationId(2541),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1813),
+                template: DeclarationId(1814),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2512),
+                    value: DeclarationId(2513),
                 }],
             },
             type_params: vec![],
@@ -80748,13 +80784,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5208, 5240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2541),
+            id: DeclarationId(2542),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1815),
+                template: DeclarationId(1816),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2514),
+                    value: DeclarationId(2515),
                 }],
             },
             type_params: vec![],
@@ -80768,10 +80804,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5309, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2542),
+            id: DeclarationId(2543),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2301),
+                template: DeclarationId(2302),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -80788,10 +80824,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5314, 5340),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2543),
+            id: DeclarationId(2544),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1815),
+                template: DeclarationId(1816),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(982),
@@ -80808,10 +80844,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5466, 5482),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2544),
+            id: DeclarationId(2545),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2307),
+                template: DeclarationId(2308),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(988),
                     value: DeclarationId(1237),
@@ -80828,10 +80864,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5607, 5641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2545),
+            id: DeclarationId(2546),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2311),
+                template: DeclarationId(2312),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(988),
                     value: DeclarationId(1237),
@@ -80848,7 +80884,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5853, 5887),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2546),
+            id: DeclarationId(2547),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -80867,7 +80903,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2547),
+            id: DeclarationId(2548),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -80886,7 +80922,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2548),
+            id: DeclarationId(2549),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -80905,7 +80941,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2549),
+            id: DeclarationId(2550),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -80931,7 +80967,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2732, 2760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2550),
+            id: DeclarationId(2551),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -80957,7 +80993,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2804, 2832),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2551),
+            id: DeclarationId(2552),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -80976,7 +81012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2552),
+            id: DeclarationId(2553),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -80995,7 +81031,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2553),
+            id: DeclarationId(2554),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(11),
@@ -81021,7 +81057,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 12353, 12399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2554),
+            id: DeclarationId(2555),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81035,7 +81071,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 767, 773),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2555),
+            id: DeclarationId(2556),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81049,7 +81085,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 778, 791),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2556),
+            id: DeclarationId(2557),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81063,7 +81099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 796, 810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2557),
+            id: DeclarationId(2558),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81082,7 +81118,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3332, 3358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2558),
+            id: DeclarationId(2559),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81101,7 +81137,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3363, 3391),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2559),
+            id: DeclarationId(2560),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81120,7 +81156,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3396, 3429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2560),
+            id: DeclarationId(2561),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81139,7 +81175,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3434, 3465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2561),
+            id: DeclarationId(2562),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81158,7 +81194,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3470, 3502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2562),
+            id: DeclarationId(2563),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81172,7 +81208,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4509, 4516),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2563),
+            id: DeclarationId(2564),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81191,7 +81227,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4521, 4571),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2564),
+            id: DeclarationId(2565),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81205,7 +81241,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 5484, 5495),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2565),
+            id: DeclarationId(2566),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81224,7 +81260,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 5500, 5545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2566),
+            id: DeclarationId(2567),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81243,7 +81279,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7649, 7683),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2567),
+            id: DeclarationId(2568),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81262,7 +81298,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7688, 7732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2568),
+            id: DeclarationId(2569),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81281,7 +81317,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7737, 7795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2569),
+            id: DeclarationId(2570),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81300,7 +81336,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7800, 7856),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2570),
+            id: DeclarationId(2571),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81319,7 +81355,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7861, 7894),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2571),
+            id: DeclarationId(2572),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81338,7 +81374,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7899, 7929),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2572),
+            id: DeclarationId(2573),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81352,7 +81388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7934, 7947),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2573),
+            id: DeclarationId(2574),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -81372,7 +81408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7987, 8009),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2574),
+            id: DeclarationId(2575),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -81392,7 +81428,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 8219, 8240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2575),
+            id: DeclarationId(2576),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81406,7 +81442,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 8740, 8746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2576),
+            id: DeclarationId(2577),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81420,7 +81456,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 9139, 9152),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2577),
+            id: DeclarationId(2578),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81434,7 +81470,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 9157, 9171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2578),
+            id: DeclarationId(2579),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81453,7 +81489,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 10263, 10297),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2579),
+            id: DeclarationId(2580),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81467,7 +81503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 10302, 10320),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2580),
+            id: DeclarationId(2581),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -81493,7 +81529,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 11234, 11261),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2581),
+            id: DeclarationId(2582),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -81513,7 +81549,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8271, 8287),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2582),
+            id: DeclarationId(2583),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -81533,7 +81569,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2583),
+            id: DeclarationId(2584),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81552,7 +81588,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4032, 4066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2584),
+            id: DeclarationId(2585),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81566,7 +81602,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4071, 4081),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2585),
+            id: DeclarationId(2586),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81580,7 +81616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4086, 4095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2586),
+            id: DeclarationId(2587),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81594,7 +81630,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4100, 4105),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2587),
+            id: DeclarationId(2588),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -81614,10 +81650,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 5943, 5971),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2588),
+            id: DeclarationId(2589),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1813),
+                template: DeclarationId(1814),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(978),
@@ -81633,31 +81669,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8271, 8287),
         });
-        declarations.push(Declaration {
-            id: DeclarationId(2589),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2301),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1237),
-                }],
-            },
-            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/timing_lens.dag", 12180, 12206),
-        });
         declarations.push(Declaration {
             id: DeclarationId(2590),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2301),
+                template: DeclarationId(2302),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -81677,7 +81693,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2591),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2301),
+                template: DeclarationId(2302),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -81697,7 +81713,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2592),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2301),
+                template: DeclarationId(2302),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -81717,7 +81733,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2593),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2301),
+                template: DeclarationId(2302),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -81737,7 +81753,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2594),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2301),
+                template: DeclarationId(2302),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -81757,7 +81773,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2595),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2301),
+                template: DeclarationId(2302),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -81777,7 +81793,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2596),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2301),
+                template: DeclarationId(2302),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -81797,7 +81813,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2597),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2301),
+                template: DeclarationId(2302),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -81817,7 +81833,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2598),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2301),
+                template: DeclarationId(2302),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -81836,6 +81852,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         declarations.push(Declaration {
             id: DeclarationId(2599),
             name: None,
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(2302),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(985),
+                    value: DeclarationId(1237),
+                }],
+            },
+            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/timing_lens.dag", 12180, 12206),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2600),
+            name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -81848,7 +81884,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 646, 651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2600),
+            id: DeclarationId(2601),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81862,7 +81898,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 656, 660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2601),
+            id: DeclarationId(2602),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81876,7 +81912,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 665, 671),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2602),
+            id: DeclarationId(2603),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81890,7 +81926,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 676, 682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2603),
+            id: DeclarationId(2604),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81904,7 +81940,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 687, 691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2604),
+            id: DeclarationId(2605),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81918,7 +81954,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 696, 702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2605),
+            id: DeclarationId(2606),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81932,7 +81968,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 707, 715),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2606),
+            id: DeclarationId(2607),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81946,7 +81982,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 720, 728),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2607),
+            id: DeclarationId(2608),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81960,7 +81996,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 733, 740),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2608),
+            id: DeclarationId(2609),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81974,7 +82010,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 745, 751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2609),
+            id: DeclarationId(2610),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81988,7 +82024,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 756, 763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2610),
+            id: DeclarationId(2611),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82002,7 +82038,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 768, 774),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2611),
+            id: DeclarationId(2612),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82016,7 +82052,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 779, 786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2612),
+            id: DeclarationId(2613),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -82035,7 +82071,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 791, 804),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2613),
+            id: DeclarationId(2614),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -82054,7 +82090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 889, 903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2614),
+            id: DeclarationId(2615),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -82073,7 +82109,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 908, 925),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2615),
+            id: DeclarationId(2616),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82087,7 +82123,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 930, 932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2616),
+            id: DeclarationId(2617),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82101,7 +82137,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 937, 941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2617),
+            id: DeclarationId(2618),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82115,7 +82151,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 946, 951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2618),
+            id: DeclarationId(2619),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82129,7 +82165,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 956, 958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2619),
+            id: DeclarationId(2620),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82143,7 +82179,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 963, 965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2620),
+            id: DeclarationId(2621),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82157,7 +82193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 970, 972),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2621),
+            id: DeclarationId(2622),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82171,7 +82207,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 977, 979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2622),
+            id: DeclarationId(2623),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82185,7 +82221,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 984, 988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2623),
+            id: DeclarationId(2624),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82199,7 +82235,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 993, 998),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2624),
+            id: DeclarationId(2625),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82213,7 +82249,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1003, 1007),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2625),
+            id: DeclarationId(2626),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82227,7 +82263,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1012, 1017),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2626),
+            id: DeclarationId(2627),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82241,7 +82277,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1022, 1028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2627),
+            id: DeclarationId(2628),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82255,7 +82291,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1033, 1041),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2628),
+            id: DeclarationId(2629),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82269,7 +82305,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1046, 1051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2629),
+            id: DeclarationId(2630),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82283,7 +82319,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1056, 1061),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2630),
+            id: DeclarationId(2631),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82297,7 +82333,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1066, 1074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2631),
+            id: DeclarationId(2632),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82311,7 +82347,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1079, 1088),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2632),
+            id: DeclarationId(2633),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82325,7 +82361,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1093, 1096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2633),
+            id: DeclarationId(2634),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82339,7 +82375,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1101, 1107),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2634),
+            id: DeclarationId(2635),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82353,7 +82389,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1112, 1118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2635),
+            id: DeclarationId(2636),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82367,7 +82403,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1123, 1129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2636),
+            id: DeclarationId(2637),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82381,7 +82417,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1134, 1140),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2637),
+            id: DeclarationId(2638),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82395,7 +82431,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1145, 1153),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2638),
+            id: DeclarationId(2639),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82409,7 +82445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1158, 1166),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2639),
+            id: DeclarationId(2640),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82423,7 +82459,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1171, 1176),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2640),
+            id: DeclarationId(2641),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82437,7 +82473,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1181, 1190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2641),
+            id: DeclarationId(2642),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82451,7 +82487,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1195, 1199),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2642),
+            id: DeclarationId(2643),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82465,7 +82501,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1204, 1212),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2643),
+            id: DeclarationId(2644),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82479,7 +82515,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1217, 1220),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2644),
+            id: DeclarationId(2645),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82493,7 +82529,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1791, 1796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2645),
+            id: DeclarationId(2646),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82507,7 +82543,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1801, 1805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2646),
+            id: DeclarationId(2647),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82521,7 +82557,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1810, 1816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2647),
+            id: DeclarationId(2648),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82535,7 +82571,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1821, 1827),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2648),
+            id: DeclarationId(2649),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82549,7 +82585,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1832, 1836),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2649),
+            id: DeclarationId(2650),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82563,7 +82599,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1841, 1847),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2650),
+            id: DeclarationId(2651),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82577,7 +82613,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1852, 1860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2651),
+            id: DeclarationId(2652),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82591,7 +82627,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1865, 1873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2652),
+            id: DeclarationId(2653),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82605,7 +82641,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1878, 1885),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2653),
+            id: DeclarationId(2654),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82619,7 +82655,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1890, 1896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2654),
+            id: DeclarationId(2655),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82633,7 +82669,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1901, 1908),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2655),
+            id: DeclarationId(2656),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82647,7 +82683,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1913, 1919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2656),
+            id: DeclarationId(2657),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82661,7 +82697,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1924, 1931),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2657),
+            id: DeclarationId(2658),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82675,7 +82711,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2371, 2373),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2658),
+            id: DeclarationId(2659),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82689,7 +82725,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2378, 2382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2659),
+            id: DeclarationId(2660),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82703,7 +82739,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2387, 2392),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2660),
+            id: DeclarationId(2661),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82717,7 +82753,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2397, 2399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2661),
+            id: DeclarationId(2662),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82731,7 +82767,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2404, 2406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2662),
+            id: DeclarationId(2663),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82745,7 +82781,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2411, 2413),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2663),
+            id: DeclarationId(2664),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82759,7 +82795,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2418, 2420),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2664),
+            id: DeclarationId(2665),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82773,7 +82809,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2425, 2429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2665),
+            id: DeclarationId(2666),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82787,7 +82823,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2434, 2439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2666),
+            id: DeclarationId(2667),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82801,7 +82837,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2444, 2448),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2667),
+            id: DeclarationId(2668),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82815,7 +82851,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2453, 2458),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2668),
+            id: DeclarationId(2669),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82829,7 +82865,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2463, 2469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2669),
+            id: DeclarationId(2670),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82843,7 +82879,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2474, 2482),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2670),
+            id: DeclarationId(2671),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82857,7 +82893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2487, 2492),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2671),
+            id: DeclarationId(2672),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82871,7 +82907,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2497, 2502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2672),
+            id: DeclarationId(2673),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82885,7 +82921,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2507, 2515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2673),
+            id: DeclarationId(2674),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82899,7 +82935,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2520, 2529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2674),
+            id: DeclarationId(2675),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82913,7 +82949,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2534, 2537),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2675),
+            id: DeclarationId(2676),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82927,7 +82963,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2542, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2676),
+            id: DeclarationId(2677),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82941,7 +82977,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2553, 2559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2677),
+            id: DeclarationId(2678),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82955,7 +82991,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2564, 2570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2678),
+            id: DeclarationId(2679),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82969,7 +83005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2575, 2581),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2679),
+            id: DeclarationId(2680),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82983,7 +83019,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2586, 2594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2680),
+            id: DeclarationId(2681),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82997,7 +83033,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2599, 2607),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2681),
+            id: DeclarationId(2682),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83011,7 +83047,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2612, 2617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2682),
+            id: DeclarationId(2683),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83025,7 +83061,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2622, 2631),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2683),
+            id: DeclarationId(2684),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83039,7 +83075,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2636, 2640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2684),
+            id: DeclarationId(2685),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83053,7 +83089,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2645, 2653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2685),
+            id: DeclarationId(2686),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -83070,10 +83106,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26886, 26909),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26891, 26914),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2686),
+            id: DeclarationId(2687),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -83090,10 +83126,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 27978, 27994),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27983, 27999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2687),
+            id: DeclarationId(2688),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -83110,10 +83146,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 27999, 28019),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28004, 28024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2688),
+            id: DeclarationId(2689),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83127,7 +83163,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2612, 2626),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2689),
+            id: DeclarationId(2690),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83141,7 +83177,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2631, 2641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2690),
+            id: DeclarationId(2691),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83155,7 +83191,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2646, 2658),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2691),
+            id: DeclarationId(2692),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83169,7 +83205,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2663, 2676),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2692),
+            id: DeclarationId(2693),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83183,7 +83219,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2681, 2693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2693),
+            id: DeclarationId(2694),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83197,7 +83233,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2698, 2710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2694),
+            id: DeclarationId(2695),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83211,7 +83247,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2715, 2737),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2695),
+            id: DeclarationId(2696),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83225,7 +83261,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2742, 2761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2696),
+            id: DeclarationId(2697),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83239,7 +83275,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2766, 2791),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2697),
+            id: DeclarationId(2698),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83253,7 +83289,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2796, 2819),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2698),
+            id: DeclarationId(2699),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83267,7 +83303,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3225, 3234),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2699),
+            id: DeclarationId(2700),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -83286,7 +83322,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3239, 3255),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2700),
+            id: DeclarationId(2701),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83300,7 +83336,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3914, 3922),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2701),
+            id: DeclarationId(2702),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83314,7 +83350,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3927, 3937),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2702),
+            id: DeclarationId(2703),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83328,7 +83364,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4162, 4174),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2703),
+            id: DeclarationId(2704),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83342,7 +83378,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4989, 5002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2704),
+            id: DeclarationId(2705),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83356,7 +83392,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5007, 5020),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2705),
+            id: DeclarationId(2706),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83370,7 +83406,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5025, 5033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2706),
+            id: DeclarationId(2707),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83395,7 +83431,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5578, 5645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2707),
+            id: DeclarationId(2708),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -83414,7 +83450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5686, 5739),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2708),
+            id: DeclarationId(2709),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83428,7 +83464,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5772, 5801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2709),
+            id: DeclarationId(2710),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83442,7 +83478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6403, 6435),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2710),
+            id: DeclarationId(2711),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83456,7 +83492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6440, 6471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2711),
+            id: DeclarationId(2712),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83470,7 +83506,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6513, 6545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2712),
+            id: DeclarationId(2713),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83484,7 +83520,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6550, 6581),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2713),
+            id: DeclarationId(2714),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83498,7 +83534,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6586, 6614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2714),
+            id: DeclarationId(2715),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83512,7 +83548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6619, 6645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2715),
+            id: DeclarationId(2716),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83526,7 +83562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6684, 6706),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2716),
+            id: DeclarationId(2717),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83540,7 +83576,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6711, 6739),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2717),
+            id: DeclarationId(2718),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83554,7 +83590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6744, 6773),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2718),
+            id: DeclarationId(2719),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83565,10 +83601,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9579, 9587),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9584, 9592),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2719),
+            id: DeclarationId(2720),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -83584,10 +83620,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9592, 9632),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9597, 9637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2720),
+            id: DeclarationId(2721),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -83603,10 +83639,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9637, 9670),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9642, 9675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2721),
+            id: DeclarationId(2722),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83628,10 +83664,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9675, 9753),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9680, 9758),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2722),
+            id: DeclarationId(2723),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -83647,10 +83683,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9919, 9982),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9924, 9987),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2723),
+            id: DeclarationId(2724),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83676,10 +83712,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9987, 10078),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9992, 10083),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2724),
+            id: DeclarationId(2725),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83705,10 +83741,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 10083, 10215),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10088, 10220),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2725),
+            id: DeclarationId(2726),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83730,10 +83766,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 10430, 10519),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10435, 10524),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2726),
+            id: DeclarationId(2727),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -83750,10 +83786,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 11319, 11331),
+            span: SourceSpan::new("src/v3/std/verification.dag", 11324, 11336),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2727),
+            id: DeclarationId(2728),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83763,7 +83799,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2726),
+                        ty: DeclarationId(2727),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -83779,10 +83815,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 11268, 11365),
+            span: SourceSpan::new("src/v3/std/verification.dag", 11273, 11370),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2728),
+            id: DeclarationId(2729),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -83799,10 +83835,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 12080, 12092),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12085, 12097),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2729),
+            id: DeclarationId(2730),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83812,7 +83848,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2728),
+                        ty: DeclarationId(2729),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -83832,10 +83868,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 12030, 12158),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12035, 12163),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2730),
+            id: DeclarationId(2731),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83861,10 +83897,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 12456, 12578),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12461, 12583),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2731),
+            id: DeclarationId(2732),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83890,10 +83926,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 12840, 12965),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12845, 12970),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2732),
+            id: DeclarationId(2733),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -83909,10 +83945,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 15018, 15079),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15023, 15084),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2733),
+            id: DeclarationId(2734),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83934,10 +83970,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 15084, 15183),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15089, 15188),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2734),
+            id: DeclarationId(2735),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83963,10 +83999,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 15537, 15669),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15542, 15674),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2735),
+            id: DeclarationId(2736),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83988,10 +84024,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 16236, 16348),
+            span: SourceSpan::new("src/v3/std/verification.dag", 16241, 16353),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2736),
+            id: DeclarationId(2737),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84013,10 +84049,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 17045, 17124),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17050, 17129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2737),
+            id: DeclarationId(2738),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84042,10 +84078,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 17344, 17457),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17349, 17462),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2738),
+            id: DeclarationId(2739),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84071,10 +84107,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 17462, 17598),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17467, 17603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2739),
+            id: DeclarationId(2740),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84096,10 +84132,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 17603, 17685),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17608, 17690),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2740),
+            id: DeclarationId(2741),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84121,10 +84157,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 17690, 17776),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17695, 17781),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2741),
+            id: DeclarationId(2742),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -84141,10 +84177,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 17855, 17865),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17860, 17870),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2742),
+            id: DeclarationId(2743),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84154,7 +84190,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "generated_paths".to_string(),
-                        ty: DeclarationId(2741),
+                        ty: DeclarationId(2742),
                     },
                 ],
             },
@@ -84166,10 +84202,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 17781, 17871),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17786, 17876),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2743),
+            id: DeclarationId(2744),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84191,10 +84227,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 19085, 19210),
+            span: SourceSpan::new("src/v3/std/verification.dag", 19090, 19215),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2744),
+            id: DeclarationId(2745),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84220,10 +84256,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 20152, 20286),
+            span: SourceSpan::new("src/v3/std/verification.dag", 20157, 20291),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2745),
+            id: DeclarationId(2746),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84249,10 +84285,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 20925, 21069),
+            span: SourceSpan::new("src/v3/std/verification.dag", 20930, 21074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2746),
+            id: DeclarationId(2747),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -84268,10 +84304,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 21914, 21968),
+            span: SourceSpan::new("src/v3/std/verification.dag", 21919, 21973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2747),
+            id: DeclarationId(2748),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -84288,10 +84324,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 23012, 23035),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23017, 23040),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2748),
+            id: DeclarationId(2749),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84302,10 +84338,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 23238, 23244),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23243, 23249),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2749),
+            id: DeclarationId(2750),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84316,10 +84352,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 23249, 23255),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23254, 23260),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2750),
+            id: DeclarationId(2751),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -84336,10 +84372,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 23393, 23416),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23398, 23421),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2751),
+            id: DeclarationId(2752),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -84355,10 +84391,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 25139, 25168),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25144, 25173),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2752),
+            id: DeclarationId(2753),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -84374,10 +84410,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 25173, 25212),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25178, 25217),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2753),
+            id: DeclarationId(2754),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -84393,10 +84429,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26070, 26091),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26075, 26096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2754),
+            id: DeclarationId(2755),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -84412,10 +84448,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26096, 26127),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26101, 26132),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2755),
+            id: DeclarationId(2756),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -84432,10 +84468,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26171, 26187),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26176, 26192),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2756),
+            id: DeclarationId(2757),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -84452,10 +84488,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26443, 26466),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26448, 26471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2757),
+            id: DeclarationId(2758),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -84475,7 +84511,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 7007, 7038),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2758),
+            id: DeclarationId(2759),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -84495,7 +84531,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/workflows.dag", 992, 1006),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2759),
+            id: DeclarationId(2760),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84509,7 +84545,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 532, 547),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2760),
+            id: DeclarationId(2761),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84523,7 +84559,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 550, 561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2761),
+            id: DeclarationId(2762),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84537,7 +84573,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 564, 576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2762),
+            id: DeclarationId(2763),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -84556,7 +84592,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2763),
+            id: DeclarationId(2764),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84570,7 +84606,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6428, 6446),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2764),
+            id: DeclarationId(2765),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84584,7 +84620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6451, 6466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2765),
+            id: DeclarationId(2766),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84598,7 +84634,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6495, 6518),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2766),
+            id: DeclarationId(2767),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84612,7 +84648,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6523, 6544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2767),
+            id: DeclarationId(2768),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84626,7 +84662,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6549, 6564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2768),
+            id: DeclarationId(2769),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84640,7 +84676,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8177, 8187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2769),
+            id: DeclarationId(2770),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84654,7 +84690,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8192, 8203),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2770),
+            id: DeclarationId(2771),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84668,7 +84704,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8208, 8221),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2771),
+            id: DeclarationId(2772),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84682,7 +84718,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8226, 8239),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2772),
+            id: DeclarationId(2773),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84696,7 +84732,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8244, 8257),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2773),
+            id: DeclarationId(2774),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84710,7 +84746,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8262, 8276),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2774),
+            id: DeclarationId(2775),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84724,7 +84760,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8281, 8296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2775),
+            id: DeclarationId(2776),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84738,7 +84774,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9038, 9055),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2776),
+            id: DeclarationId(2777),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84752,7 +84788,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9060, 9070),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2777),
+            id: DeclarationId(2778),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84766,7 +84802,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9075, 9079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2778),
+            id: DeclarationId(2779),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84776,11 +84812,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1717),
+                        ty: DeclarationId(1718),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(1719),
+                        ty: DeclarationId(1720),
                     },
                     Field {
                         label: "range_min_inclusive".to_string(),
@@ -84796,7 +84832,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "overflow".to_string(),
-                        ty: DeclarationId(1720),
+                        ty: DeclarationId(1721),
                     },
                 ],
             },
@@ -84811,7 +84847,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9857, 10429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2779),
+            id: DeclarationId(2780),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84821,11 +84857,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1718),
+                        ty: DeclarationId(1719),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(1719),
+                        ty: DeclarationId(1720),
                     },
                     Field {
                         label: "is_copy".to_string(),
@@ -84844,13 +84880,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10434, 10616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2780),
+            id: DeclarationId(2781),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1721),
+                    value: DeclarationId(1722),
                 }],
             },
             type_params: vec![],
@@ -84864,7 +84900,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10965, 10984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2781),
+            id: DeclarationId(2782),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84878,7 +84914,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4233, 4241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2782),
+            id: DeclarationId(2783),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -84897,7 +84933,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4246, 4277),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2783),
+            id: DeclarationId(2784),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -84917,12 +84953,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4299, 4319),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2784),
+            id: DeclarationId(2785),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "values".to_string(),
-                    ty: DeclarationId(2783),
+                    ty: DeclarationId(2784),
                 }],
             },
             type_params: vec![],
@@ -84936,7 +84972,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4282, 4321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2785),
+            id: DeclarationId(2786),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84961,7 +84997,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4326, 4379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2786),
+            id: DeclarationId(2787),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84986,7 +85022,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4384, 4433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2787),
+            id: DeclarationId(2788),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85000,7 +85036,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 847, 851),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2788),
+            id: DeclarationId(2789),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85014,7 +85050,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 854, 857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2789),
+            id: DeclarationId(2790),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85028,13 +85064,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 860, 872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2790),
+            id: DeclarationId(2791),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1733),
+                    value: DeclarationId(1734),
                 }],
             },
             type_params: vec![],
@@ -85048,7 +85084,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1242, 1259),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2791),
+            id: DeclarationId(2792),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -85067,7 +85103,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2792),
+            id: DeclarationId(2793),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85081,7 +85117,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1309, 1318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2793),
+            id: DeclarationId(2794),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85095,7 +85131,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1323, 1332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2794),
+            id: DeclarationId(2795),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85109,7 +85145,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1337, 1350),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2795),
+            id: DeclarationId(2796),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85123,7 +85159,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1355, 1367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2796),
+            id: DeclarationId(2797),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85137,7 +85173,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1372, 1385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2797),
+            id: DeclarationId(2798),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -85156,7 +85192,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2798),
+            id: DeclarationId(2799),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85170,7 +85206,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1677, 1685),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2799),
+            id: DeclarationId(2800),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85184,7 +85220,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1688, 1697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2800),
+            id: DeclarationId(2801),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85198,13 +85234,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1700, 1709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2801),
+            id: DeclarationId(2802),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1742),
+                    value: DeclarationId(1743),
                 }],
             },
             type_params: vec![],
@@ -85218,11 +85254,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1521, 1542),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2802),
+            id: DeclarationId(2803),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1751),
+                    DeclarationId(1752),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -85237,13 +85273,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2803),
+            id: DeclarationId(2804),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1748),
+                    value: DeclarationId(1749),
                 }],
             },
             type_params: vec![],
@@ -85257,7 +85293,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1583, 1592),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2804),
+            id: DeclarationId(2805),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -85283,11 +85319,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2805),
+            id: DeclarationId(2806),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2804),
+                    DeclarationId(2805),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -85302,11 +85338,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2806),
+            id: DeclarationId(2807),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1740),
+                    DeclarationId(1741),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -85321,7 +85357,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2807),
+            id: DeclarationId(2808),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85335,7 +85371,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1917, 1925),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2808),
+            id: DeclarationId(2809),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85349,7 +85385,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1928, 1937),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2809),
+            id: DeclarationId(2810),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85363,7 +85399,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1940, 1948),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2810),
+            id: DeclarationId(2811),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -85383,7 +85419,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2106, 2118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2811),
+            id: DeclarationId(2812),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -85403,17 +85439,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2127, 2139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2812),
+            id: DeclarationId(2813),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "branches".to_string(),
-                        ty: DeclarationId(2810),
+                        ty: DeclarationId(2811),
                     },
                     Field {
                         label: "paths".to_string(),
-                        ty: DeclarationId(2811),
+                        ty: DeclarationId(2812),
                     },
                 ],
             },
@@ -85428,7 +85464,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2089, 2141),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2813),
+            id: DeclarationId(2814),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -85448,13 +85484,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2170, 2182),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2814),
+            id: DeclarationId(2815),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1743),
+                    value: DeclarationId(1744),
                 }],
             },
             type_params: vec![],
@@ -85468,17 +85504,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2191, 2216),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2815),
+            id: DeclarationId(2816),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "branches".to_string(),
-                        ty: DeclarationId(2813),
+                        ty: DeclarationId(2814),
                     },
                     Field {
                         label: "types".to_string(),
-                        ty: DeclarationId(2814),
+                        ty: DeclarationId(2815),
                     },
                 ],
             },
@@ -85493,12 +85529,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2146, 2218),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2816),
+            id: DeclarationId(2817),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "cron".to_string(),
-                    ty: DeclarationId(1724),
+                    ty: DeclarationId(1725),
                 }],
             },
             type_params: vec![],
@@ -85512,13 +85548,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2223, 2254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2817),
+            id: DeclarationId(2818),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1744),
+                    value: DeclarationId(1745),
                 }],
             },
             type_params: vec![],
@@ -85532,12 +85568,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2286, 2305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2818),
+            id: DeclarationId(2819),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "inputs".to_string(),
-                    ty: DeclarationId(2817),
+                    ty: DeclarationId(2818),
                 }],
             },
             type_params: vec![],
@@ -85551,13 +85587,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2259, 2307),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2819),
+            id: DeclarationId(2820),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1744),
+                    value: DeclarationId(1745),
                 }],
             },
             type_params: vec![],
@@ -85571,12 +85607,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2335, 2354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2820),
+            id: DeclarationId(2821),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "inputs".to_string(),
-                    ty: DeclarationId(2819),
+                    ty: DeclarationId(2820),
                 }],
             },
             type_params: vec![],
@@ -85590,7 +85626,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2312, 2356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2821),
+            id: DeclarationId(2822),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85604,7 +85640,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2387, 2393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2822),
+            id: DeclarationId(2823),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85618,7 +85654,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2398, 2409),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2823),
+            id: DeclarationId(2824),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85632,7 +85668,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2414, 2422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2824),
+            id: DeclarationId(2825),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85646,7 +85682,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2427, 2441),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2825),
+            id: DeclarationId(2826),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85660,7 +85696,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2446, 2452),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2826),
+            id: DeclarationId(2827),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -85679,7 +85715,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2827),
+            id: DeclarationId(2828),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -85698,7 +85734,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2828),
+            id: DeclarationId(2829),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85712,7 +85748,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2603, 2614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2829),
+            id: DeclarationId(2830),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85726,7 +85762,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2617, 2629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2830),
+            id: DeclarationId(2831),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85740,7 +85776,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2632, 2643),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2831),
+            id: DeclarationId(2832),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85754,7 +85790,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2646, 2662),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2832),
+            id: DeclarationId(2833),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85768,7 +85804,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4784, 4793),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2833),
+            id: DeclarationId(2834),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85782,7 +85818,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4796, 4804),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2834),
+            id: DeclarationId(2835),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85796,7 +85832,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4807, 4820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2835),
+            id: DeclarationId(2836),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -85815,13 +85851,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2836),
+            id: DeclarationId(2837),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1754),
+                    value: DeclarationId(1755),
                 }],
             },
             type_params: vec![],
@@ -85835,7 +85871,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5372, 5382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2837),
+            id: DeclarationId(2838),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -85855,7 +85891,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5392, 5404),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2838),
+            id: DeclarationId(2839),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -85881,11 +85917,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2839),
+            id: DeclarationId(2840),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2838),
+                    DeclarationId(2839),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -85900,7 +85936,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2840),
+            id: DeclarationId(2841),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -85926,11 +85962,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2841),
+            id: DeclarationId(2842),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2840),
+                    DeclarationId(2841),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -85945,7 +85981,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2842),
+            id: DeclarationId(2843),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -85964,11 +86000,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2843),
+            id: DeclarationId(2844),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1770),
+                    DeclarationId(1771),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -85983,7 +86019,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2844),
+            id: DeclarationId(2845),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86002,11 +86038,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2845),
+            id: DeclarationId(2846),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1751),
+                    DeclarationId(1752),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -86021,7 +86057,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2846),
+            id: DeclarationId(2847),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -86040,7 +86076,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6619, 6655),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2847),
+            id: DeclarationId(2848),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -86059,7 +86095,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6660, 6709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2848),
+            id: DeclarationId(2849),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86073,7 +86109,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7555, 7584),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2849),
+            id: DeclarationId(2850),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -86092,7 +86128,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7589, 7646),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2850),
+            id: DeclarationId(2851),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -86111,11 +86147,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8224, 8259),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2851),
+            id: DeclarationId(2852),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1750),
+                    DeclarationId(1751),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -86130,7 +86166,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2852),
+            id: DeclarationId(2853),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -86140,7 +86176,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "cancel_in_progress".to_string(),
-                        ty: DeclarationId(2851),
+                        ty: DeclarationId(2852),
                     },
                 ],
             },
@@ -86155,11 +86191,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8264, 8453),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2853),
+            id: DeclarationId(2854),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1749),
+                    DeclarationId(1750),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -86174,7 +86210,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2854),
+            id: DeclarationId(2855),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86193,7 +86229,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2855),
+            id: DeclarationId(2856),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -86203,11 +86239,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "cancel_in_progress".to_string(),
-                        ty: DeclarationId(2853),
+                        ty: DeclarationId(2854),
                     },
                     Field {
                         label: "explicit_single".to_string(),
-                        ty: DeclarationId(2854),
+                        ty: DeclarationId(2855),
                     },
                 ],
             },
@@ -86222,12 +86258,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8458, 8845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2856),
+            id: DeclarationId(2857),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "label".to_string(),
-                    ty: DeclarationId(1753),
+                    ty: DeclarationId(1754),
                 }],
             },
             type_params: vec![],
@@ -86241,7 +86277,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10037, 10072),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2857),
+            id: DeclarationId(2858),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -86261,12 +86297,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10098, 10110),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2858),
+            id: DeclarationId(2859),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "labels".to_string(),
-                    ty: DeclarationId(2857),
+                    ty: DeclarationId(2858),
                 }],
             },
             type_params: vec![],
@@ -86280,7 +86316,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10077, 10112),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2859),
+            id: DeclarationId(2860),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -86299,7 +86335,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10201, 10240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2860),
+            id: DeclarationId(2861),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86313,7 +86349,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10263, 10275),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2861),
+            id: DeclarationId(2862),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86327,7 +86363,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10280, 10290),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2862),
+            id: DeclarationId(2863),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86341,7 +86377,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10295, 10305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2863),
+            id: DeclarationId(2864),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86355,7 +86391,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10310, 10321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2864),
+            id: DeclarationId(2865),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86369,7 +86405,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10326, 10333),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2865),
+            id: DeclarationId(2866),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86383,7 +86419,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10338, 10351),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2866),
+            id: DeclarationId(2867),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86402,7 +86438,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2867),
+            id: DeclarationId(2868),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86420,202 +86456,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             nominal_opacity: None,
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
-        declarations.push(Declaration {
-            id: DeclarationId(2868),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(137),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(138),
-                        value: DeclarationId(230),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(139),
-                        value: DeclarationId(230),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/actions.dag", 10614, 10633),
-        });
         declarations.push(Declaration {
             id: DeclarationId(2869),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2868),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 10614, 10634),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2870),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 10661, 10668),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2871),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 10690, 10697),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2872),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(93),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 10753, 10757),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2873),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(2866),
-                    },
-                    Field {
-                        label: "id".to_string(),
-                        ty: DeclarationId(2867),
-                    },
-                    Field {
-                        label: "run".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "shell".to_string(),
-                        ty: DeclarationId(1755),
-                    },
-                    Field {
-                        label: "env".to_string(),
-                        ty: DeclarationId(2869),
-                    },
-                    Field {
-                        label: "working_directory".to_string(),
-                        ty: DeclarationId(2870),
-                    },
-                    Field {
-                        label: "if_condition".to_string(),
-                        ty: DeclarationId(2871),
-                    },
-                    Field {
-                        label: "continue_on_error".to_string(),
-                        ty: DeclarationId(128),
-                    },
-                    Field {
-                        label: "timeout_minutes".to_string(),
-                        ty: DeclarationId(2872),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/actions.dag", 10510, 10763),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2874),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 10791, 10798),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2875),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 10810, 10817),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2876),
-            name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
                 arguments: vec![
@@ -86637,7 +86480,174 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10854, 10873),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10633),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2870),
+            name: None,
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(2869),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
+            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("dsl/extdeps/github/actions.dag", 10614, 10634),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2871),
+            name: None,
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
+            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("dsl/extdeps/github/actions.dag", 10661, 10668),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2872),
+            name: None,
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
+            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("dsl/extdeps/github/actions.dag", 10690, 10697),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2873),
+            name: None,
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(93),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
+            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("dsl/extdeps/github/actions.dag", 10753, 10757),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2874),
+            name: None,
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "name".to_string(),
+                        ty: DeclarationId(2867),
+                    },
+                    Field {
+                        label: "id".to_string(),
+                        ty: DeclarationId(2868),
+                    },
+                    Field {
+                        label: "run".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "shell".to_string(),
+                        ty: DeclarationId(1756),
+                    },
+                    Field {
+                        label: "env".to_string(),
+                        ty: DeclarationId(2870),
+                    },
+                    Field {
+                        label: "working_directory".to_string(),
+                        ty: DeclarationId(2871),
+                    },
+                    Field {
+                        label: "if_condition".to_string(),
+                        ty: DeclarationId(2872),
+                    },
+                    Field {
+                        label: "continue_on_error".to_string(),
+                        ty: DeclarationId(128),
+                    },
+                    Field {
+                        label: "timeout_minutes".to_string(),
+                        ty: DeclarationId(2873),
+                    },
+                ],
+            },
+            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("dsl/extdeps/github/actions.dag", 10510, 10763),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2875),
+            name: None,
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
+            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("dsl/extdeps/github/actions.dag", 10791, 10798),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2876),
+            name: None,
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
+            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("dsl/extdeps/github/actions.dag", 10810, 10817),
         });
         declarations.push(Declaration {
             id: DeclarationId(2877),
@@ -86663,14 +86673,40 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10886, 10905),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10854, 10873),
         });
         declarations.push(Declaration {
             id: DeclarationId(2878),
             name: None,
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(137),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(230),
+                    },
+                ],
+            },
+            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("dsl/extdeps/github/actions.dag", 10886, 10905),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2879),
+            name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2877),
+                    DeclarationId(2878),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -86685,7 +86721,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10886, 10906),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2879),
+            id: DeclarationId(2880),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86704,7 +86740,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10928, 10935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2880),
+            id: DeclarationId(2881),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86723,33 +86759,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10991, 10995),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2881),
+            id: DeclarationId(2882),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(2874),
+                        ty: DeclarationId(2875),
                     },
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(2875),
+                        ty: DeclarationId(2876),
                     },
                     Field {
                         label: "uses".to_string(),
-                        ty: DeclarationId(1756),
+                        ty: DeclarationId(1757),
                     },
                     Field {
                         label: "with".to_string(),
-                        ty: DeclarationId(2876),
+                        ty: DeclarationId(2877),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(2878),
+                        ty: DeclarationId(2879),
                     },
                     Field {
                         label: "if_condition".to_string(),
-                        ty: DeclarationId(2879),
+                        ty: DeclarationId(2880),
                     },
                     Field {
                         label: "continue_on_error".to_string(),
@@ -86757,7 +86793,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "timeout_minutes".to_string(),
-                        ty: DeclarationId(2880),
+                        ty: DeclarationId(2881),
                     },
                 ],
             },
@@ -86772,7 +86808,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10768, 11001),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2882),
+            id: DeclarationId(2883),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86786,7 +86822,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11020, 11024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2883),
+            id: DeclarationId(2884),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86800,7 +86836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11027, 11029),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2884),
+            id: DeclarationId(2885),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86814,7 +86850,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11032, 11036),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2885),
+            id: DeclarationId(2886),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86828,7 +86864,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11039, 11045),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2886),
+            id: DeclarationId(2887),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86842,7 +86878,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11048, 11051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2887),
+            id: DeclarationId(2888),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86861,7 +86897,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11414, 11421),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2888),
+            id: DeclarationId(2889),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86880,7 +86916,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11429, 11433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2889),
+            id: DeclarationId(2890),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86899,7 +86935,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11440, 11444),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2890),
+            id: DeclarationId(2891),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -86909,15 +86945,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "file".to_string(),
-                        ty: DeclarationId(2887),
+                        ty: DeclarationId(2888),
                     },
                     Field {
                         label: "line".to_string(),
-                        ty: DeclarationId(2888),
+                        ty: DeclarationId(2889),
                     },
                     Field {
                         label: "col".to_string(),
-                        ty: DeclarationId(2889),
+                        ty: DeclarationId(2890),
                     },
                 ],
             },
@@ -86932,7 +86968,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11373, 11446),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2891),
+            id: DeclarationId(2892),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86951,7 +86987,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11494, 11501),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2892),
+            id: DeclarationId(2893),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86970,7 +87006,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11509, 11513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2893),
+            id: DeclarationId(2894),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86989,7 +87025,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11520, 11524),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2894),
+            id: DeclarationId(2895),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -86999,15 +87035,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "file".to_string(),
-                        ty: DeclarationId(2891),
+                        ty: DeclarationId(2892),
                     },
                     Field {
                         label: "line".to_string(),
-                        ty: DeclarationId(2892),
+                        ty: DeclarationId(2893),
                     },
                     Field {
                         label: "col".to_string(),
-                        ty: DeclarationId(2893),
+                        ty: DeclarationId(2894),
                     },
                 ],
             },
@@ -87022,7 +87058,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11451, 11526),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2895),
+            id: DeclarationId(2896),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87041,7 +87077,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11573, 11580),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2896),
+            id: DeclarationId(2897),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87060,7 +87096,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11588, 11592),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2897),
+            id: DeclarationId(2898),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87079,7 +87115,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2898),
+            id: DeclarationId(2899),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -87089,15 +87125,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "file".to_string(),
-                        ty: DeclarationId(2895),
+                        ty: DeclarationId(2896),
                     },
                     Field {
                         label: "line".to_string(),
-                        ty: DeclarationId(2896),
+                        ty: DeclarationId(2897),
                     },
                     Field {
                         label: "col".to_string(),
-                        ty: DeclarationId(2897),
+                        ty: DeclarationId(2898),
                     },
                 ],
             },
@@ -87112,7 +87148,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11531, 11605),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2899),
+            id: DeclarationId(2900),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87131,7 +87167,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11610, 11643),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2900),
+            id: DeclarationId(2901),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87145,7 +87181,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11648, 11666),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2901),
+            id: DeclarationId(2902),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -87170,7 +87206,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11671, 11712),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2902),
+            id: DeclarationId(2903),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87189,7 +87225,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11717, 11742),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2903),
+            id: DeclarationId(2904),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87208,7 +87244,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11747, 11777),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2904),
+            id: DeclarationId(2905),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87227,7 +87263,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12583, 12587),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2905),
+            id: DeclarationId(2906),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -87241,11 +87277,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "retention_days".to_string(),
-                        ty: DeclarationId(2904),
+                        ty: DeclarationId(2905),
                     },
                     Field {
                         label: "if_no_files_found".to_string(),
-                        ty: DeclarationId(1767),
+                        ty: DeclarationId(1768),
                     },
                 ],
             },
@@ -87260,7 +87296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12530, 12630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2906),
+            id: DeclarationId(2907),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87279,7 +87315,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12666, 12673),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2907),
+            id: DeclarationId(2908),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -87289,7 +87325,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(2906),
+                        ty: DeclarationId(2907),
                     },
                 ],
             },
@@ -87304,7 +87340,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12635, 12675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2908),
+            id: DeclarationId(2909),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87318,7 +87354,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12705, 12709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2909),
+            id: DeclarationId(2910),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87332,7 +87368,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12712, 12720),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2910),
+            id: DeclarationId(2911),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87346,7 +87382,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12723, 12729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2911),
+            id: DeclarationId(2912),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -87366,7 +87402,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13191, 13203),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2912),
+            id: DeclarationId(2913),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -87377,7 +87413,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(139),
-                        value: DeclarationId(2911),
+                        value: DeclarationId(2912),
                     },
                 ],
             },
@@ -87392,7 +87428,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13179, 13204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2913),
+            id: DeclarationId(2914),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -87418,13 +87454,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13221, 13240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2914),
+            id: DeclarationId(2915),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2913),
+                    value: DeclarationId(2914),
                 }],
             },
             type_params: vec![],
@@ -87438,7 +87474,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13216, 13241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2915),
+            id: DeclarationId(2916),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -87464,13 +87500,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13258, 13277),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2916),
+            id: DeclarationId(2917),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2915),
+                    value: DeclarationId(2916),
                 }],
             },
             type_params: vec![],
@@ -87484,7 +87520,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13253, 13278),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2917),
+            id: DeclarationId(2918),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87503,7 +87539,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13313, 13317),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2918),
+            id: DeclarationId(2919),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87517,7 +87553,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13473, 13480),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2919),
+            id: DeclarationId(2920),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87531,7 +87567,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13485, 13492),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2920),
+            id: DeclarationId(2921),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87545,7 +87581,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13497, 13506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2921),
+            id: DeclarationId(2922),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87559,7 +87595,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13511, 13518),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2922),
+            id: DeclarationId(2923),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87573,7 +87609,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13523, 13531),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2923),
+            id: DeclarationId(2924),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87587,7 +87623,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13536, 13550),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2924),
+            id: DeclarationId(2925),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87601,7 +87637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1935, 1959),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2925),
+            id: DeclarationId(2926),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87615,7 +87651,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1964, 1989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2926),
+            id: DeclarationId(2927),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(151)],
@@ -87633,7 +87669,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2673, 2714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2927),
+            id: DeclarationId(2928),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87652,7 +87688,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2928),
+            id: DeclarationId(2929),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87666,17 +87702,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2929),
+            id: DeclarationId(2930),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2927),
+                        ty: DeclarationId(2928),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2928),
+                        ty: DeclarationId(2929),
                     },
                 ],
             },
@@ -87691,7 +87727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2930),
+            id: DeclarationId(2931),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87710,7 +87746,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2931),
+            id: DeclarationId(2932),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87724,17 +87760,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2932),
+            id: DeclarationId(2933),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2930),
+                        ty: DeclarationId(2931),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2931),
+                        ty: DeclarationId(2932),
                     },
                 ],
             },
@@ -87749,7 +87785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2933),
+            id: DeclarationId(2934),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87768,7 +87804,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2934),
+            id: DeclarationId(2935),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87782,17 +87818,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2935),
+            id: DeclarationId(2936),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2933),
+                        ty: DeclarationId(2934),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2934),
+                        ty: DeclarationId(2935),
                     },
                 ],
             },
@@ -87807,7 +87843,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2936),
+            id: DeclarationId(2937),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87826,7 +87862,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2937),
+            id: DeclarationId(2938),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87840,17 +87876,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2938),
+            id: DeclarationId(2939),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2936),
+                        ty: DeclarationId(2937),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2937),
+                        ty: DeclarationId(2938),
                     },
                 ],
             },
@@ -87865,7 +87901,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2939),
+            id: DeclarationId(2940),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87884,7 +87920,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2940),
+            id: DeclarationId(2941),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87898,17 +87934,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2941),
+            id: DeclarationId(2942),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2939),
+                        ty: DeclarationId(2940),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2940),
+                        ty: DeclarationId(2941),
                     },
                 ],
             },
@@ -87923,7 +87959,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2942),
+            id: DeclarationId(2943),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87942,7 +87978,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2943),
+            id: DeclarationId(2944),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87956,17 +87992,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2944),
+            id: DeclarationId(2945),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2942),
+                        ty: DeclarationId(2943),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2943),
+                        ty: DeclarationId(2944),
                     },
                 ],
             },
@@ -87981,7 +88017,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2945),
+            id: DeclarationId(2946),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88000,7 +88036,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2946),
+            id: DeclarationId(2947),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88014,17 +88050,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2947),
+            id: DeclarationId(2948),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2945),
+                        ty: DeclarationId(2946),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2946),
+                        ty: DeclarationId(2947),
                     },
                 ],
             },
@@ -88039,7 +88075,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2948),
+            id: DeclarationId(2949),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88058,7 +88094,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 3781, 3785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2949),
+            id: DeclarationId(2950),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88072,17 +88108,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 3781, 3785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2950),
+            id: DeclarationId(2951),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2948),
+                        ty: DeclarationId(2949),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2949),
+                        ty: DeclarationId(2950),
                     },
                 ],
             },
@@ -88097,7 +88133,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 3781, 3785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2951),
+            id: DeclarationId(2952),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88116,7 +88152,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 4264, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2952),
+            id: DeclarationId(2953),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88130,17 +88166,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 4264, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2953),
+            id: DeclarationId(2954),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2951),
+                        ty: DeclarationId(2952),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2952),
+                        ty: DeclarationId(2953),
                     },
                 ],
             },
@@ -88155,7 +88191,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 4264, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2954),
+            id: DeclarationId(2955),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88174,7 +88210,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 6172, 6179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2955),
+            id: DeclarationId(2956),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88188,17 +88224,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 6172, 6179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2956),
+            id: DeclarationId(2957),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2954),
+                        ty: DeclarationId(2955),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2955),
+                        ty: DeclarationId(2956),
                     },
                 ],
             },
@@ -88213,7 +88249,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 6172, 6179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2957),
+            id: DeclarationId(2958),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88232,7 +88268,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16964, 16984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2958),
+            id: DeclarationId(2959),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88246,17 +88282,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16964, 16984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2959),
+            id: DeclarationId(2960),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2957),
+                        ty: DeclarationId(2958),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2958),
+                        ty: DeclarationId(2959),
                     },
                 ],
             },
@@ -88271,7 +88307,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16964, 16984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2960),
+            id: DeclarationId(2961),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88290,7 +88326,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17620, 17627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2961),
+            id: DeclarationId(2962),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88304,17 +88340,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17620, 17627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2962),
+            id: DeclarationId(2963),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2960),
+                        ty: DeclarationId(2961),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2961),
+                        ty: DeclarationId(2962),
                     },
                 ],
             },
@@ -88329,7 +88365,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17620, 17627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2963),
+            id: DeclarationId(2964),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88348,7 +88384,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21380, 21390),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2964),
+            id: DeclarationId(2965),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88362,17 +88398,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21380, 21390),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2965),
+            id: DeclarationId(2966),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2963),
+                        ty: DeclarationId(2964),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2964),
+                        ty: DeclarationId(2965),
                     },
                 ],
             },
@@ -88387,7 +88423,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21380, 21390),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2966),
+            id: DeclarationId(2967),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88406,7 +88442,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21515, 21522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2967),
+            id: DeclarationId(2968),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88420,17 +88456,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21515, 21522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2968),
+            id: DeclarationId(2969),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2966),
+                        ty: DeclarationId(2967),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2967),
+                        ty: DeclarationId(2968),
                     },
                 ],
             },
@@ -88445,7 +88481,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21515, 21522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2969),
+            id: DeclarationId(2970),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88464,7 +88500,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21589, 21593),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2970),
+            id: DeclarationId(2971),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88478,17 +88514,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21589, 21593),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2971),
+            id: DeclarationId(2972),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2969),
+                        ty: DeclarationId(2970),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2970),
+                        ty: DeclarationId(2971),
                     },
                 ],
             },
@@ -88503,7 +88539,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21589, 21593),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2972),
+            id: DeclarationId(2973),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88522,7 +88558,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23360, 23367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2973),
+            id: DeclarationId(2974),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88536,17 +88572,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23360, 23367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2974),
+            id: DeclarationId(2975),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2972),
+                        ty: DeclarationId(2973),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2973),
+                        ty: DeclarationId(2974),
                     },
                 ],
             },
@@ -88561,7 +88597,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23360, 23367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2975),
+            id: DeclarationId(2976),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88580,7 +88616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23872, 23879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2976),
+            id: DeclarationId(2977),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88594,17 +88630,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23872, 23879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2977),
+            id: DeclarationId(2978),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2975),
+                        ty: DeclarationId(2976),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2976),
+                        ty: DeclarationId(2977),
                     },
                 ],
             },
@@ -88619,7 +88655,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23872, 23879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2978),
+            id: DeclarationId(2979),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88638,7 +88674,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23966, 23973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2979),
+            id: DeclarationId(2980),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88652,17 +88688,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23966, 23973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2980),
+            id: DeclarationId(2981),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2978),
+                        ty: DeclarationId(2979),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2979),
+                        ty: DeclarationId(2980),
                     },
                 ],
             },
@@ -88677,7 +88713,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23966, 23973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2981),
+            id: DeclarationId(2982),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88696,7 +88732,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24196, 24211),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2982),
+            id: DeclarationId(2983),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88710,17 +88746,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24196, 24211),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2983),
+            id: DeclarationId(2984),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2981),
+                        ty: DeclarationId(2982),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2982),
+                        ty: DeclarationId(2983),
                     },
                 ],
             },
@@ -88735,7 +88771,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24196, 24211),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2984),
+            id: DeclarationId(2985),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88754,7 +88790,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24222, 24235),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2985),
+            id: DeclarationId(2986),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88768,17 +88804,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24222, 24235),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2986),
+            id: DeclarationId(2987),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2984),
+                        ty: DeclarationId(2985),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2985),
+                        ty: DeclarationId(2986),
                     },
                 ],
             },
@@ -88793,7 +88829,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24222, 24235),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2987),
+            id: DeclarationId(2988),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88812,7 +88848,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24251, 24264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2988),
+            id: DeclarationId(2989),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88826,17 +88862,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24251, 24264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2989),
+            id: DeclarationId(2990),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2987),
+                        ty: DeclarationId(2988),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2988),
+                        ty: DeclarationId(2989),
                     },
                 ],
             },
@@ -88851,7 +88887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24251, 24264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2990),
+            id: DeclarationId(2991),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88870,7 +88906,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24374, 24381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2991),
+            id: DeclarationId(2992),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88884,17 +88920,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24374, 24381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2992),
+            id: DeclarationId(2993),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2990),
+                        ty: DeclarationId(2991),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2991),
+                        ty: DeclarationId(2992),
                     },
                 ],
             },
@@ -88909,7 +88945,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24374, 24381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2993),
+            id: DeclarationId(2994),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88928,7 +88964,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2994),
+            id: DeclarationId(2995),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88942,17 +88978,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2995),
+            id: DeclarationId(2996),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2993),
+                        ty: DeclarationId(2994),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2994),
+                        ty: DeclarationId(2995),
                     },
                 ],
             },
@@ -88967,12 +89003,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2996),
+            id: DeclarationId(2997),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1821),
+                    ty: DeclarationId(1822),
                 }],
             },
             type_params: vec![],
@@ -88986,7 +89022,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2997),
+            id: DeclarationId(2998),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89000,17 +89036,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2998),
+            id: DeclarationId(2999),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2996),
+                        ty: DeclarationId(2997),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2997),
+                        ty: DeclarationId(2998),
                     },
                 ],
             },
@@ -89025,12 +89061,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2999),
+            id: DeclarationId(3000),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1824),
+                    ty: DeclarationId(1825),
                 }],
             },
             type_params: vec![],
@@ -89044,7 +89080,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3000),
+            id: DeclarationId(3001),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89058,17 +89094,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3001),
+            id: DeclarationId(3002),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2999),
+                        ty: DeclarationId(3000),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3000),
+                        ty: DeclarationId(3001),
                     },
                 ],
             },
@@ -89083,7 +89119,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3002),
+            id: DeclarationId(3003),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89102,7 +89138,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3003),
+            id: DeclarationId(3004),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89116,17 +89152,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3004),
+            id: DeclarationId(3005),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3002),
+                        ty: DeclarationId(3003),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3003),
+                        ty: DeclarationId(3004),
                     },
                 ],
             },
@@ -89141,7 +89177,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3005),
+            id: DeclarationId(3006),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89160,7 +89196,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3006),
+            id: DeclarationId(3007),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89174,17 +89210,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3007),
+            id: DeclarationId(3008),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3005),
+                        ty: DeclarationId(3006),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3006),
+                        ty: DeclarationId(3007),
                     },
                 ],
             },
@@ -89199,7 +89235,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3008),
+            id: DeclarationId(3009),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89218,7 +89254,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3009),
+            id: DeclarationId(3010),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89232,17 +89268,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3010),
+            id: DeclarationId(3011),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3008),
+                        ty: DeclarationId(3009),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3009),
+                        ty: DeclarationId(3010),
                     },
                 ],
             },
@@ -89257,7 +89293,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3011),
+            id: DeclarationId(3012),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89276,7 +89312,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3012),
+            id: DeclarationId(3013),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89290,17 +89326,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3013),
+            id: DeclarationId(3014),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3011),
+                        ty: DeclarationId(3012),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3012),
+                        ty: DeclarationId(3013),
                     },
                 ],
             },
@@ -89315,7 +89351,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3014),
+            id: DeclarationId(3015),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89334,7 +89370,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3015),
+            id: DeclarationId(3016),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89348,17 +89384,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3016),
+            id: DeclarationId(3017),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3014),
+                        ty: DeclarationId(3015),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3015),
+                        ty: DeclarationId(3016),
                     },
                 ],
             },
@@ -89373,7 +89409,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3017),
+            id: DeclarationId(3018),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89392,7 +89428,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3018),
+            id: DeclarationId(3019),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89406,17 +89442,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3019),
+            id: DeclarationId(3020),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3017),
+                        ty: DeclarationId(3018),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3018),
+                        ty: DeclarationId(3019),
                     },
                 ],
             },
@@ -89431,7 +89467,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3020),
+            id: DeclarationId(3021),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89450,7 +89486,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3021),
+            id: DeclarationId(3022),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89464,17 +89500,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3022),
+            id: DeclarationId(3023),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3020),
+                        ty: DeclarationId(3021),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3021),
+                        ty: DeclarationId(3022),
                     },
                 ],
             },
@@ -89489,7 +89525,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3023),
+            id: DeclarationId(3024),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89508,7 +89544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3024),
+            id: DeclarationId(3025),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89522,17 +89558,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3025),
+            id: DeclarationId(3026),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3023),
+                        ty: DeclarationId(3024),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3024),
+                        ty: DeclarationId(3025),
                     },
                 ],
             },
@@ -89547,7 +89583,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3026),
+            id: DeclarationId(3027),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89566,7 +89602,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3027),
+            id: DeclarationId(3028),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89580,17 +89616,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3028),
+            id: DeclarationId(3029),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3026),
+                        ty: DeclarationId(3027),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3027),
+                        ty: DeclarationId(3028),
                     },
                 ],
             },
@@ -89605,7 +89641,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3029),
+            id: DeclarationId(3030),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89624,7 +89660,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3030),
+            id: DeclarationId(3031),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89638,17 +89674,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3031),
+            id: DeclarationId(3032),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3029),
+                        ty: DeclarationId(3030),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3030),
+                        ty: DeclarationId(3031),
                     },
                 ],
             },
@@ -89663,7 +89699,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3032),
+            id: DeclarationId(3033),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89682,7 +89718,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3033),
+            id: DeclarationId(3034),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89696,17 +89732,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3034),
+            id: DeclarationId(3035),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3032),
+                        ty: DeclarationId(3033),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3033),
+                        ty: DeclarationId(3034),
                     },
                 ],
             },
@@ -89721,7 +89757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3035),
+            id: DeclarationId(3036),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89740,7 +89776,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3036),
+            id: DeclarationId(3037),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89754,17 +89790,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3037),
+            id: DeclarationId(3038),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3035),
+                        ty: DeclarationId(3036),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3036),
+                        ty: DeclarationId(3037),
                     },
                 ],
             },
@@ -89779,7 +89815,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3038),
+            id: DeclarationId(3039),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89798,7 +89834,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3039),
+            id: DeclarationId(3040),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89812,17 +89848,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3040),
+            id: DeclarationId(3041),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3038),
+                        ty: DeclarationId(3039),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3039),
+                        ty: DeclarationId(3040),
                     },
                 ],
             },
@@ -89837,7 +89873,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3041),
+            id: DeclarationId(3042),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89856,7 +89892,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3042),
+            id: DeclarationId(3043),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89870,17 +89906,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3043),
+            id: DeclarationId(3044),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3041),
+                        ty: DeclarationId(3042),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3042),
+                        ty: DeclarationId(3043),
                     },
                 ],
             },
@@ -89895,7 +89931,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3044),
+            id: DeclarationId(3045),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89914,7 +89950,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3045),
+            id: DeclarationId(3046),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89928,17 +89964,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3046),
+            id: DeclarationId(3047),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3044),
+                        ty: DeclarationId(3045),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3045),
+                        ty: DeclarationId(3046),
                     },
                 ],
             },
@@ -89953,7 +89989,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3047),
+            id: DeclarationId(3048),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89972,7 +90008,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3048),
+            id: DeclarationId(3049),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89986,17 +90022,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3049),
+            id: DeclarationId(3050),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3047),
+                        ty: DeclarationId(3048),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3048),
+                        ty: DeclarationId(3049),
                     },
                 ],
             },
@@ -90011,7 +90047,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3050),
+            id: DeclarationId(3051),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90030,7 +90066,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3051),
+            id: DeclarationId(3052),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90044,17 +90080,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3052),
+            id: DeclarationId(3053),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3050),
+                        ty: DeclarationId(3051),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3051),
+                        ty: DeclarationId(3052),
                     },
                 ],
             },
@@ -90069,7 +90105,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3053),
+            id: DeclarationId(3054),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90088,7 +90124,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3054),
+            id: DeclarationId(3055),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90102,17 +90138,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3055),
+            id: DeclarationId(3056),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3053),
+                        ty: DeclarationId(3054),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3054),
+                        ty: DeclarationId(3055),
                     },
                 ],
             },
@@ -90127,7 +90163,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3056),
+            id: DeclarationId(3057),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90146,7 +90182,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3057),
+            id: DeclarationId(3058),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90160,17 +90196,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3058),
+            id: DeclarationId(3059),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3056),
+                        ty: DeclarationId(3057),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3057),
+                        ty: DeclarationId(3058),
                     },
                 ],
             },
@@ -90185,7 +90221,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3059),
+            id: DeclarationId(3060),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90204,7 +90240,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3060),
+            id: DeclarationId(3061),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90218,17 +90254,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3061),
+            id: DeclarationId(3062),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3059),
+                        ty: DeclarationId(3060),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3060),
+                        ty: DeclarationId(3061),
                     },
                 ],
             },
@@ -90243,7 +90279,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3062),
+            id: DeclarationId(3063),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90262,7 +90298,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3063),
+            id: DeclarationId(3064),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90276,17 +90312,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3064),
+            id: DeclarationId(3065),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3062),
+                        ty: DeclarationId(3063),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3063),
+                        ty: DeclarationId(3064),
                     },
                 ],
             },
@@ -90301,7 +90337,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3065),
+            id: DeclarationId(3066),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90320,7 +90356,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3066),
+            id: DeclarationId(3067),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90334,17 +90370,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3067),
+            id: DeclarationId(3068),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3065),
+                        ty: DeclarationId(3066),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3066),
+                        ty: DeclarationId(3067),
                     },
                 ],
             },
@@ -90359,7 +90395,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3068),
+            id: DeclarationId(3069),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90378,7 +90414,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3069),
+            id: DeclarationId(3070),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90392,17 +90428,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3070),
+            id: DeclarationId(3071),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3068),
+                        ty: DeclarationId(3069),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3069),
+                        ty: DeclarationId(3070),
                     },
                 ],
             },
@@ -90417,7 +90453,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3071),
+            id: DeclarationId(3072),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90436,7 +90472,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3072),
+            id: DeclarationId(3073),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90450,17 +90486,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3073),
+            id: DeclarationId(3074),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3071),
+                        ty: DeclarationId(3072),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3072),
+                        ty: DeclarationId(3073),
                     },
                 ],
             },
@@ -90475,7 +90511,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3074),
+            id: DeclarationId(3075),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90494,7 +90530,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3075),
+            id: DeclarationId(3076),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90508,17 +90544,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3076),
+            id: DeclarationId(3077),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3074),
+                        ty: DeclarationId(3075),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3075),
+                        ty: DeclarationId(3076),
                     },
                 ],
             },
@@ -90533,7 +90569,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3077),
+            id: DeclarationId(3078),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90552,7 +90588,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3078),
+            id: DeclarationId(3079),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90566,17 +90602,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3079),
+            id: DeclarationId(3080),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3077),
+                        ty: DeclarationId(3078),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3078),
+                        ty: DeclarationId(3079),
                     },
                 ],
             },
@@ -90591,7 +90627,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3080),
+            id: DeclarationId(3081),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90610,7 +90646,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3081),
+            id: DeclarationId(3082),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90624,17 +90660,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3082),
+            id: DeclarationId(3083),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3080),
+                        ty: DeclarationId(3081),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3081),
+                        ty: DeclarationId(3082),
                     },
                 ],
             },
@@ -90649,7 +90685,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3083),
+            id: DeclarationId(3084),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90668,7 +90704,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3084),
+            id: DeclarationId(3085),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90682,17 +90718,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3085),
+            id: DeclarationId(3086),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3083),
+                        ty: DeclarationId(3084),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3084),
+                        ty: DeclarationId(3085),
                     },
                 ],
             },
@@ -90707,7 +90743,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3086),
+            id: DeclarationId(3087),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90726,7 +90762,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3087),
+            id: DeclarationId(3088),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90740,17 +90776,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3088),
+            id: DeclarationId(3089),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3086),
+                        ty: DeclarationId(3087),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3087),
+                        ty: DeclarationId(3088),
                     },
                 ],
             },
@@ -90765,7 +90801,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3089),
+            id: DeclarationId(3090),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90784,7 +90820,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3090),
+            id: DeclarationId(3091),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90798,17 +90834,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3091),
+            id: DeclarationId(3092),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3089),
+                        ty: DeclarationId(3090),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3090),
+                        ty: DeclarationId(3091),
                     },
                 ],
             },
@@ -90823,7 +90859,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3092),
+            id: DeclarationId(3093),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90842,7 +90878,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3093),
+            id: DeclarationId(3094),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90856,17 +90892,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3094),
+            id: DeclarationId(3095),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3092),
+                        ty: DeclarationId(3093),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3093),
+                        ty: DeclarationId(3094),
                     },
                 ],
             },
@@ -90881,7 +90917,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3095),
+            id: DeclarationId(3096),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90900,7 +90936,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3096),
+            id: DeclarationId(3097),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90914,17 +90950,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3097),
+            id: DeclarationId(3098),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3095),
+                        ty: DeclarationId(3096),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3096),
+                        ty: DeclarationId(3097),
                     },
                 ],
             },
@@ -90939,7 +90975,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3098),
+            id: DeclarationId(3099),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90958,7 +90994,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3099),
+            id: DeclarationId(3100),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90972,17 +91008,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3100),
+            id: DeclarationId(3101),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3098),
+                        ty: DeclarationId(3099),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3099),
+                        ty: DeclarationId(3100),
                     },
                 ],
             },
@@ -90997,7 +91033,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3101),
+            id: DeclarationId(3102),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91016,7 +91052,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3102),
+            id: DeclarationId(3103),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91030,17 +91066,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3103),
+            id: DeclarationId(3104),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3101),
+                        ty: DeclarationId(3102),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3102),
+                        ty: DeclarationId(3103),
                     },
                 ],
             },
@@ -91055,7 +91091,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3104),
+            id: DeclarationId(3105),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91074,7 +91110,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3105),
+            id: DeclarationId(3106),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91088,17 +91124,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3106),
+            id: DeclarationId(3107),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3104),
+                        ty: DeclarationId(3105),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3105),
+                        ty: DeclarationId(3106),
                     },
                 ],
             },
@@ -91113,7 +91149,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3107),
+            id: DeclarationId(3108),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91132,7 +91168,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3108),
+            id: DeclarationId(3109),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91146,17 +91182,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3109),
+            id: DeclarationId(3110),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3107),
+                        ty: DeclarationId(3108),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3108),
+                        ty: DeclarationId(3109),
                     },
                 ],
             },
@@ -91171,7 +91207,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3110),
+            id: DeclarationId(3111),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91190,7 +91226,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3111),
+            id: DeclarationId(3112),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91204,17 +91240,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3112),
+            id: DeclarationId(3113),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3110),
+                        ty: DeclarationId(3111),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3111),
+                        ty: DeclarationId(3112),
                     },
                 ],
             },
@@ -91229,7 +91265,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3113),
+            id: DeclarationId(3114),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91248,7 +91284,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3114),
+            id: DeclarationId(3115),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91262,17 +91298,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3115),
+            id: DeclarationId(3116),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3113),
+                        ty: DeclarationId(3114),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3114),
+                        ty: DeclarationId(3115),
                     },
                 ],
             },
@@ -91287,12 +91323,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3116),
+            id: DeclarationId(3117),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2139),
+                    ty: DeclarationId(2140),
                 }],
             },
             type_params: vec![],
@@ -91306,7 +91342,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3117),
+            id: DeclarationId(3118),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91320,17 +91356,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3118),
+            id: DeclarationId(3119),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3116),
+                        ty: DeclarationId(3117),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3117),
+                        ty: DeclarationId(3118),
                     },
                 ],
             },
@@ -91345,7 +91381,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3119),
+            id: DeclarationId(3120),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91364,7 +91400,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3120),
+            id: DeclarationId(3121),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91378,17 +91414,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3121),
+            id: DeclarationId(3122),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3119),
+                        ty: DeclarationId(3120),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3120),
+                        ty: DeclarationId(3121),
                     },
                 ],
             },
@@ -91403,7 +91439,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3122),
+            id: DeclarationId(3123),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91422,7 +91458,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3123),
+            id: DeclarationId(3124),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91436,17 +91472,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3124),
+            id: DeclarationId(3125),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3122),
+                        ty: DeclarationId(3123),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3123),
+                        ty: DeclarationId(3124),
                     },
                 ],
             },
@@ -91461,7 +91497,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3125),
+            id: DeclarationId(3126),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91480,7 +91516,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3126),
+            id: DeclarationId(3127),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91494,17 +91530,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3127),
+            id: DeclarationId(3128),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3125),
+                        ty: DeclarationId(3126),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3126),
+                        ty: DeclarationId(3127),
                     },
                 ],
             },
@@ -91519,7 +91555,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3128),
+            id: DeclarationId(3129),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91538,7 +91574,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3129),
+            id: DeclarationId(3130),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91552,17 +91588,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3130),
+            id: DeclarationId(3131),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3128),
+                        ty: DeclarationId(3129),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3129),
+                        ty: DeclarationId(3130),
                     },
                 ],
             },
@@ -91577,7 +91613,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3131),
+            id: DeclarationId(3132),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91596,7 +91632,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3132),
+            id: DeclarationId(3133),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91610,17 +91646,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3133),
+            id: DeclarationId(3134),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3131),
+                        ty: DeclarationId(3132),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3132),
+                        ty: DeclarationId(3133),
                     },
                 ],
             },
@@ -91635,7 +91671,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3134),
+            id: DeclarationId(3135),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91654,7 +91690,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3135),
+            id: DeclarationId(3136),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91668,17 +91704,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3136),
+            id: DeclarationId(3137),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3134),
+                        ty: DeclarationId(3135),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3135),
+                        ty: DeclarationId(3136),
                     },
                 ],
             },
@@ -91693,7 +91729,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3137),
+            id: DeclarationId(3138),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91712,7 +91748,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3138),
+            id: DeclarationId(3139),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91726,17 +91762,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3139),
+            id: DeclarationId(3140),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3137),
+                        ty: DeclarationId(3138),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3138),
+                        ty: DeclarationId(3139),
                     },
                 ],
             },
@@ -91751,7 +91787,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3140),
+            id: DeclarationId(3141),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91770,7 +91806,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3141),
+            id: DeclarationId(3142),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91784,17 +91820,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3142),
+            id: DeclarationId(3143),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3140),
+                        ty: DeclarationId(3141),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3141),
+                        ty: DeclarationId(3142),
                     },
                 ],
             },
@@ -91809,7 +91845,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3143),
+            id: DeclarationId(3144),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91828,7 +91864,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3144),
+            id: DeclarationId(3145),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91842,17 +91878,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3145),
+            id: DeclarationId(3146),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3143),
+                        ty: DeclarationId(3144),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3144),
+                        ty: DeclarationId(3145),
                     },
                 ],
             },
@@ -91867,7 +91903,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3146),
+            id: DeclarationId(3147),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91886,7 +91922,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3147),
+            id: DeclarationId(3148),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91900,17 +91936,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3148),
+            id: DeclarationId(3149),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3146),
+                        ty: DeclarationId(3147),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3147),
+                        ty: DeclarationId(3148),
                     },
                 ],
             },
@@ -91925,7 +91961,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3149),
+            id: DeclarationId(3150),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91944,7 +91980,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3150),
+            id: DeclarationId(3151),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91958,17 +91994,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3151),
+            id: DeclarationId(3152),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3149),
+                        ty: DeclarationId(3150),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3150),
+                        ty: DeclarationId(3151),
                     },
                 ],
             },
@@ -91983,7 +92019,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3152),
+            id: DeclarationId(3153),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92002,7 +92038,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3153),
+            id: DeclarationId(3154),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92016,17 +92052,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3154),
+            id: DeclarationId(3155),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3152),
+                        ty: DeclarationId(3153),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3153),
+                        ty: DeclarationId(3154),
                     },
                 ],
             },
@@ -92041,7 +92077,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3155),
+            id: DeclarationId(3156),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92060,7 +92096,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3156),
+            id: DeclarationId(3157),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92074,17 +92110,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3157),
+            id: DeclarationId(3158),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3155),
+                        ty: DeclarationId(3156),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3156),
+                        ty: DeclarationId(3157),
                     },
                 ],
             },
@@ -92099,7 +92135,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3158),
+            id: DeclarationId(3159),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92118,7 +92154,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3159),
+            id: DeclarationId(3160),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92132,17 +92168,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3160),
+            id: DeclarationId(3161),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3158),
+                        ty: DeclarationId(3159),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3159),
+                        ty: DeclarationId(3160),
                     },
                 ],
             },
@@ -92157,7 +92193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3161),
+            id: DeclarationId(3162),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92176,7 +92212,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3162),
+            id: DeclarationId(3163),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92190,17 +92226,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3163),
+            id: DeclarationId(3164),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3161),
+                        ty: DeclarationId(3162),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3162),
+                        ty: DeclarationId(3163),
                     },
                 ],
             },
@@ -92215,7 +92251,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3164),
+            id: DeclarationId(3165),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92234,7 +92270,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3165),
+            id: DeclarationId(3166),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92248,17 +92284,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3166),
+            id: DeclarationId(3167),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3164),
+                        ty: DeclarationId(3165),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3165),
+                        ty: DeclarationId(3166),
                     },
                 ],
             },
@@ -92273,7 +92309,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3167),
+            id: DeclarationId(3168),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92292,7 +92328,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3168),
+            id: DeclarationId(3169),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92306,17 +92342,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3169),
+            id: DeclarationId(3170),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3167),
+                        ty: DeclarationId(3168),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3168),
+                        ty: DeclarationId(3169),
                     },
                 ],
             },
@@ -92331,7 +92367,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3170),
+            id: DeclarationId(3171),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92350,7 +92386,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3171),
+            id: DeclarationId(3172),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92364,17 +92400,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3172),
+            id: DeclarationId(3173),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3170),
+                        ty: DeclarationId(3171),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3171),
+                        ty: DeclarationId(3172),
                     },
                 ],
             },
@@ -92389,7 +92425,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3173),
+            id: DeclarationId(3174),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92408,7 +92444,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3174),
+            id: DeclarationId(3175),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92422,17 +92458,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3175),
+            id: DeclarationId(3176),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3173),
+                        ty: DeclarationId(3174),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3174),
+                        ty: DeclarationId(3175),
                     },
                 ],
             },
@@ -92447,7 +92483,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3176),
+            id: DeclarationId(3177),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92466,7 +92502,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3177),
+            id: DeclarationId(3178),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92480,17 +92516,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3178),
+            id: DeclarationId(3179),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3176),
+                        ty: DeclarationId(3177),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3177),
+                        ty: DeclarationId(3178),
                     },
                 ],
             },
@@ -92505,7 +92541,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3179),
+            id: DeclarationId(3180),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92524,7 +92560,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3180),
+            id: DeclarationId(3181),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92538,17 +92574,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3181),
+            id: DeclarationId(3182),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3179),
+                        ty: DeclarationId(3180),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3180),
+                        ty: DeclarationId(3181),
                     },
                 ],
             },
@@ -92563,7 +92599,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3182),
+            id: DeclarationId(3183),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92582,7 +92618,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3183),
+            id: DeclarationId(3184),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92596,17 +92632,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3184),
+            id: DeclarationId(3185),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3182),
+                        ty: DeclarationId(3183),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3183),
+                        ty: DeclarationId(3184),
                     },
                 ],
             },
@@ -92621,7 +92657,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3185),
+            id: DeclarationId(3186),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92640,7 +92676,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3186),
+            id: DeclarationId(3187),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92654,17 +92690,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3187),
+            id: DeclarationId(3188),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3185),
+                        ty: DeclarationId(3186),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3186),
+                        ty: DeclarationId(3187),
                     },
                 ],
             },
@@ -92679,7 +92715,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3188),
+            id: DeclarationId(3189),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92698,7 +92734,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3189),
+            id: DeclarationId(3190),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92712,17 +92748,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3190),
+            id: DeclarationId(3191),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3188),
+                        ty: DeclarationId(3189),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3189),
+                        ty: DeclarationId(3190),
                     },
                 ],
             },
@@ -92737,7 +92773,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3191),
+            id: DeclarationId(3192),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92756,7 +92792,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3192),
+            id: DeclarationId(3193),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92770,17 +92806,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3193),
+            id: DeclarationId(3194),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3191),
+                        ty: DeclarationId(3192),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3192),
+                        ty: DeclarationId(3193),
                     },
                 ],
             },
@@ -92795,7 +92831,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3194),
+            id: DeclarationId(3195),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92814,7 +92850,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3195),
+            id: DeclarationId(3196),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92828,17 +92864,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3196),
+            id: DeclarationId(3197),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3194),
+                        ty: DeclarationId(3195),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3195),
+                        ty: DeclarationId(3196),
                     },
                 ],
             },
@@ -92853,7 +92889,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3197),
+            id: DeclarationId(3198),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92872,7 +92908,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3198),
+            id: DeclarationId(3199),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92886,17 +92922,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3199),
+            id: DeclarationId(3200),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3197),
+                        ty: DeclarationId(3198),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3198),
+                        ty: DeclarationId(3199),
                     },
                 ],
             },
@@ -92911,7 +92947,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3200),
+            id: DeclarationId(3201),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92930,7 +92966,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3201),
+            id: DeclarationId(3202),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92944,17 +92980,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3202),
+            id: DeclarationId(3203),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3200),
+                        ty: DeclarationId(3201),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3201),
+                        ty: DeclarationId(3202),
                     },
                 ],
             },
@@ -92969,7 +93005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3203),
+            id: DeclarationId(3204),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92988,7 +93024,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3204),
+            id: DeclarationId(3205),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93002,17 +93038,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3205),
+            id: DeclarationId(3206),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3203),
+                        ty: DeclarationId(3204),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3204),
+                        ty: DeclarationId(3205),
                     },
                 ],
             },
@@ -93027,7 +93063,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3206),
+            id: DeclarationId(3207),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93046,7 +93082,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3207),
+            id: DeclarationId(3208),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93060,17 +93096,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3208),
+            id: DeclarationId(3209),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3206),
+                        ty: DeclarationId(3207),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3207),
+                        ty: DeclarationId(3208),
                     },
                 ],
             },
@@ -93085,7 +93121,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3209),
+            id: DeclarationId(3210),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93104,7 +93140,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3210),
+            id: DeclarationId(3211),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93118,17 +93154,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3211),
+            id: DeclarationId(3212),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3209),
+                        ty: DeclarationId(3210),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3210),
+                        ty: DeclarationId(3211),
                     },
                 ],
             },
@@ -93143,7 +93179,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3212),
+            id: DeclarationId(3213),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93162,7 +93198,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3213),
+            id: DeclarationId(3214),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93176,17 +93212,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3214),
+            id: DeclarationId(3215),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3212),
+                        ty: DeclarationId(3213),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3213),
+                        ty: DeclarationId(3214),
                     },
                 ],
             },
@@ -93201,7 +93237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3215),
+            id: DeclarationId(3216),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93220,7 +93256,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3216),
+            id: DeclarationId(3217),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93234,17 +93270,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3217),
+            id: DeclarationId(3218),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3215),
+                        ty: DeclarationId(3216),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3216),
+                        ty: DeclarationId(3217),
                     },
                 ],
             },
@@ -93259,7 +93295,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3218),
+            id: DeclarationId(3219),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93278,7 +93314,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3219),
+            id: DeclarationId(3220),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93292,17 +93328,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3220),
+            id: DeclarationId(3221),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3218),
+                        ty: DeclarationId(3219),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3219),
+                        ty: DeclarationId(3220),
                     },
                 ],
             },
@@ -93317,7 +93353,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3221),
+            id: DeclarationId(3222),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93336,7 +93372,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3222),
+            id: DeclarationId(3223),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93350,17 +93386,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3223),
+            id: DeclarationId(3224),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3221),
+                        ty: DeclarationId(3222),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3222),
+                        ty: DeclarationId(3223),
                     },
                 ],
             },
@@ -93375,7 +93411,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3224),
+            id: DeclarationId(3225),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93394,7 +93430,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3225),
+            id: DeclarationId(3226),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93408,17 +93444,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3226),
+            id: DeclarationId(3227),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3224),
+                        ty: DeclarationId(3225),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3225),
+                        ty: DeclarationId(3226),
                     },
                 ],
             },
@@ -93433,12 +93469,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3227),
+            id: DeclarationId(3228),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1751),
+                    ty: DeclarationId(1752),
                 }],
             },
             type_params: vec![],
@@ -93452,7 +93488,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3228),
+            id: DeclarationId(3229),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93466,17 +93502,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3229),
+            id: DeclarationId(3230),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3227),
+                        ty: DeclarationId(3228),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3228),
+                        ty: DeclarationId(3229),
                     },
                 ],
             },
@@ -93491,12 +93527,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3230),
+            id: DeclarationId(3231),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2804),
+                    ty: DeclarationId(2805),
                 }],
             },
             type_params: vec![],
@@ -93510,7 +93546,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3231),
+            id: DeclarationId(3232),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93524,17 +93560,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3232),
+            id: DeclarationId(3233),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3230),
+                        ty: DeclarationId(3231),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3231),
+                        ty: DeclarationId(3232),
                     },
                 ],
             },
@@ -93549,12 +93585,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3233),
+            id: DeclarationId(3234),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1740),
+                    ty: DeclarationId(1741),
                 }],
             },
             type_params: vec![],
@@ -93568,7 +93604,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3234),
+            id: DeclarationId(3235),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93582,17 +93618,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3235),
+            id: DeclarationId(3236),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3233),
+                        ty: DeclarationId(3234),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3234),
+                        ty: DeclarationId(3235),
                     },
                 ],
             },
@@ -93607,7 +93643,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3236),
+            id: DeclarationId(3237),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93626,7 +93662,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3237),
+            id: DeclarationId(3238),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93640,17 +93676,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3238),
+            id: DeclarationId(3239),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3236),
+                        ty: DeclarationId(3237),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3237),
+                        ty: DeclarationId(3238),
                     },
                 ],
             },
@@ -93665,7 +93701,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3239),
+            id: DeclarationId(3240),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93684,7 +93720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3240),
+            id: DeclarationId(3241),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93698,17 +93734,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3241),
+            id: DeclarationId(3242),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3239),
+                        ty: DeclarationId(3240),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3240),
+                        ty: DeclarationId(3241),
                     },
                 ],
             },
@@ -93723,7 +93759,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3242),
+            id: DeclarationId(3243),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93742,7 +93778,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3243),
+            id: DeclarationId(3244),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93756,17 +93792,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3244),
+            id: DeclarationId(3245),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3242),
+                        ty: DeclarationId(3243),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3243),
+                        ty: DeclarationId(3244),
                     },
                 ],
             },
@@ -93781,12 +93817,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3245),
+            id: DeclarationId(3246),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2838),
+                    ty: DeclarationId(2839),
                 }],
             },
             type_params: vec![],
@@ -93800,7 +93836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3246),
+            id: DeclarationId(3247),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93814,17 +93850,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3247),
+            id: DeclarationId(3248),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3245),
+                        ty: DeclarationId(3246),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3246),
+                        ty: DeclarationId(3247),
                     },
                 ],
             },
@@ -93839,12 +93875,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3248),
+            id: DeclarationId(3249),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2840),
+                    ty: DeclarationId(2841),
                 }],
             },
             type_params: vec![],
@@ -93858,7 +93894,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3249),
+            id: DeclarationId(3250),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93872,17 +93908,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3250),
+            id: DeclarationId(3251),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3248),
+                        ty: DeclarationId(3249),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3249),
+                        ty: DeclarationId(3250),
                     },
                 ],
             },
@@ -93897,7 +93933,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3251),
+            id: DeclarationId(3252),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93916,7 +93952,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3252),
+            id: DeclarationId(3253),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93930,17 +93966,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3253),
+            id: DeclarationId(3254),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3251),
+                        ty: DeclarationId(3252),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3252),
+                        ty: DeclarationId(3253),
                     },
                 ],
             },
@@ -93955,12 +93991,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3254),
+            id: DeclarationId(3255),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1770),
+                    ty: DeclarationId(1771),
                 }],
             },
             type_params: vec![],
@@ -93974,7 +94010,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3255),
+            id: DeclarationId(3256),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93988,17 +94024,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3256),
+            id: DeclarationId(3257),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3254),
+                        ty: DeclarationId(3255),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3255),
+                        ty: DeclarationId(3256),
                     },
                 ],
             },
@@ -94013,7 +94049,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3257),
+            id: DeclarationId(3258),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94032,7 +94068,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3258),
+            id: DeclarationId(3259),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94046,17 +94082,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3259),
+            id: DeclarationId(3260),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3257),
+                        ty: DeclarationId(3258),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3258),
+                        ty: DeclarationId(3259),
                     },
                 ],
             },
@@ -94071,12 +94107,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3260),
+            id: DeclarationId(3261),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1751),
+                    ty: DeclarationId(1752),
                 }],
             },
             type_params: vec![],
@@ -94090,7 +94126,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3261),
+            id: DeclarationId(3262),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94104,17 +94140,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3262),
+            id: DeclarationId(3263),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3260),
+                        ty: DeclarationId(3261),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3261),
+                        ty: DeclarationId(3262),
                     },
                 ],
             },
@@ -94129,12 +94165,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3263),
+            id: DeclarationId(3264),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1750),
+                    ty: DeclarationId(1751),
                 }],
             },
             type_params: vec![],
@@ -94148,7 +94184,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3264),
+            id: DeclarationId(3265),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94162,17 +94198,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3265),
+            id: DeclarationId(3266),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3263),
+                        ty: DeclarationId(3264),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3264),
+                        ty: DeclarationId(3265),
                     },
                 ],
             },
@@ -94187,12 +94223,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3266),
+            id: DeclarationId(3267),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1749),
+                    ty: DeclarationId(1750),
                 }],
             },
             type_params: vec![],
@@ -94206,7 +94242,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3267),
+            id: DeclarationId(3268),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94220,17 +94256,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3268),
+            id: DeclarationId(3269),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3266),
+                        ty: DeclarationId(3267),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3267),
+                        ty: DeclarationId(3268),
                     },
                 ],
             },
@@ -94245,7 +94281,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3269),
+            id: DeclarationId(3270),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94264,7 +94300,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3270),
+            id: DeclarationId(3271),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94278,17 +94314,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3271),
+            id: DeclarationId(3272),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3269),
+                        ty: DeclarationId(3270),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3270),
+                        ty: DeclarationId(3271),
                     },
                 ],
             },
@@ -94303,7 +94339,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3272),
+            id: DeclarationId(3273),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94322,7 +94358,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3273),
+            id: DeclarationId(3274),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94336,17 +94372,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3274),
+            id: DeclarationId(3275),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3272),
+                        ty: DeclarationId(3273),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3273),
+                        ty: DeclarationId(3274),
                     },
                 ],
             },
@@ -94361,7 +94397,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3275),
+            id: DeclarationId(3276),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94380,7 +94416,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3276),
+            id: DeclarationId(3277),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94394,17 +94430,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3277),
+            id: DeclarationId(3278),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3275),
+                        ty: DeclarationId(3276),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3276),
+                        ty: DeclarationId(3277),
                     },
                 ],
             },
@@ -94419,12 +94455,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3278),
+            id: DeclarationId(3279),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2868),
+                    ty: DeclarationId(2869),
                 }],
             },
             type_params: vec![],
@@ -94438,7 +94474,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3279),
+            id: DeclarationId(3280),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94452,17 +94488,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3280),
+            id: DeclarationId(3281),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3278),
+                        ty: DeclarationId(3279),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3279),
+                        ty: DeclarationId(3280),
                     },
                 ],
             },
@@ -94477,7 +94513,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3281),
+            id: DeclarationId(3282),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94496,7 +94532,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3282),
+            id: DeclarationId(3283),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94510,17 +94546,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3283),
+            id: DeclarationId(3284),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3281),
+                        ty: DeclarationId(3282),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3282),
+                        ty: DeclarationId(3283),
                     },
                 ],
             },
@@ -94535,7 +94571,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3284),
+            id: DeclarationId(3285),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94554,7 +94590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3285),
+            id: DeclarationId(3286),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94568,17 +94604,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3286),
+            id: DeclarationId(3287),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3284),
+                        ty: DeclarationId(3285),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3285),
+                        ty: DeclarationId(3286),
                     },
                 ],
             },
@@ -94593,7 +94629,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3287),
+            id: DeclarationId(3288),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94612,7 +94648,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3288),
+            id: DeclarationId(3289),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94626,17 +94662,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3289),
+            id: DeclarationId(3290),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3287),
+                        ty: DeclarationId(3288),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3288),
+                        ty: DeclarationId(3289),
                     },
                 ],
             },
@@ -94651,7 +94687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3290),
+            id: DeclarationId(3291),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94670,7 +94706,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3291),
+            id: DeclarationId(3292),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94684,17 +94720,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3292),
+            id: DeclarationId(3293),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3290),
+                        ty: DeclarationId(3291),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3291),
+                        ty: DeclarationId(3292),
                     },
                 ],
             },
@@ -94709,7 +94745,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3293),
+            id: DeclarationId(3294),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94728,7 +94764,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3294),
+            id: DeclarationId(3295),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94742,17 +94778,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3295),
+            id: DeclarationId(3296),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3293),
+                        ty: DeclarationId(3294),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3294),
+                        ty: DeclarationId(3295),
                     },
                 ],
             },
@@ -94767,12 +94803,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3296),
+            id: DeclarationId(3297),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2877),
+                    ty: DeclarationId(2878),
                 }],
             },
             type_params: vec![],
@@ -94786,7 +94822,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10886, 10906),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3297),
+            id: DeclarationId(3298),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94800,17 +94836,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10886, 10906),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3298),
+            id: DeclarationId(3299),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3296),
+                        ty: DeclarationId(3297),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3297),
+                        ty: DeclarationId(3298),
                     },
                 ],
             },
@@ -94825,7 +94861,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10886, 10906),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3299),
+            id: DeclarationId(3300),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94844,7 +94880,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10928, 10935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3300),
+            id: DeclarationId(3301),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94858,17 +94894,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10928, 10935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3301),
+            id: DeclarationId(3302),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3299),
+                        ty: DeclarationId(3300),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3300),
+                        ty: DeclarationId(3301),
                     },
                 ],
             },
@@ -94883,7 +94919,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10928, 10935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3302),
+            id: DeclarationId(3303),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94902,7 +94938,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10991, 10995),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3303),
+            id: DeclarationId(3304),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94916,17 +94952,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10991, 10995),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3304),
+            id: DeclarationId(3305),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3302),
+                        ty: DeclarationId(3303),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3303),
+                        ty: DeclarationId(3304),
                     },
                 ],
             },
@@ -94941,7 +94977,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10991, 10995),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3305),
+            id: DeclarationId(3306),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94960,7 +94996,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11414, 11421),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3306),
+            id: DeclarationId(3307),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94974,17 +95010,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11414, 11421),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3307),
+            id: DeclarationId(3308),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3305),
+                        ty: DeclarationId(3306),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3306),
+                        ty: DeclarationId(3307),
                     },
                 ],
             },
@@ -94999,7 +95035,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11414, 11421),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3308),
+            id: DeclarationId(3309),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95018,7 +95054,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11429, 11433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3309),
+            id: DeclarationId(3310),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95032,17 +95068,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11429, 11433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3310),
+            id: DeclarationId(3311),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3308),
+                        ty: DeclarationId(3309),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3309),
+                        ty: DeclarationId(3310),
                     },
                 ],
             },
@@ -95057,7 +95093,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11429, 11433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3311),
+            id: DeclarationId(3312),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95076,7 +95112,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11440, 11444),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3312),
+            id: DeclarationId(3313),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95090,17 +95126,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11440, 11444),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3313),
+            id: DeclarationId(3314),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3311),
+                        ty: DeclarationId(3312),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3312),
+                        ty: DeclarationId(3313),
                     },
                 ],
             },
@@ -95115,7 +95151,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11440, 11444),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3314),
+            id: DeclarationId(3315),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95134,7 +95170,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11494, 11501),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3315),
+            id: DeclarationId(3316),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95148,17 +95184,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11494, 11501),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3316),
+            id: DeclarationId(3317),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3314),
+                        ty: DeclarationId(3315),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3315),
+                        ty: DeclarationId(3316),
                     },
                 ],
             },
@@ -95173,7 +95209,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11494, 11501),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3317),
+            id: DeclarationId(3318),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95192,7 +95228,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11509, 11513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3318),
+            id: DeclarationId(3319),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95206,17 +95242,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11509, 11513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3319),
+            id: DeclarationId(3320),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3317),
+                        ty: DeclarationId(3318),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3318),
+                        ty: DeclarationId(3319),
                     },
                 ],
             },
@@ -95231,7 +95267,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11509, 11513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3320),
+            id: DeclarationId(3321),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95250,7 +95286,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11520, 11524),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3321),
+            id: DeclarationId(3322),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95264,17 +95300,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11520, 11524),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3322),
+            id: DeclarationId(3323),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3320),
+                        ty: DeclarationId(3321),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3321),
+                        ty: DeclarationId(3322),
                     },
                 ],
             },
@@ -95289,7 +95325,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11520, 11524),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3323),
+            id: DeclarationId(3324),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95308,7 +95344,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11573, 11580),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3324),
+            id: DeclarationId(3325),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95322,17 +95358,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11573, 11580),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3325),
+            id: DeclarationId(3326),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3323),
+                        ty: DeclarationId(3324),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3324),
+                        ty: DeclarationId(3325),
                     },
                 ],
             },
@@ -95347,7 +95383,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11573, 11580),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3326),
+            id: DeclarationId(3327),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95366,7 +95402,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11588, 11592),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3327),
+            id: DeclarationId(3328),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95380,17 +95416,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11588, 11592),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3328),
+            id: DeclarationId(3329),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3326),
+                        ty: DeclarationId(3327),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3327),
+                        ty: DeclarationId(3328),
                     },
                 ],
             },
@@ -95405,7 +95441,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11588, 11592),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3329),
+            id: DeclarationId(3330),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95424,7 +95460,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3330),
+            id: DeclarationId(3331),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95438,17 +95474,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3331),
+            id: DeclarationId(3332),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3329),
+                        ty: DeclarationId(3330),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3330),
+                        ty: DeclarationId(3331),
                     },
                 ],
             },
@@ -95463,7 +95499,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3332),
+            id: DeclarationId(3333),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95482,7 +95518,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12583, 12587),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3333),
+            id: DeclarationId(3334),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95496,17 +95532,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12583, 12587),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3334),
+            id: DeclarationId(3335),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3332),
+                        ty: DeclarationId(3333),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3333),
+                        ty: DeclarationId(3334),
                     },
                 ],
             },
@@ -95521,7 +95557,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12583, 12587),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3335),
+            id: DeclarationId(3336),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95540,7 +95576,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12666, 12673),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3336),
+            id: DeclarationId(3337),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95554,17 +95590,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12666, 12673),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3337),
+            id: DeclarationId(3338),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3335),
+                        ty: DeclarationId(3336),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3336),
+                        ty: DeclarationId(3337),
                     },
                 ],
             },
@@ -95579,7 +95615,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12666, 12673),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3338),
+            id: DeclarationId(3339),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95598,7 +95634,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13313, 13317),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3339),
+            id: DeclarationId(3340),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95612,17 +95648,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13313, 13317),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3340),
+            id: DeclarationId(3341),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3338),
+                        ty: DeclarationId(3339),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3339),
+                        ty: DeclarationId(3340),
                     },
                 ],
             },
@@ -97159,7 +97195,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(189),
             Port {
                 id: PortId(189),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2007))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2008))),
                 produced_by: Some(NodeId(184)),
             },
         );
@@ -97183,7 +97219,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(192),
             Port {
                 id: PortId(192),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2008))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2009))),
                 produced_by: None,
             },
         );
@@ -97191,7 +97227,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(193),
             Port {
                 id: PortId(193),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2009))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2010))),
                 produced_by: Some(NodeId(186)),
             },
         );
@@ -97479,7 +97515,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(229),
             Port {
                 id: PortId(229),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2010))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2011))),
                 produced_by: None,
             },
         );
@@ -99031,7 +99067,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(423),
             Port {
                 id: PortId(423),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2011))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2012))),
                 produced_by: None,
             },
         );
@@ -99055,7 +99091,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(426),
             Port {
                 id: PortId(426),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2008))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2009))),
                 produced_by: Some(NodeId(363)),
             },
         );
@@ -99071,7 +99107,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(428),
             Port {
                 id: PortId(428),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2012))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2013))),
                 produced_by: Some(NodeId(365)),
             },
         );
@@ -99079,7 +99115,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(429),
             Port {
                 id: PortId(429),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2013))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2014))),
                 produced_by: None,
             },
         );
@@ -99183,7 +99219,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(442),
             Port {
                 id: PortId(442),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2014))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2015))),
                 produced_by: Some(NodeId(378)),
             },
         );
@@ -99191,7 +99227,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(443),
             Port {
                 id: PortId(443),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2015))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2016))),
                 produced_by: None,
             },
         );
@@ -99239,7 +99275,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(449),
             Port {
                 id: PortId(449),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2016))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2017))),
                 produced_by: Some(NodeId(385)),
             },
         );
@@ -99247,7 +99283,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(450),
             Port {
                 id: PortId(450),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2017))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2018))),
                 produced_by: None,
             },
         );
@@ -99327,7 +99363,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(460),
             Port {
                 id: PortId(460),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2018))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2019))),
                 produced_by: None,
             },
         );
@@ -99431,7 +99467,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(473),
             Port {
                 id: PortId(473),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2019))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2020))),
                 produced_by: Some(NodeId(407)),
             },
         );
@@ -99711,7 +99747,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(508),
             Port {
                 id: PortId(508),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2020))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2021))),
                 produced_by: None,
             },
         );
@@ -99823,7 +99859,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(522),
             Port {
                 id: PortId(522),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2021))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2022))),
                 produced_by: None,
             },
         );
@@ -99935,7 +99971,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(536),
             Port {
                 id: PortId(536),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2022))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2023))),
                 produced_by: None,
             },
         );
@@ -100551,7 +100587,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(613),
             Port {
                 id: PortId(613),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2023))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2024))),
                 produced_by: None,
             },
         );
@@ -100663,7 +100699,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(627),
             Port {
                 id: PortId(627),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2024))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2025))),
                 produced_by: Some(NodeId(516)),
             },
         );
@@ -100671,7 +100707,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(628),
             Port {
                 id: PortId(628),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2025))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2026))),
                 produced_by: None,
             },
         );
@@ -100727,7 +100763,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(635),
             Port {
                 id: PortId(635),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2026))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2027))),
                 produced_by: Some(NodeId(523)),
             },
         );
@@ -100735,7 +100771,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(636),
             Port {
                 id: PortId(636),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2027))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2028))),
                 produced_by: None,
             },
         );
@@ -100751,7 +100787,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(638),
             Port {
                 id: PortId(638),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2028))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2029))),
                 produced_by: Some(NodeId(526)),
             },
         );
@@ -101015,7 +101051,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(671),
             Port {
                 id: PortId(671),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2361))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2362))),
                 produced_by: None,
             },
         );
@@ -101447,7 +101483,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(725),
             Port {
                 id: PortId(725),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2505))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2506))),
                 produced_by: Some(NodeId(596)),
             },
         );
@@ -101471,7 +101507,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(728),
             Port {
                 id: PortId(728),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2506))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2507))),
                 produced_by: Some(NodeId(598)),
             },
         );
@@ -101479,7 +101515,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(729),
             Port {
                 id: PortId(729),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2507))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2508))),
                 produced_by: Some(NodeId(600)),
             },
         );
@@ -101487,7 +101523,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(730),
             Port {
                 id: PortId(730),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2508))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2509))),
                 produced_by: Some(NodeId(602)),
             },
         );
@@ -101495,7 +101531,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(731),
             Port {
                 id: PortId(731),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2509))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2510))),
                 produced_by: Some(NodeId(604)),
             },
         );
@@ -101503,7 +101539,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(732),
             Port {
                 id: PortId(732),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2510))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2511))),
                 produced_by: Some(NodeId(606)),
             },
         );
@@ -101511,7 +101547,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(733),
             Port {
                 id: PortId(733),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2511))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2512))),
                 produced_by: Some(NodeId(608)),
             },
         );
@@ -101519,7 +101555,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(734),
             Port {
                 id: PortId(734),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2513))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2514))),
                 produced_by: Some(NodeId(610)),
             },
         );
@@ -101551,7 +101587,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(738),
             Port {
                 id: PortId(738),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2515))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2516))),
                 produced_by: Some(NodeId(614)),
             },
         );
@@ -101575,7 +101611,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(741),
             Port {
                 id: PortId(741),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2516))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2517))),
                 produced_by: Some(NodeId(617)),
             },
         );
@@ -101607,7 +101643,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(745),
             Port {
                 id: PortId(745),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2517))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2518))),
                 produced_by: Some(NodeId(621)),
             },
         );
@@ -101655,7 +101691,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(751),
             Port {
                 id: PortId(751),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2518))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2519))),
                 produced_by: Some(NodeId(626)),
             },
         );
@@ -101727,7 +101763,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(760),
             Port {
                 id: PortId(760),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2519))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2520))),
                 produced_by: Some(NodeId(633)),
             },
         );
@@ -101807,7 +101843,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(770),
             Port {
                 id: PortId(770),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2520))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2521))),
                 produced_by: Some(NodeId(640)),
             },
         );
@@ -101871,7 +101907,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(778),
             Port {
                 id: PortId(778),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2521))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2522))),
                 produced_by: Some(NodeId(645)),
             },
         );
@@ -101887,7 +101923,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(780),
             Port {
                 id: PortId(780),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2522))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2523))),
                 produced_by: None,
             },
         );
@@ -101975,7 +102011,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(791),
             Port {
                 id: PortId(791),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2523))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2524))),
                 produced_by: Some(NodeId(655)),
             },
         );
@@ -102047,7 +102083,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(800),
             Port {
                 id: PortId(800),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2524))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2525))),
                 produced_by: Some(NodeId(663)),
             },
         );
@@ -102471,7 +102507,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(853),
             Port {
                 id: PortId(853),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2581))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2582))),
                 produced_by: Some(NodeId(713)),
             },
         );
@@ -102679,7 +102715,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(879),
             Port {
                 id: PortId(879),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1997))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1998))),
                 produced_by: Some(NodeId(733)),
             },
         );
@@ -103247,7 +103283,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(950),
             Port {
                 id: PortId(950),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2582))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2583))),
                 produced_by: Some(NodeId(792)),
             },
         );
@@ -103439,7 +103475,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(974),
             Port {
                 id: PortId(974),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2758))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2759))),
                 produced_by: Some(NodeId(812)),
             },
         );
@@ -103826,144 +103862,144 @@ fn bootstrapped_fixture_dag_clusters() -> Vec<Cluster> {
 fn bootstrapped_fixture_dag_optional_match_disjs() -> HashMap<DeclarationId, DeclarationId> {
     {
         let mut map = HashMap::new();
-        map.insert(DeclarationId(389), DeclarationId(2929));
-        map.insert(DeclarationId(391), DeclarationId(2932));
-        map.insert(DeclarationId(423), DeclarationId(2935));
-        map.insert(DeclarationId(426), DeclarationId(2938));
-        map.insert(DeclarationId(471), DeclarationId(2941));
-        map.insert(DeclarationId(472), DeclarationId(2944));
-        map.insert(DeclarationId(473), DeclarationId(2947));
-        map.insert(DeclarationId(513), DeclarationId(2950));
-        map.insert(DeclarationId(515), DeclarationId(2953));
-        map.insert(DeclarationId(516), DeclarationId(2956));
-        map.insert(DeclarationId(539), DeclarationId(2959));
-        map.insert(DeclarationId(582), DeclarationId(2962));
-        map.insert(DeclarationId(602), DeclarationId(2965));
-        map.insert(DeclarationId(603), DeclarationId(2968));
-        map.insert(DeclarationId(605), DeclarationId(2971));
-        map.insert(DeclarationId(608), DeclarationId(2974));
-        map.insert(DeclarationId(613), DeclarationId(2977));
-        map.insert(DeclarationId(614), DeclarationId(2980));
-        map.insert(DeclarationId(618), DeclarationId(2983));
-        map.insert(DeclarationId(619), DeclarationId(2986));
-        map.insert(DeclarationId(620), DeclarationId(2989));
-        map.insert(DeclarationId(625), DeclarationId(2992));
-        map.insert(DeclarationId(1818), DeclarationId(2995));
-        map.insert(DeclarationId(1822), DeclarationId(2998));
-        map.insert(DeclarationId(1825), DeclarationId(3001));
-        map.insert(DeclarationId(1827), DeclarationId(3004));
-        map.insert(DeclarationId(1828), DeclarationId(3007));
-        map.insert(DeclarationId(1829), DeclarationId(3010));
-        map.insert(DeclarationId(1883), DeclarationId(3013));
-        map.insert(DeclarationId(1884), DeclarationId(3016));
-        map.insert(DeclarationId(1885), DeclarationId(3019));
-        map.insert(DeclarationId(1886), DeclarationId(3022));
-        map.insert(DeclarationId(1887), DeclarationId(3025));
-        map.insert(DeclarationId(1888), DeclarationId(3028));
-        map.insert(DeclarationId(1894), DeclarationId(3031));
-        map.insert(DeclarationId(1949), DeclarationId(3034));
-        map.insert(DeclarationId(1952), DeclarationId(3037));
-        map.insert(DeclarationId(1953), DeclarationId(3040));
-        map.insert(DeclarationId(1954), DeclarationId(3043));
-        map.insert(DeclarationId(1955), DeclarationId(3046));
-        map.insert(DeclarationId(1978), DeclarationId(3049));
-        map.insert(DeclarationId(1983), DeclarationId(3052));
-        map.insert(DeclarationId(1987), DeclarationId(3055));
-        map.insert(DeclarationId(1990), DeclarationId(3058));
-        map.insert(DeclarationId(1991), DeclarationId(3061));
-        map.insert(DeclarationId(2036), DeclarationId(3064));
-        map.insert(DeclarationId(2037), DeclarationId(3067));
-        map.insert(DeclarationId(2038), DeclarationId(3070));
-        map.insert(DeclarationId(2039), DeclarationId(3073));
-        map.insert(DeclarationId(2089), DeclarationId(3076));
-        map.insert(DeclarationId(2090), DeclarationId(3079));
-        map.insert(DeclarationId(2109), DeclarationId(3082));
-        map.insert(DeclarationId(2110), DeclarationId(3085));
-        map.insert(DeclarationId(2114), DeclarationId(3088));
-        map.insert(DeclarationId(2115), DeclarationId(3091));
-        map.insert(DeclarationId(2126), DeclarationId(3094));
-        map.insert(DeclarationId(2127), DeclarationId(3097));
-        map.insert(DeclarationId(2129), DeclarationId(3100));
-        map.insert(DeclarationId(2130), DeclarationId(3103));
-        map.insert(DeclarationId(2132), DeclarationId(3106));
-        map.insert(DeclarationId(2133), DeclarationId(3109));
-        map.insert(DeclarationId(2135), DeclarationId(3112));
-        map.insert(DeclarationId(2137), DeclarationId(3115));
-        map.insert(DeclarationId(2140), DeclarationId(3118));
-        map.insert(DeclarationId(2144), DeclarationId(3121));
-        map.insert(DeclarationId(2146), DeclarationId(3124));
-        map.insert(DeclarationId(2148), DeclarationId(3127));
-        map.insert(DeclarationId(2158), DeclarationId(3130));
-        map.insert(DeclarationId(2159), DeclarationId(3133));
-        map.insert(DeclarationId(2160), DeclarationId(3136));
-        map.insert(DeclarationId(2163), DeclarationId(3139));
-        map.insert(DeclarationId(2164), DeclarationId(3142));
-        map.insert(DeclarationId(2199), DeclarationId(3145));
-        map.insert(DeclarationId(2200), DeclarationId(3148));
-        map.insert(DeclarationId(2201), DeclarationId(3151));
-        map.insert(DeclarationId(2202), DeclarationId(3154));
-        map.insert(DeclarationId(2203), DeclarationId(3157));
-        map.insert(DeclarationId(2204), DeclarationId(3160));
-        map.insert(DeclarationId(2227), DeclarationId(3163));
-        map.insert(DeclarationId(2357), DeclarationId(3166));
-        map.insert(DeclarationId(2358), DeclarationId(3169));
-        map.insert(DeclarationId(2364), DeclarationId(3172));
-        map.insert(DeclarationId(2365), DeclarationId(3175));
-        map.insert(DeclarationId(2366), DeclarationId(3178));
-        map.insert(DeclarationId(2367), DeclarationId(3181));
-        map.insert(DeclarationId(2368), DeclarationId(3184));
-        map.insert(DeclarationId(2369), DeclarationId(3187));
-        map.insert(DeclarationId(2419), DeclarationId(3190));
-        map.insert(DeclarationId(2463), DeclarationId(3193));
-        map.insert(DeclarationId(2471), DeclarationId(3196));
-        map.insert(DeclarationId(2485), DeclarationId(3199));
-        map.insert(DeclarationId(2488), DeclarationId(3202));
-        map.insert(DeclarationId(2546), DeclarationId(3205));
-        map.insert(DeclarationId(2547), DeclarationId(3208));
-        map.insert(DeclarationId(2548), DeclarationId(3211));
-        map.insert(DeclarationId(2551), DeclarationId(3214));
-        map.insert(DeclarationId(2552), DeclarationId(3217));
-        map.insert(DeclarationId(2762), DeclarationId(3220));
-        map.insert(DeclarationId(2791), DeclarationId(3223));
-        map.insert(DeclarationId(2797), DeclarationId(3226));
-        map.insert(DeclarationId(2802), DeclarationId(3229));
-        map.insert(DeclarationId(2805), DeclarationId(3232));
-        map.insert(DeclarationId(2806), DeclarationId(3235));
-        map.insert(DeclarationId(2826), DeclarationId(3238));
-        map.insert(DeclarationId(2827), DeclarationId(3241));
-        map.insert(DeclarationId(2835), DeclarationId(3244));
-        map.insert(DeclarationId(2839), DeclarationId(3247));
-        map.insert(DeclarationId(2841), DeclarationId(3250));
-        map.insert(DeclarationId(2842), DeclarationId(3253));
-        map.insert(DeclarationId(2843), DeclarationId(3256));
-        map.insert(DeclarationId(2844), DeclarationId(3259));
-        map.insert(DeclarationId(2845), DeclarationId(3262));
-        map.insert(DeclarationId(2851), DeclarationId(3265));
-        map.insert(DeclarationId(2853), DeclarationId(3268));
-        map.insert(DeclarationId(2854), DeclarationId(3271));
-        map.insert(DeclarationId(2866), DeclarationId(3274));
-        map.insert(DeclarationId(2867), DeclarationId(3277));
-        map.insert(DeclarationId(2869), DeclarationId(3280));
-        map.insert(DeclarationId(2870), DeclarationId(3283));
-        map.insert(DeclarationId(2871), DeclarationId(3286));
-        map.insert(DeclarationId(2872), DeclarationId(3289));
-        map.insert(DeclarationId(2874), DeclarationId(3292));
-        map.insert(DeclarationId(2875), DeclarationId(3295));
-        map.insert(DeclarationId(2878), DeclarationId(3298));
-        map.insert(DeclarationId(2879), DeclarationId(3301));
-        map.insert(DeclarationId(2880), DeclarationId(3304));
-        map.insert(DeclarationId(2887), DeclarationId(3307));
-        map.insert(DeclarationId(2888), DeclarationId(3310));
-        map.insert(DeclarationId(2889), DeclarationId(3313));
-        map.insert(DeclarationId(2891), DeclarationId(3316));
-        map.insert(DeclarationId(2892), DeclarationId(3319));
-        map.insert(DeclarationId(2893), DeclarationId(3322));
-        map.insert(DeclarationId(2895), DeclarationId(3325));
-        map.insert(DeclarationId(2896), DeclarationId(3328));
-        map.insert(DeclarationId(2897), DeclarationId(3331));
-        map.insert(DeclarationId(2904), DeclarationId(3334));
-        map.insert(DeclarationId(2906), DeclarationId(3337));
-        map.insert(DeclarationId(2917), DeclarationId(3340));
+        map.insert(DeclarationId(389), DeclarationId(2930));
+        map.insert(DeclarationId(391), DeclarationId(2933));
+        map.insert(DeclarationId(423), DeclarationId(2936));
+        map.insert(DeclarationId(426), DeclarationId(2939));
+        map.insert(DeclarationId(471), DeclarationId(2942));
+        map.insert(DeclarationId(472), DeclarationId(2945));
+        map.insert(DeclarationId(473), DeclarationId(2948));
+        map.insert(DeclarationId(513), DeclarationId(2951));
+        map.insert(DeclarationId(515), DeclarationId(2954));
+        map.insert(DeclarationId(516), DeclarationId(2957));
+        map.insert(DeclarationId(539), DeclarationId(2960));
+        map.insert(DeclarationId(582), DeclarationId(2963));
+        map.insert(DeclarationId(602), DeclarationId(2966));
+        map.insert(DeclarationId(603), DeclarationId(2969));
+        map.insert(DeclarationId(605), DeclarationId(2972));
+        map.insert(DeclarationId(608), DeclarationId(2975));
+        map.insert(DeclarationId(613), DeclarationId(2978));
+        map.insert(DeclarationId(614), DeclarationId(2981));
+        map.insert(DeclarationId(618), DeclarationId(2984));
+        map.insert(DeclarationId(619), DeclarationId(2987));
+        map.insert(DeclarationId(620), DeclarationId(2990));
+        map.insert(DeclarationId(625), DeclarationId(2993));
+        map.insert(DeclarationId(1819), DeclarationId(2996));
+        map.insert(DeclarationId(1823), DeclarationId(2999));
+        map.insert(DeclarationId(1826), DeclarationId(3002));
+        map.insert(DeclarationId(1828), DeclarationId(3005));
+        map.insert(DeclarationId(1829), DeclarationId(3008));
+        map.insert(DeclarationId(1830), DeclarationId(3011));
+        map.insert(DeclarationId(1884), DeclarationId(3014));
+        map.insert(DeclarationId(1885), DeclarationId(3017));
+        map.insert(DeclarationId(1886), DeclarationId(3020));
+        map.insert(DeclarationId(1887), DeclarationId(3023));
+        map.insert(DeclarationId(1888), DeclarationId(3026));
+        map.insert(DeclarationId(1889), DeclarationId(3029));
+        map.insert(DeclarationId(1895), DeclarationId(3032));
+        map.insert(DeclarationId(1950), DeclarationId(3035));
+        map.insert(DeclarationId(1953), DeclarationId(3038));
+        map.insert(DeclarationId(1954), DeclarationId(3041));
+        map.insert(DeclarationId(1955), DeclarationId(3044));
+        map.insert(DeclarationId(1956), DeclarationId(3047));
+        map.insert(DeclarationId(1979), DeclarationId(3050));
+        map.insert(DeclarationId(1984), DeclarationId(3053));
+        map.insert(DeclarationId(1988), DeclarationId(3056));
+        map.insert(DeclarationId(1991), DeclarationId(3059));
+        map.insert(DeclarationId(1992), DeclarationId(3062));
+        map.insert(DeclarationId(2037), DeclarationId(3065));
+        map.insert(DeclarationId(2038), DeclarationId(3068));
+        map.insert(DeclarationId(2039), DeclarationId(3071));
+        map.insert(DeclarationId(2040), DeclarationId(3074));
+        map.insert(DeclarationId(2090), DeclarationId(3077));
+        map.insert(DeclarationId(2091), DeclarationId(3080));
+        map.insert(DeclarationId(2110), DeclarationId(3083));
+        map.insert(DeclarationId(2111), DeclarationId(3086));
+        map.insert(DeclarationId(2115), DeclarationId(3089));
+        map.insert(DeclarationId(2116), DeclarationId(3092));
+        map.insert(DeclarationId(2127), DeclarationId(3095));
+        map.insert(DeclarationId(2128), DeclarationId(3098));
+        map.insert(DeclarationId(2130), DeclarationId(3101));
+        map.insert(DeclarationId(2131), DeclarationId(3104));
+        map.insert(DeclarationId(2133), DeclarationId(3107));
+        map.insert(DeclarationId(2134), DeclarationId(3110));
+        map.insert(DeclarationId(2136), DeclarationId(3113));
+        map.insert(DeclarationId(2138), DeclarationId(3116));
+        map.insert(DeclarationId(2141), DeclarationId(3119));
+        map.insert(DeclarationId(2145), DeclarationId(3122));
+        map.insert(DeclarationId(2147), DeclarationId(3125));
+        map.insert(DeclarationId(2149), DeclarationId(3128));
+        map.insert(DeclarationId(2159), DeclarationId(3131));
+        map.insert(DeclarationId(2160), DeclarationId(3134));
+        map.insert(DeclarationId(2161), DeclarationId(3137));
+        map.insert(DeclarationId(2164), DeclarationId(3140));
+        map.insert(DeclarationId(2165), DeclarationId(3143));
+        map.insert(DeclarationId(2200), DeclarationId(3146));
+        map.insert(DeclarationId(2201), DeclarationId(3149));
+        map.insert(DeclarationId(2202), DeclarationId(3152));
+        map.insert(DeclarationId(2203), DeclarationId(3155));
+        map.insert(DeclarationId(2204), DeclarationId(3158));
+        map.insert(DeclarationId(2205), DeclarationId(3161));
+        map.insert(DeclarationId(2228), DeclarationId(3164));
+        map.insert(DeclarationId(2358), DeclarationId(3167));
+        map.insert(DeclarationId(2359), DeclarationId(3170));
+        map.insert(DeclarationId(2365), DeclarationId(3173));
+        map.insert(DeclarationId(2366), DeclarationId(3176));
+        map.insert(DeclarationId(2367), DeclarationId(3179));
+        map.insert(DeclarationId(2368), DeclarationId(3182));
+        map.insert(DeclarationId(2369), DeclarationId(3185));
+        map.insert(DeclarationId(2370), DeclarationId(3188));
+        map.insert(DeclarationId(2420), DeclarationId(3191));
+        map.insert(DeclarationId(2464), DeclarationId(3194));
+        map.insert(DeclarationId(2472), DeclarationId(3197));
+        map.insert(DeclarationId(2486), DeclarationId(3200));
+        map.insert(DeclarationId(2489), DeclarationId(3203));
+        map.insert(DeclarationId(2547), DeclarationId(3206));
+        map.insert(DeclarationId(2548), DeclarationId(3209));
+        map.insert(DeclarationId(2549), DeclarationId(3212));
+        map.insert(DeclarationId(2552), DeclarationId(3215));
+        map.insert(DeclarationId(2553), DeclarationId(3218));
+        map.insert(DeclarationId(2763), DeclarationId(3221));
+        map.insert(DeclarationId(2792), DeclarationId(3224));
+        map.insert(DeclarationId(2798), DeclarationId(3227));
+        map.insert(DeclarationId(2803), DeclarationId(3230));
+        map.insert(DeclarationId(2806), DeclarationId(3233));
+        map.insert(DeclarationId(2807), DeclarationId(3236));
+        map.insert(DeclarationId(2827), DeclarationId(3239));
+        map.insert(DeclarationId(2828), DeclarationId(3242));
+        map.insert(DeclarationId(2836), DeclarationId(3245));
+        map.insert(DeclarationId(2840), DeclarationId(3248));
+        map.insert(DeclarationId(2842), DeclarationId(3251));
+        map.insert(DeclarationId(2843), DeclarationId(3254));
+        map.insert(DeclarationId(2844), DeclarationId(3257));
+        map.insert(DeclarationId(2845), DeclarationId(3260));
+        map.insert(DeclarationId(2846), DeclarationId(3263));
+        map.insert(DeclarationId(2852), DeclarationId(3266));
+        map.insert(DeclarationId(2854), DeclarationId(3269));
+        map.insert(DeclarationId(2855), DeclarationId(3272));
+        map.insert(DeclarationId(2867), DeclarationId(3275));
+        map.insert(DeclarationId(2868), DeclarationId(3278));
+        map.insert(DeclarationId(2870), DeclarationId(3281));
+        map.insert(DeclarationId(2871), DeclarationId(3284));
+        map.insert(DeclarationId(2872), DeclarationId(3287));
+        map.insert(DeclarationId(2873), DeclarationId(3290));
+        map.insert(DeclarationId(2875), DeclarationId(3293));
+        map.insert(DeclarationId(2876), DeclarationId(3296));
+        map.insert(DeclarationId(2879), DeclarationId(3299));
+        map.insert(DeclarationId(2880), DeclarationId(3302));
+        map.insert(DeclarationId(2881), DeclarationId(3305));
+        map.insert(DeclarationId(2888), DeclarationId(3308));
+        map.insert(DeclarationId(2889), DeclarationId(3311));
+        map.insert(DeclarationId(2890), DeclarationId(3314));
+        map.insert(DeclarationId(2892), DeclarationId(3317));
+        map.insert(DeclarationId(2893), DeclarationId(3320));
+        map.insert(DeclarationId(2894), DeclarationId(3323));
+        map.insert(DeclarationId(2896), DeclarationId(3326));
+        map.insert(DeclarationId(2897), DeclarationId(3329));
+        map.insert(DeclarationId(2898), DeclarationId(3332));
+        map.insert(DeclarationId(2905), DeclarationId(3335));
+        map.insert(DeclarationId(2907), DeclarationId(3338));
+        map.insert(DeclarationId(2918), DeclarationId(3341));
         map
     }
 }
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 5f32a0c2b6d..2ca84d93fa3 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: 854,
-        next_declaration_id: 2870,
+        next_declaration_id: 2871,
         next_port_id: 1021,
         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: 2870,
+        declaration_append_begin_after_bootstrap: 2871,
     }
 }
 
@@ -1402,21 +1402,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(182),
-            target: TransformTarget::Callable(DeclarationId(1677)),
+            target: TransformTarget::Callable(DeclarationId(1678)),
             inputs: vec![PortId(185)],
             output: PortId(187),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11495, 11507),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(183),
-            target: TransformTarget::Callable(DeclarationId(1679)),
+            target: TransformTarget::Callable(DeclarationId(1680)),
             inputs: vec![PortId(187)],
             output: PortId(188),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11488, 11535),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(184),
-            target: TransformTarget::Callable(DeclarationId(1623)),
+            target: TransformTarget::Callable(DeclarationId(1624)),
             inputs: vec![PortId(185), PortId(186), PortId(188)],
             output: PortId(189),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11149, 11539),
@@ -1432,7 +1432,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(186),
-            target: TransformTarget::Callable(DeclarationId(1625)),
+            target: TransformTarget::Callable(DeclarationId(1626)),
             inputs: vec![PortId(190), PortId(191), PortId(192)],
             output: PortId(193),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11670, 11726),
@@ -1448,7 +1448,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(188),
-            target: TransformTarget::Callable(DeclarationId(1680)),
+            target: TransformTarget::Callable(DeclarationId(1681)),
             inputs: vec![PortId(194)],
             output: PortId(195),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11795, 11810),
@@ -1600,7 +1600,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(202),
-            target: TransformTarget::Callable(DeclarationId(1664)),
+            target: TransformTarget::Callable(DeclarationId(1665)),
             inputs: vec![PortId(211)],
             output: PortId(212),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12325, 12349),
@@ -1630,7 +1630,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(206),
-            target: TransformTarget::Callable(DeclarationId(1662)),
+            target: TransformTarget::Callable(DeclarationId(1663)),
             inputs: vec![PortId(216)],
             output: PortId(217),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12618, 12653),
@@ -1760,14 +1760,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(218),
-            target: TransformTarget::Callable(DeclarationId(1658)),
+            target: TransformTarget::Callable(DeclarationId(1659)),
             inputs: vec![PortId(230)],
             output: PortId(231),
             span: SourceSpan::new("src/v3/std/algebra.dag", 14214, 14229),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(219),
-            target: TransformTarget::Callable(DeclarationId(1682)),
+            target: TransformTarget::Callable(DeclarationId(1683)),
             inputs: vec![PortId(229), PortId(231)],
             output: PortId(232),
             span: SourceSpan::new("src/v3/std/algebra.dag", 14202, 14245),
@@ -2472,7 +2472,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(266),
-            target: TransformTarget::Callable(DeclarationId(1684)),
+            target: TransformTarget::Callable(DeclarationId(1685)),
             inputs: vec![PortId(312), PortId(313)],
             output: PortId(314),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16911, 17021),
@@ -2500,7 +2500,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(270),
-            target: TransformTarget::Callable(DeclarationId(1686)),
+            target: TransformTarget::Callable(DeclarationId(1687)),
             inputs: vec![PortId(317), PortId(318)],
             output: PortId(319),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17076, 17186),
@@ -3993,14 +3993,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(364),
-            target: TransformTarget::Callable(DeclarationId(1687)),
+            target: TransformTarget::Callable(DeclarationId(1688)),
             inputs: vec![PortId(425), PortId(426)],
             output: PortId(427),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22293, 22323),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(365),
-            target: TransformTarget::Callable(DeclarationId(1688)),
+            target: TransformTarget::Callable(DeclarationId(1689)),
             inputs: vec![PortId(424), PortId(427)],
             output: PortId(428),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22275, 22324),
@@ -4016,7 +4016,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(367),
-            target: TransformTarget::Callable(DeclarationId(1689)),
+            target: TransformTarget::Callable(DeclarationId(1690)),
             inputs: vec![],
             output: PortId(430),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22603, 22610),
@@ -4080,7 +4080,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(375),
-            target: TransformTarget::Callable(DeclarationId(1690)),
+            target: TransformTarget::Callable(DeclarationId(1691)),
             inputs: vec![PortId(436), PortId(438)],
             output: PortId(439),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22737, 22789),
@@ -4176,21 +4176,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(382),
-            target: TransformTarget::Callable(DeclarationId(1658)),
+            target: TransformTarget::Callable(DeclarationId(1659)),
             inputs: vec![PortId(445)],
             output: PortId(446),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23123, 23138),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(383),
-            target: TransformTarget::Callable(DeclarationId(1691)),
+            target: TransformTarget::Callable(DeclarationId(1692)),
             inputs: vec![],
             output: PortId(447),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23140, 23147),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(384),
-            target: TransformTarget::Callable(DeclarationId(1692)),
+            target: TransformTarget::Callable(DeclarationId(1693)),
             inputs: vec![PortId(446), PortId(447)],
             output: PortId(448),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23118, 23148),
@@ -4327,7 +4327,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(396),
-            target: TransformTarget::Callable(DeclarationId(1693)),
+            target: TransformTarget::Callable(DeclarationId(1694)),
             inputs: vec![],
             output: PortId(461),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23597, 23604),
@@ -4391,7 +4391,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(404),
-            target: TransformTarget::Callable(DeclarationId(1694)),
+            target: TransformTarget::Callable(DeclarationId(1695)),
             inputs: vec![PortId(467), PortId(469)],
             output: PortId(470),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23735, 23792),
@@ -4796,7 +4796,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(430),
-            target: TransformTarget::Callable(DeclarationId(1658)),
+            target: TransformTarget::Callable(DeclarationId(1659)),
             inputs: vec![PortId(509)],
             output: PortId(510),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25180, 25195),
@@ -4839,7 +4839,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(435),
-            target: TransformTarget::Callable(DeclarationId(1695)),
+            target: TransformTarget::Callable(DeclarationId(1696)),
             inputs: vec![PortId(515), PortId(516)],
             output: PortId(517),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25317, 25349),
@@ -4936,7 +4936,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(442),
-            target: TransformTarget::Callable(DeclarationId(1658)),
+            target: TransformTarget::Callable(DeclarationId(1659)),
             inputs: vec![PortId(523)],
             output: PortId(524),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25451, 25466),
@@ -4995,7 +4995,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(449),
-            target: TransformTarget::Callable(DeclarationId(1664)),
+            target: TransformTarget::Callable(DeclarationId(1665)),
             inputs: vec![PortId(532)],
             output: PortId(533),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25569, 25628),
@@ -5078,7 +5078,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(454),
-            target: TransformTarget::Callable(DeclarationId(1658)),
+            target: TransformTarget::Callable(DeclarationId(1659)),
             inputs: vec![PortId(537)],
             output: PortId(538),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25917, 25932),
@@ -5171,7 +5171,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(465),
-            target: TransformTarget::Callable(DeclarationId(1662)),
+            target: TransformTarget::Callable(DeclarationId(1663)),
             inputs: vec![PortId(551)],
             output: PortId(552),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26159, 26222),
@@ -5643,7 +5643,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(494),
-            target: TransformTarget::Callable(DeclarationId(1662)),
+            target: TransformTarget::Callable(DeclarationId(1663)),
             inputs: vec![PortId(601)],
             output: PortId(602),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27605, 27633),
@@ -5734,7 +5734,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(505),
-            target: TransformTarget::Callable(DeclarationId(1696)),
+            target: TransformTarget::Callable(DeclarationId(1697)),
             inputs: vec![],
             output: PortId(615),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27988, 27995),
@@ -5798,7 +5798,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(513),
-            target: TransformTarget::Callable(DeclarationId(1697)),
+            target: TransformTarget::Callable(DeclarationId(1698)),
             inputs: vec![PortId(621), PortId(623)],
             output: PortId(624),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28136, 28201),
@@ -5887,7 +5887,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(519),
-            target: TransformTarget::Callable(DeclarationId(1699)),
+            target: TransformTarget::Callable(DeclarationId(1700)),
             inputs: vec![PortId(628), PortId(630)],
             output: PortId(631),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28319, 28377),
@@ -5908,7 +5908,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(522),
-            target: TransformTarget::Callable(DeclarationId(1700)),
+            target: TransformTarget::Callable(DeclarationId(1701)),
             inputs: vec![PortId(629), PortId(633)],
             output: PortId(634),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28403, 28449),
@@ -5951,14 +5951,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(525),
-            target: TransformTarget::Callable(DeclarationId(1701)),
+            target: TransformTarget::Callable(DeclarationId(1702)),
             inputs: vec![],
             output: PortId(637),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28720, 28727),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(526),
-            target: TransformTarget::Callable(DeclarationId(1703)),
+            target: TransformTarget::Callable(DeclarationId(1704)),
             inputs: vec![PortId(636), PortId(637)],
             output: PortId(638),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28708, 28749),
@@ -5981,7 +5981,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(529),
-            target: TransformTarget::Callable(DeclarationId(1658)),
+            target: TransformTarget::Callable(DeclarationId(1659)),
             inputs: vec![PortId(640)],
             output: PortId(641),
             span: SourceSpan::new("src/v3/std/induction.dag", 29099, 29114),
@@ -6054,7 +6054,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(538),
-            target: TransformTarget::Callable(DeclarationId(1666)),
+            target: TransformTarget::Callable(DeclarationId(1667)),
             inputs: vec![PortId(653)],
             output: PortId(654),
             span: SourceSpan::new("src/v3/std/induction.dag", 29338, 29412),
@@ -6068,7 +6068,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(540),
-            target: TransformTarget::Callable(DeclarationId(1666)),
+            target: TransformTarget::Callable(DeclarationId(1667)),
             inputs: vec![PortId(655)],
             output: PortId(656),
             span: SourceSpan::new("src/v3/std/induction.dag", 29433, 29461),
@@ -6082,7 +6082,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(542),
-            target: TransformTarget::Callable(DeclarationId(1666)),
+            target: TransformTarget::Callable(DeclarationId(1667)),
             inputs: vec![PortId(657)],
             output: PortId(658),
             span: SourceSpan::new("src/v3/std/induction.dag", 29480, 29513),
@@ -6209,7 +6209,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(548),
-            target: TransformTarget::Callable(DeclarationId(1666)),
+            target: TransformTarget::Callable(DeclarationId(1667)),
             inputs: vec![PortId(664)],
             output: PortId(665),
             span: SourceSpan::new("src/v3/std/induction.dag", 29645, 29726),
@@ -6234,7 +6234,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(551),
-            target: TransformTarget::Callable(DeclarationId(1666)),
+            target: TransformTarget::Callable(DeclarationId(1667)),
             inputs: vec![PortId(668)],
             output: PortId(669),
             span: SourceSpan::new("src/v3/std/induction.dag", 29761, 29835),
@@ -6320,7 +6320,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(559),
-            target: TransformTarget::Callable(DeclarationId(2069)),
+            target: TransformTarget::Callable(DeclarationId(2070)),
             inputs: vec![PortId(678)],
             output: PortId(679),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3171, 3209),
@@ -6343,7 +6343,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(562),
-            target: TransformTarget::Callable(DeclarationId(2070)),
+            target: TransformTarget::Callable(DeclarationId(2071)),
             inputs: vec![PortId(682)],
             output: PortId(683),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3249, 3287),
@@ -6409,7 +6409,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(567),
-            target: TransformTarget::Callable(DeclarationId(2071)),
+            target: TransformTarget::Callable(DeclarationId(2072)),
             inputs: vec![PortId(688)],
             output: PortId(689),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3408, 3446),
@@ -6432,7 +6432,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(570),
-            target: TransformTarget::Callable(DeclarationId(2072)),
+            target: TransformTarget::Callable(DeclarationId(2073)),
             inputs: vec![PortId(692)],
             output: PortId(693),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3486, 3524),
@@ -6498,7 +6498,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(575),
-            target: TransformTarget::Callable(DeclarationId(2073)),
+            target: TransformTarget::Callable(DeclarationId(2074)),
             inputs: vec![PortId(698)],
             output: PortId(699),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3642, 3680),
@@ -6521,7 +6521,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(578),
-            target: TransformTarget::Callable(DeclarationId(2074)),
+            target: TransformTarget::Callable(DeclarationId(2075)),
             inputs: vec![PortId(702)],
             output: PortId(703),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3720, 3758),
@@ -6587,7 +6587,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(583),
-            target: TransformTarget::Callable(DeclarationId(2075)),
+            target: TransformTarget::Callable(DeclarationId(2076)),
             inputs: vec![PortId(708)],
             output: PortId(709),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3874, 3912),
@@ -6610,7 +6610,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(586),
-            target: TransformTarget::Callable(DeclarationId(2076)),
+            target: TransformTarget::Callable(DeclarationId(2077)),
             inputs: vec![PortId(712)],
             output: PortId(713),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3952, 3990),
@@ -6676,7 +6676,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(591),
-            target: TransformTarget::Callable(DeclarationId(2077)),
+            target: TransformTarget::Callable(DeclarationId(2078)),
             inputs: vec![PortId(718)],
             output: PortId(719),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4106, 4144),
@@ -6699,7 +6699,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(594),
-            target: TransformTarget::Callable(DeclarationId(2078)),
+            target: TransformTarget::Callable(DeclarationId(2079)),
             inputs: vec![PortId(722)],
             output: PortId(723),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4184, 4222),
@@ -6858,7 +6858,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(600),
-            target: TransformTarget::Callable(DeclarationId(2079)),
+            target: TransformTarget::Callable(DeclarationId(2080)),
             inputs: vec![],
             output: PortId(729),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4908, 4913),
@@ -6874,7 +6874,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(602),
-            target: TransformTarget::Callable(DeclarationId(2080)),
+            target: TransformTarget::Callable(DeclarationId(2081)),
             inputs: vec![],
             output: PortId(730),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4973, 4978),
@@ -6890,7 +6890,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(604),
-            target: TransformTarget::Callable(DeclarationId(2081)),
+            target: TransformTarget::Callable(DeclarationId(2082)),
             inputs: vec![],
             output: PortId(731),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5036, 5041),
@@ -6906,7 +6906,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(606),
-            target: TransformTarget::Callable(DeclarationId(2082)),
+            target: TransformTarget::Callable(DeclarationId(2083)),
             inputs: vec![],
             output: PortId(732),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5099, 5104),
@@ -6922,7 +6922,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(608),
-            target: TransformTarget::Callable(DeclarationId(2083)),
+            target: TransformTarget::Callable(DeclarationId(2084)),
             inputs: vec![],
             output: PortId(733),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5163, 5168),
@@ -6938,7 +6938,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(610),
-            target: TransformTarget::Callable(DeclarationId(2084)),
+            target: TransformTarget::Callable(DeclarationId(2085)),
             inputs: vec![],
             output: PortId(734),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5243, 5248),
@@ -6954,7 +6954,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(612),
-            target: TransformTarget::Callable(DeclarationId(2086)),
+            target: TransformTarget::Callable(DeclarationId(2087)),
             inputs: vec![PortId(735)],
             output: PortId(736),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5359, 5370),
@@ -6968,7 +6968,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(614),
-            target: TransformTarget::Callable(DeclarationId(2085)),
+            target: TransformTarget::Callable(DeclarationId(2086)),
             inputs: vec![PortId(736), PortId(737)],
             output: PortId(738),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5346, 5411),
@@ -6991,7 +6991,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(617),
-            target: TransformTarget::Callable(DeclarationId(2087)),
+            target: TransformTarget::Callable(DeclarationId(2088)),
             inputs: vec![PortId(739), PortId(740)],
             output: PortId(741),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5487, 5545),
@@ -7021,7 +7021,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(621),
-            target: TransformTarget::Callable(DeclarationId(2088)),
+            target: TransformTarget::Callable(DeclarationId(2089)),
             inputs: vec![PortId(743), PortId(742), PortId(744)],
             output: PortId(745),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5646, 5771),
@@ -7058,7 +7058,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(626),
-            target: TransformTarget::Callable(DeclarationId(2089)),
+            target: TransformTarget::Callable(DeclarationId(2090)),
             inputs: vec![PortId(748), PortId(749), PortId(750)],
             output: PortId(751),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5892, 6054),
@@ -7528,7 +7528,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(667),
-            target: TransformTarget::Callable(DeclarationId(2128)),
+            target: TransformTarget::Callable(DeclarationId(2129)),
             inputs: vec![],
             output: PortId(802),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6612, 6622),
@@ -7544,28 +7544,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(669),
-            target: TransformTarget::Callable(DeclarationId(2128)),
+            target: TransformTarget::Callable(DeclarationId(2129)),
             inputs: vec![],
             output: PortId(806),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6930, 6940),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(670),
-            target: TransformTarget::Callable(DeclarationId(2128)),
+            target: TransformTarget::Callable(DeclarationId(2129)),
             inputs: vec![],
             output: PortId(807),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6992, 7002),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(671),
-            target: TransformTarget::Callable(DeclarationId(2130)),
+            target: TransformTarget::Callable(DeclarationId(2131)),
             inputs: vec![],
             output: PortId(808),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7020, 7025),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(672),
-            target: TransformTarget::Callable(DeclarationId(2130)),
+            target: TransformTarget::Callable(DeclarationId(2131)),
             inputs: vec![],
             output: PortId(809),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7047, 7052),
@@ -7581,7 +7581,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(674),
-            target: TransformTarget::Callable(DeclarationId(2130)),
+            target: TransformTarget::Callable(DeclarationId(2131)),
             inputs: vec![],
             output: PortId(812),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7089, 7094),
@@ -7636,21 +7636,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(676),
-            target: TransformTarget::Callable(DeclarationId(2128)),
+            target: TransformTarget::Callable(DeclarationId(2129)),
             inputs: vec![],
             output: PortId(814),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7158, 7168),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(677),
-            target: TransformTarget::Callable(DeclarationId(2130)),
+            target: TransformTarget::Callable(DeclarationId(2131)),
             inputs: vec![],
             output: PortId(815),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7186, 7191),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(678),
-            target: TransformTarget::Callable(DeclarationId(2129)),
+            target: TransformTarget::Callable(DeclarationId(2130)),
             inputs: vec![],
             output: PortId(816),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7213, 7222),
@@ -7666,7 +7666,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(680),
-            target: TransformTarget::Callable(DeclarationId(2129)),
+            target: TransformTarget::Callable(DeclarationId(2130)),
             inputs: vec![],
             output: PortId(819),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7259, 7268),
@@ -7730,21 +7730,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(683),
-            target: TransformTarget::Callable(DeclarationId(2128)),
+            target: TransformTarget::Callable(DeclarationId(2129)),
             inputs: vec![],
             output: PortId(823),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7348, 7358),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(684),
-            target: TransformTarget::Callable(DeclarationId(2130)),
+            target: TransformTarget::Callable(DeclarationId(2131)),
             inputs: vec![],
             output: PortId(824),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7376, 7381),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(685),
-            target: TransformTarget::Callable(DeclarationId(2129)),
+            target: TransformTarget::Callable(DeclarationId(2130)),
             inputs: vec![],
             output: PortId(825),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7403, 7412),
@@ -7792,7 +7792,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(691),
-            target: TransformTarget::Callable(DeclarationId(2127)),
+            target: TransformTarget::Callable(DeclarationId(2128)),
             inputs: vec![PortId(831)],
             output: PortId(832),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7491, 7544),
@@ -7851,7 +7851,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(696),
-            target: TransformTarget::Callable(DeclarationId(2127)),
+            target: TransformTarget::Callable(DeclarationId(2128)),
             inputs: vec![PortId(836)],
             output: PortId(837),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7572, 7660),
@@ -8043,7 +8043,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(708),
-            target: TransformTarget::Callable(DeclarationId(2127)),
+            target: TransformTarget::Callable(DeclarationId(2128)),
             inputs: vec![PortId(847)],
             output: PortId(848),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7997, 8038),
@@ -8082,7 +8082,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(713),
-            target: TransformTarget::Callable(DeclarationId(2132)),
+            target: TransformTarget::Callable(DeclarationId(2133)),
             inputs: vec![],
             output: PortId(853),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8292, 8297),
@@ -8221,14 +8221,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(722),
-            target: TransformTarget::Callable(DeclarationId(1886)),
+            target: TransformTarget::Callable(DeclarationId(1887)),
             inputs: vec![],
             output: PortId(868),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9047, 9059),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(723),
-            target: TransformTarget::Callable(DeclarationId(1892)),
+            target: TransformTarget::Callable(DeclarationId(1893)),
             inputs: vec![PortId(868)],
             output: PortId(869),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9034, 9060),
@@ -8336,7 +8336,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(737),
-            target: TransformTarget::Callable(DeclarationId(1920)),
+            target: TransformTarget::Callable(DeclarationId(1921)),
             inputs: vec![PortId(883)],
             output: PortId(884),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10151, 10263),
@@ -8357,7 +8357,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(740),
-            target: TransformTarget::Callable(DeclarationId(1920)),
+            target: TransformTarget::Callable(DeclarationId(1921)),
             inputs: vec![PortId(886)],
             output: PortId(887),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10291, 10472),
@@ -8417,7 +8417,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(745),
-            target: TransformTarget::Callable(DeclarationId(1920)),
+            target: TransformTarget::Callable(DeclarationId(1921)),
             inputs: vec![PortId(892)],
             output: PortId(893),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10508, 10669),
@@ -8519,21 +8519,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(752),
-            target: TransformTarget::Callable(DeclarationId(2128)),
+            target: TransformTarget::Callable(DeclarationId(2129)),
             inputs: vec![],
             output: PortId(904),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11299, 11309),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(753),
-            target: TransformTarget::Callable(DeclarationId(2129)),
+            target: TransformTarget::Callable(DeclarationId(2130)),
             inputs: vec![],
             output: PortId(905),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11327, 11336),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(754),
-            target: TransformTarget::Callable(DeclarationId(2130)),
+            target: TransformTarget::Callable(DeclarationId(2131)),
             inputs: vec![],
             output: PortId(906),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11350, 11355),
@@ -8618,7 +8618,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(760),
-            target: TransformTarget::Callable(DeclarationId(2133)),
+            target: TransformTarget::Callable(DeclarationId(2134)),
             inputs: vec![PortId(913)],
             output: PortId(914),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12279, 12320),
@@ -8632,7 +8632,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(762),
-            target: TransformTarget::Callable(DeclarationId(2134)),
+            target: TransformTarget::Callable(DeclarationId(2135)),
             inputs: vec![PortId(915)],
             output: PortId(916),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12326, 12367),
@@ -8687,7 +8687,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(767),
-            target: TransformTarget::Callable(DeclarationId(2135)),
+            target: TransformTarget::Callable(DeclarationId(2136)),
             inputs: vec![PortId(921)],
             output: PortId(922),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12430, 12471),
@@ -8701,7 +8701,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(769),
-            target: TransformTarget::Callable(DeclarationId(2136)),
+            target: TransformTarget::Callable(DeclarationId(2137)),
             inputs: vec![PortId(923)],
             output: PortId(924),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12477, 12518),
@@ -8756,7 +8756,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(774),
-            target: TransformTarget::Callable(DeclarationId(2137)),
+            target: TransformTarget::Callable(DeclarationId(2138)),
             inputs: vec![PortId(929)],
             output: PortId(930),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12578, 12619),
@@ -8770,7 +8770,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(776),
-            target: TransformTarget::Callable(DeclarationId(2138)),
+            target: TransformTarget::Callable(DeclarationId(2139)),
             inputs: vec![PortId(931)],
             output: PortId(932),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12625, 12666),
@@ -8825,7 +8825,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(781),
-            target: TransformTarget::Callable(DeclarationId(2139)),
+            target: TransformTarget::Callable(DeclarationId(2140)),
             inputs: vec![PortId(937)],
             output: PortId(938),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12724, 12765),
@@ -8839,7 +8839,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(783),
-            target: TransformTarget::Callable(DeclarationId(2140)),
+            target: TransformTarget::Callable(DeclarationId(2141)),
             inputs: vec![PortId(939)],
             output: PortId(940),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12771, 12812),
@@ -8894,7 +8894,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(788),
-            target: TransformTarget::Callable(DeclarationId(2141)),
+            target: TransformTarget::Callable(DeclarationId(2142)),
             inputs: vec![PortId(945)],
             output: PortId(946),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12870, 12911),
@@ -8908,7 +8908,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(790),
-            target: TransformTarget::Callable(DeclarationId(2142)),
+            target: TransformTarget::Callable(DeclarationId(2143)),
             inputs: vec![PortId(947)],
             output: PortId(948),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12917, 12958),
@@ -9043,14 +9043,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(797),
-            target: TransformTarget::Callable(DeclarationId(1919)),
+            target: TransformTarget::Callable(DeclarationId(1920)),
             inputs: vec![],
             output: PortId(957),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13142, 13154),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(798),
-            target: TransformTarget::Callable(DeclarationId(1919)),
+            target: TransformTarget::Callable(DeclarationId(1920)),
             inputs: vec![],
             output: PortId(958),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13160, 13172),
@@ -9168,14 +9168,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
             target: TransformTarget::Callable(DeclarationId(1285)),
             inputs: vec![PortId(968)],
             output: PortId(969),
-            span: SourceSpan::new("src/v3/std/verification.dag", 27853, 27876),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27858, 27881),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(809),
             target: TransformTarget::Callable(DeclarationId(1286)),
             inputs: vec![PortId(970)],
             output: PortId(971),
-            span: SourceSpan::new("src/v3/std/verification.dag", 27898, 27932),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27903, 27937),
         }));
         nodes.push(Behavior::Branch(BranchNode {
             id: NodeId(810),
@@ -9186,7 +9186,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     output: PortId(969),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Enumerated".to_string(),
-                        span: SourceSpan::new("src/v3/std/verification.dag", 27836, 27849),
+                        span: SourceSpan::new("src/v3/std/verification.dag", 27841, 27854),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "c".to_string(),
@@ -9198,7 +9198,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     output: PortId(971),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Quantified".to_string(),
-                        span: SourceSpan::new("src/v3/std/verification.dag", 27881, 27894),
+                        span: SourceSpan::new("src/v3/std/verification.dag", 27886, 27899),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "q".to_string(),
@@ -9207,7 +9207,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                 },
             ],
             output: PortId(972),
-            span: SourceSpan::new("src/v3/std/verification.dag", 27818, 27936),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27823, 27941),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Bind(BindNode {
@@ -9215,7 +9215,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
             name: "obligation_for_suite_claim".to_string(),
             value: PortId(972),
             params: vec![PortId(967)],
-            span: SourceSpan::new("src/v3/std/verification.dag", 27818, 27936),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27823, 27941),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
@@ -9834,7 +9834,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(2870);
+        let mut declarations = Vec::with_capacity(2871);
         declarations.push(Declaration {
             id: DeclarationId(0),
             name: Some("Classical".to_string()),
@@ -24042,11 +24042,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Empty".to_string(),
-                        ty: DeclarationId(1429),
+                        ty: DeclarationId(1430),
                     },
                     Field {
                         label: "Cons".to_string(),
-                        ty: DeclarationId(1431),
+                        ty: DeclarationId(1432),
                     },
                 ],
             },
@@ -24079,7 +24079,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1399),
+                output: DeclarationId(1400),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3273, 3284)),
             },
             type_params: vec![DeclarationId(688)],
@@ -24110,8 +24110,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(689),
             name: Some("cons".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(690), DeclarationId(1400)],
-                output: DeclarationId(1401),
+                inputs: vec![DeclarationId(690), DeclarationId(1401)],
+                output: DeclarationId(1402),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3453, 3475)),
             },
             type_params: vec![DeclarationId(690)],
@@ -24143,7 +24143,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("singleton".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(692)],
-                output: DeclarationId(1402),
+                output: DeclarationId(1403),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3570, 3590)),
             },
             type_params: vec![DeclarationId(692)],
@@ -24174,7 +24174,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(693),
             name: Some("fold".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1403), DeclarationId(695), DeclarationId(1404)],
+                inputs: vec![DeclarationId(1404), DeclarationId(695), DeclarationId(1405)],
                 output: DeclarationId(695),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4203, 4307)),
             },
@@ -24220,7 +24220,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(696),
             name: Some("fold_right".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1405), DeclarationId(698), DeclarationId(1406)],
+                inputs: vec![DeclarationId(1406), DeclarationId(698), DeclarationId(1407)],
                 output: DeclarationId(698),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4658, 4768)),
             },
@@ -24266,8 +24266,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(699),
             name: Some("concat".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1407), DeclarationId(1408)],
-                output: DeclarationId(1409),
+                inputs: vec![DeclarationId(1408), DeclarationId(1409)],
+                output: DeclarationId(1410),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5386, 5414)),
             },
             type_params: vec![DeclarationId(700)],
@@ -24298,8 +24298,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(701),
             name: Some("map".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1410), DeclarationId(1411)],
-                output: DeclarationId(1412),
+                inputs: vec![DeclarationId(1411), DeclarationId(1412)],
+                output: DeclarationId(1413),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5721, 5778)),
             },
             type_params: vec![DeclarationId(702), DeclarationId(703)],
@@ -24344,8 +24344,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(704),
             name: Some("filter".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1413), DeclarationId(1414)],
-                output: DeclarationId(1415),
+                inputs: vec![DeclarationId(1414), DeclarationId(1415)],
+                output: DeclarationId(1416),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5905, 5988)),
             },
             type_params: vec![DeclarationId(705)],
@@ -24376,8 +24376,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(706),
             name: Some("flat_map".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1416), DeclarationId(1418)],
-                output: DeclarationId(1419),
+                inputs: vec![DeclarationId(1417), DeclarationId(1419)],
+                output: DeclarationId(1420),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6171, 6230)),
             },
             type_params: vec![DeclarationId(707), DeclarationId(708)],
@@ -24422,7 +24422,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(709),
             name: Some("length".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1420)],
+                inputs: vec![DeclarationId(1421)],
                 output: DeclarationId(93),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6372, 6409)),
             },
@@ -24454,7 +24454,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(711),
             name: Some("is_empty".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1421)],
+                inputs: vec![DeclarationId(1422)],
                 output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6605, 6671)),
             },
@@ -24525,8 +24525,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(715),
             name: Some("enumerate".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1422)],
-                output: DeclarationId(1424),
+                inputs: vec![DeclarationId(1423)],
+                output: DeclarationId(1425),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7238, 7269)),
             },
             type_params: vec![DeclarationId(716)],
@@ -24557,8 +24557,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(717),
             name: Some("enumerate_helper".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1425), DeclarationId(93)],
-                output: DeclarationId(1427),
+                inputs: vec![DeclarationId(1426), DeclarationId(93)],
+                output: DeclarationId(1428),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7463, 7644)),
             },
             type_params: vec![DeclarationId(718)],
@@ -24589,7 +24589,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(719),
             name: Some("contains".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1428), DeclarationId(720)],
+                inputs: vec![DeclarationId(1429), DeclarationId(720)],
                 output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 8205, 8332)),
             },
@@ -24684,7 +24684,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "rest".to_string(),
-                        ty: DeclarationId(1432),
+                        ty: DeclarationId(1433),
                     },
                 ],
             },
@@ -24727,7 +24727,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "rest".to_string(),
-                        ty: DeclarationId(1433),
+                        ty: DeclarationId(1434),
                     },
                 ],
             },
@@ -24762,11 +24762,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LiteralToken".to_string(),
-                        ty: DeclarationId(1448),
+                        ty: DeclarationId(1449),
                     },
                     Field {
                         label: "ParamToken".to_string(),
-                        ty: DeclarationId(1449),
+                        ty: DeclarationId(1450),
                     },
                 ],
             },
@@ -24786,7 +24786,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tokens".to_string(),
-                    ty: DeclarationId(1450),
+                    ty: DeclarationId(1451),
                 }],
             },
             type_params: vec![],
@@ -24806,11 +24806,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ParsedSegmentTokens".to_string(),
-                        ty: DeclarationId(1452),
+                        ty: DeclarationId(1453),
                     },
                     Field {
                         label: "MalformedPathSegment".to_string(),
-                        ty: DeclarationId(1453),
+                        ty: DeclarationId(1454),
                     },
                 ],
             },
@@ -24831,11 +24831,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ParsedPathTemplate".to_string(),
-                        ty: DeclarationId(1454),
+                        ty: DeclarationId(1455),
                     },
                     Field {
                         label: "MalformedPathTemplate".to_string(),
-                        ty: DeclarationId(1455),
+                        ty: DeclarationId(1456),
                     },
                 ],
             },
@@ -24890,7 +24890,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("last_path_param".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(730)],
-                output: DeclarationId(1434),
+                output: DeclarationId(1435),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 11761, 12044)),
             },
             type_params: vec![],
@@ -24910,15 +24910,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ReadEffect".to_string(),
-                        ty: DeclarationId(1456),
+                        ty: DeclarationId(1457),
                     },
                     Field {
                         label: "UpsertEffect".to_string(),
-                        ty: DeclarationId(1457),
+                        ty: DeclarationId(1458),
                     },
                     Field {
                         label: "DeleteEffect".to_string(),
-                        ty: DeclarationId(1458),
+                        ty: DeclarationId(1459),
                     },
                 ],
             },
@@ -24939,11 +24939,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "CreateEffect".to_string(),
-                        ty: DeclarationId(1459),
+                        ty: DeclarationId(1460),
                     },
                     Field {
                         label: "AppendEffect".to_string(),
-                        ty: DeclarationId(1460),
+                        ty: DeclarationId(1461),
                     },
                 ],
             },
@@ -24964,11 +24964,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IsIdempotent".to_string(),
-                        ty: DeclarationId(1461),
+                        ty: DeclarationId(1462),
                     },
                     Field {
                         label: "IsBreaking".to_string(),
-                        ty: DeclarationId(1462),
+                        ty: DeclarationId(1463),
                     },
                 ],
             },
@@ -24989,11 +24989,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "PostAlways".to_string(),
-                        ty: DeclarationId(1463),
+                        ty: DeclarationId(1464),
                     },
                     Field {
                         label: "KeylessFallback".to_string(),
-                        ty: DeclarationId(1464),
+                        ty: DeclarationId(1465),
                     },
                 ],
             },
@@ -25014,15 +25014,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "PathParam".to_string(),
-                        ty: DeclarationId(1465),
+                        ty: DeclarationId(1466),
                     },
                     Field {
                         label: "InputField".to_string(),
-                        ty: DeclarationId(1466),
+                        ty: DeclarationId(1467),
                     },
                     Field {
                         label: "CompositeKey".to_string(),
-                        ty: DeclarationId(1468),
+                        ty: DeclarationId(1469),
                     },
                 ],
             },
@@ -25043,15 +25043,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LatticeEffect".to_string(),
-                        ty: DeclarationId(1469),
+                        ty: DeclarationId(1470),
                     },
                     Field {
                         label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(1470),
+                        ty: DeclarationId(1471),
                     },
                     Field {
                         label: "NonIdempotent".to_string(),
-                        ty: DeclarationId(1471),
+                        ty: DeclarationId(1472),
                     },
                 ],
             },
@@ -25133,15 +25133,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DerivedEffect".to_string(),
-                        ty: DeclarationId(1472),
+                        ty: DeclarationId(1473),
                     },
                     Field {
                         label: "UnknownHttpMethodInput".to_string(),
-                        ty: DeclarationId(1473),
+                        ty: DeclarationId(1474),
                     },
                     Field {
                         label: "MalformedPathInput".to_string(),
-                        ty: DeclarationId(1474),
+                        ty: DeclarationId(1475),
                     },
                 ],
             },
@@ -25162,11 +25162,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IdempotentComposition".to_string(),
-                        ty: DeclarationId(1475),
+                        ty: DeclarationId(1476),
                     },
                     Field {
                         label: "BrokenBy".to_string(),
-                        ty: DeclarationId(1477),
+                        ty: DeclarationId(1478),
                     },
                 ],
             },
@@ -25203,7 +25203,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(1435),
+                output: DeclarationId(1436),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20944, 20966)),
             },
             type_params: vec![],
@@ -25220,8 +25220,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(749),
             name: Some("indexed_breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1436)],
-                output: DeclarationId(1438),
+                inputs: vec![DeclarationId(1437)],
+                output: DeclarationId(1439),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21060, 21153)),
             },
             type_params: vec![],
@@ -25238,8 +25238,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(750),
             name: Some("first_breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1439)],
-                output: DeclarationId(1441),
+                inputs: vec![DeclarationId(1440)],
+                output: DeclarationId(1442),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21240, 21423)),
             },
             type_params: vec![],
@@ -25256,7 +25256,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(751),
             name: Some("compose_effects".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1442)],
+                inputs: vec![DeclarationId(1443)],
                 output: DeclarationId(746),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22313, 22436)),
             },
@@ -25321,19 +25321,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LinearEffect".to_string(),
-                        ty: DeclarationId(1479),
+                        ty: DeclarationId(1480),
                     },
                     Field {
                         label: "BranchEffect".to_string(),
-                        ty: DeclarationId(1481),
+                        ty: DeclarationId(1482),
                     },
                     Field {
                         label: "LoopEffect".to_string(),
-                        ty: DeclarationId(1482),
+                        ty: DeclarationId(1483),
                     },
                     Field {
                         label: "ParallelEffect".to_string(),
-                        ty: DeclarationId(1484),
+                        ty: DeclarationId(1485),
                     },
                 ],
             },
@@ -25383,11 +25383,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "WorkflowCompositionVerdict".to_string(),
-                        ty: DeclarationId(1485),
+                        ty: DeclarationId(1486),
                     },
                     Field {
                         label: "IdempotencyUnsupported".to_string(),
-                        ty: DeclarationId(1486),
+                        ty: DeclarationId(1487),
                     },
                 ],
             },
@@ -25426,23 +25426,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NoWorkflowProjection".to_string(),
-                        ty: DeclarationId(1487),
+                        ty: DeclarationId(1488),
                     },
                     Field {
                         label: "NotParallelEffectRoot".to_string(),
-                        ty: DeclarationId(1488),
+                        ty: DeclarationId(1489),
                     },
                     Field {
                         label: "NonLinearParallelBranch".to_string(),
-                        ty: DeclarationId(1489),
+                        ty: DeclarationId(1490),
                     },
                     Field {
                         label: "PairwiseNonCommute".to_string(),
-                        ty: DeclarationId(1490),
+                        ty: DeclarationId(1491),
                     },
                     Field {
                         label: "LensSurfacePending".to_string(),
-                        ty: DeclarationId(1491),
+                        ty: DeclarationId(1492),
                     },
                 ],
             },
@@ -25492,11 +25492,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ParallelCompositionVerdict".to_string(),
-                        ty: DeclarationId(1492),
+                        ty: DeclarationId(1493),
                     },
                     Field {
                         label: "ParallelismUnsupported".to_string(),
-                        ty: DeclarationId(1493),
+                        ty: DeclarationId(1494),
                     },
                 ],
             },
@@ -25551,7 +25551,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("parse_http_method".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230)],
-                output: DeclarationId(1443),
+                output: DeclarationId(1444),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 29707, 30005)),
             },
             type_params: vec![],
@@ -25586,7 +25586,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(765),
             name: Some("upsert_or_create".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1444), DeclarationId(198)],
+                inputs: vec![DeclarationId(1445), DeclarationId(198)],
                 output: DeclarationId(738),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30476, 30628)),
             },
@@ -25604,7 +25604,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(766),
             name: Some("delete_or_create".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1445), DeclarationId(198)],
+                inputs: vec![DeclarationId(1446), DeclarationId(198)],
                 output: DeclarationId(738),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30706, 30858)),
             },
@@ -25661,15 +25661,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Agrees".to_string(),
-                        ty: DeclarationId(1494),
+                        ty: DeclarationId(1495),
                     },
                     Field {
                         label: "Disagrees".to_string(),
-                        ty: DeclarationId(1495),
+                        ty: DeclarationId(1496),
                     },
                     Field {
                         label: "DerivationUnknown".to_string(),
-                        ty: DeclarationId(1496),
+                        ty: DeclarationId(1497),
                     },
                 ],
             },
@@ -25690,11 +25690,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ModifierNotDeclared".to_string(),
-                        ty: DeclarationId(1497),
+                        ty: DeclarationId(1498),
                     },
                     Field {
                         label: "ModifierDeclared".to_string(),
-                        ty: DeclarationId(1498),
+                        ty: DeclarationId(1499),
                     },
                 ],
             },
@@ -25832,8 +25832,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(776),
             name: Some("generate_idempotency_obligations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1446)],
-                output: DeclarationId(1447),
+                inputs: vec![DeclarationId(1447)],
+                output: DeclarationId(1448),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 36640, 36910)),
             },
             type_params: vec![],
@@ -25926,15 +25926,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Uninferred".to_string(),
-                        ty: DeclarationId(1507),
+                        ty: DeclarationId(1508),
                     },
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(1508),
+                        ty: DeclarationId(1509),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(1509),
+                        ty: DeclarationId(1510),
                     },
                 ],
             },
@@ -25963,7 +25963,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "produced_by".to_string(),
-                        ty: DeclarationId(1510),
+                        ty: DeclarationId(1511),
                     },
                 ],
             },
@@ -25984,15 +25984,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LitInt".to_string(),
-                        ty: DeclarationId(1511),
+                        ty: DeclarationId(1512),
                     },
                     Field {
                         label: "LitBool".to_string(),
-                        ty: DeclarationId(1512),
+                        ty: DeclarationId(1513),
                     },
                     Field {
                         label: "LitString".to_string(),
-                        ty: DeclarationId(1513),
+                        ty: DeclarationId(1514),
                     },
                 ],
             },
@@ -26013,23 +26013,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(1514),
+                        ty: DeclarationId(1515),
                     },
                     Field {
                         label: "UnresolvedIdentifier".to_string(),
-                        ty: DeclarationId(1515),
+                        ty: DeclarationId(1516),
                     },
                     Field {
                         label: "ResolvedByStructure".to_string(),
-                        ty: DeclarationId(1516),
+                        ty: DeclarationId(1517),
                     },
                     Field {
                         label: "ResolvedByName".to_string(),
-                        ty: DeclarationId(1517),
+                        ty: DeclarationId(1518),
                     },
                     Field {
                         label: "TypeParam".to_string(),
-                        ty: DeclarationId(1518),
+                        ty: DeclarationId(1519),
                     },
                 ],
             },
@@ -26050,15 +26050,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "OneUnit".to_string(),
-                        ty: DeclarationId(1519),
+                        ty: DeclarationId(1520),
                     },
                     Field {
                         label: "AdditionalUnit".to_string(),
-                        ty: DeclarationId(1520),
+                        ty: DeclarationId(1521),
                     },
                     Field {
                         label: "UnitCount".to_string(),
-                        ty: DeclarationId(1521),
+                        ty: DeclarationId(1522),
                     },
                 ],
             },
@@ -26079,11 +26079,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ZeroWidth".to_string(),
-                        ty: DeclarationId(1522),
+                        ty: DeclarationId(1523),
                     },
                     Field {
                         label: "PositiveWidth".to_string(),
-                        ty: DeclarationId(1523),
+                        ty: DeclarationId(1524),
                     },
                 ],
             },
@@ -26104,11 +26104,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "BoundedInterval".to_string(),
-                        ty: DeclarationId(1524),
+                        ty: DeclarationId(1525),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1525),
+                        ty: DeclarationId(1526),
                     },
                 ],
             },
@@ -26163,11 +26163,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "StaticBound".to_string(),
-                        ty: DeclarationId(1527),
+                        ty: DeclarationId(1528),
                     },
                     Field {
                         label: "PlatformDependent".to_string(),
-                        ty: DeclarationId(1528),
+                        ty: DeclarationId(1529),
                     },
                 ],
             },
@@ -26188,15 +26188,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Exact".to_string(),
-                        ty: DeclarationId(1529),
+                        ty: DeclarationId(1530),
                     },
                     Field {
                         label: "AtMostOne".to_string(),
-                        ty: DeclarationId(1530),
+                        ty: DeclarationId(1531),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1531),
+                        ty: DeclarationId(1532),
                     },
                 ],
             },
@@ -26292,27 +26292,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(1532),
+                        ty: DeclarationId(1533),
                     },
                     Field {
                         label: "Reference".to_string(),
-                        ty: DeclarationId(1533),
+                        ty: DeclarationId(1534),
                     },
                     Field {
                         label: "Record".to_string(),
-                        ty: DeclarationId(1535),
+                        ty: DeclarationId(1536),
                     },
                     Field {
                         label: "List".to_string(),
-                        ty: DeclarationId(1537),
+                        ty: DeclarationId(1538),
                     },
                     Field {
                         label: "Map".to_string(),
-                        ty: DeclarationId(1539),
+                        ty: DeclarationId(1540),
                     },
                     Field {
                         label: "Variant".to_string(),
-                        ty: DeclarationId(1541),
+                        ty: DeclarationId(1542),
                     },
                 ],
             },
@@ -26333,23 +26333,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ValueBodyUnparsed".to_string(),
-                        ty: DeclarationId(1542),
+                        ty: DeclarationId(1543),
                     },
                     Field {
                         label: "ValueBodyStructural".to_string(),
-                        ty: DeclarationId(1544),
+                        ty: DeclarationId(1545),
                     },
                     Field {
                         label: "ValueBodyScalar".to_string(),
-                        ty: DeclarationId(1545),
+                        ty: DeclarationId(1546),
                     },
                     Field {
                         label: "ValueBodyList".to_string(),
-                        ty: DeclarationId(1547),
+                        ty: DeclarationId(1548),
                     },
                     Field {
                         label: "ValueBodyMap".to_string(),
-                        ty: DeclarationId(1549),
+                        ty: DeclarationId(1550),
                     },
                 ],
             },
@@ -26389,23 +26389,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UserDefined".to_string(),
-                        ty: DeclarationId(1550),
+                        ty: DeclarationId(1551),
                     },
                     Field {
                         label: "ExternalRealization".to_string(),
-                        ty: DeclarationId(1551),
+                        ty: DeclarationId(1552),
                     },
                     Field {
                         label: "Pending".to_string(),
-                        ty: DeclarationId(1552),
+                        ty: DeclarationId(1553),
                     },
                     Field {
                         label: "NoBody".to_string(),
-                        ty: DeclarationId(1553),
+                        ty: DeclarationId(1554),
                     },
                     Field {
                         label: "Unparsed".to_string(),
-                        ty: DeclarationId(1554),
+                        ty: DeclarationId(1555),
                     },
                 ],
             },
@@ -26426,27 +26426,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Atom".to_string(),
-                        ty: DeclarationId(1555),
+                        ty: DeclarationId(1556),
                     },
                     Field {
                         label: "Conj".to_string(),
-                        ty: DeclarationId(1557),
+                        ty: DeclarationId(1558),
                     },
                     Field {
                         label: "Disj".to_string(),
-                        ty: DeclarationId(1559),
+                        ty: DeclarationId(1560),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(1561),
+                        ty: DeclarationId(1562),
                     },
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(1562),
+                        ty: DeclarationId(1563),
                     },
                     Field {
                         label: "Instantiation".to_string(),
-                        ty: DeclarationId(1564),
+                        ty: DeclarationId(1565),
                     },
                 ],
             },
@@ -26471,7 +26471,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(1565),
+                        ty: DeclarationId(1566),
                     },
                     Field {
                         label: "connective".to_string(),
@@ -26479,27 +26479,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(1566),
+                        ty: DeclarationId(1567),
                     },
                     Field {
                         label: "phantom_params".to_string(),
-                        ty: DeclarationId(1567),
+                        ty: DeclarationId(1568),
                     },
                     Field {
                         label: "meta_tag".to_string(),
-                        ty: DeclarationId(1568),
+                        ty: DeclarationId(1569),
                     },
                     Field {
                         label: "inhabits".to_string(),
-                        ty: DeclarationId(1569),
+                        ty: DeclarationId(1570),
                     },
                     Field {
                         label: "value_body".to_string(),
-                        ty: DeclarationId(1570),
+                        ty: DeclarationId(1571),
                     },
                     Field {
                         label: "nominal_opacity".to_string(),
-                        ty: DeclarationId(1571),
+                        ty: DeclarationId(1572),
                     },
                     Field {
                         label: "span".to_string(),
@@ -26548,7 +26548,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "permitted_accessors".to_string(),
-                    ty: DeclarationId(1572),
+                    ty: DeclarationId(1573),
                 }],
             },
             type_params: vec![],
@@ -26568,19 +26568,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Add".to_string(),
-                        ty: DeclarationId(1573),
+                        ty: DeclarationId(1574),
                     },
                     Field {
                         label: "Sub".to_string(),
-                        ty: DeclarationId(1574),
+                        ty: DeclarationId(1575),
                     },
                     Field {
                         label: "Mul".to_string(),
-                        ty: DeclarationId(1575),
+                        ty: DeclarationId(1576),
                     },
                     Field {
                         label: "Div".to_string(),
-                        ty: DeclarationId(1576),
+                        ty: DeclarationId(1577),
                     },
                 ],
             },
@@ -26601,27 +26601,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(1577),
+                        ty: DeclarationId(1578),
                     },
                     Field {
                         label: "Ne".to_string(),
-                        ty: DeclarationId(1578),
+                        ty: DeclarationId(1579),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(1579),
+                        ty: DeclarationId(1580),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(1580),
+                        ty: DeclarationId(1581),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(1581),
+                        ty: DeclarationId(1582),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(1582),
+                        ty: DeclarationId(1583),
                     },
                 ],
             },
@@ -26667,11 +26667,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "And".to_string(),
-                        ty: DeclarationId(1583),
+                        ty: DeclarationId(1584),
                     },
                     Field {
                         label: "Or".to_string(),
-                        ty: DeclarationId(1584),
+                        ty: DeclarationId(1585),
                     },
                 ],
             },
@@ -26692,15 +26692,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Arithmetic".to_string(),
-                        ty: DeclarationId(1585),
+                        ty: DeclarationId(1586),
                     },
                     Field {
                         label: "Comparison".to_string(),
-                        ty: DeclarationId(1586),
+                        ty: DeclarationId(1587),
                     },
                     Field {
                         label: "Logical".to_string(),
-                        ty: DeclarationId(1587),
+                        ty: DeclarationId(1588),
                     },
                 ],
             },
@@ -26721,19 +26721,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Callable".to_string(),
-                        ty: DeclarationId(1588),
+                        ty: DeclarationId(1589),
                     },
                     Field {
                         label: "UnresolvedFieldProject".to_string(),
-                        ty: DeclarationId(1589),
+                        ty: DeclarationId(1590),
                     },
                     Field {
                         label: "ResolvedFieldProject".to_string(),
-                        ty: DeclarationId(1590),
+                        ty: DeclarationId(1591),
                     },
                     Field {
                         label: "Operator".to_string(),
-                        ty: DeclarationId(1591),
+                        ty: DeclarationId(1592),
                     },
                 ],
             },
@@ -26754,11 +26754,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UnresolvedVariant".to_string(),
-                        ty: DeclarationId(1592),
+                        ty: DeclarationId(1593),
                     },
                     Field {
                         label: "ResolvedVariant".to_string(),
-                        ty: DeclarationId(1593),
+                        ty: DeclarationId(1594),
                     },
                 ],
             },
@@ -26816,7 +26816,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "binding".to_string(),
-                        ty: DeclarationId(1594),
+                        ty: DeclarationId(1595),
                     },
                 ],
             },
@@ -26952,11 +26952,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "members".to_string(),
-                        ty: DeclarationId(1595),
+                        ty: DeclarationId(1596),
                     },
                     Field {
                         label: "intra_cluster_calls".to_string(),
-                        ty: DeclarationId(1596),
+                        ty: DeclarationId(1597),
                     },
                 ],
             },
@@ -26977,11 +26977,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(1597),
+                        ty: DeclarationId(1598),
                     },
                     Field {
                         label: "Descent".to_string(),
-                        ty: DeclarationId(1598),
+                        ty: DeclarationId(1599),
                     },
                 ],
             },
@@ -27036,7 +27036,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "lane2_workflow".to_string(),
-                        ty: DeclarationId(1599),
+                        ty: DeclarationId(1600),
                     },
                 ],
             },
@@ -27065,7 +27065,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(1600),
+                        ty: DeclarationId(1601),
                     },
                     Field {
                         label: "result_port".to_string(),
@@ -27093,7 +27093,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "UserMatch".to_string(),
-                    ty: DeclarationId(1601),
+                    ty: DeclarationId(1602),
                 }],
             },
             type_params: vec![],
@@ -27121,7 +27121,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "paths".to_string(),
-                        ty: DeclarationId(1602),
+                        ty: DeclarationId(1603),
                     },
                     Field {
                         label: "result_port".to_string(),
@@ -27133,7 +27133,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "emit_participation".to_string(),
-                        ty: DeclarationId(1603),
+                        ty: DeclarationId(1604),
                     },
                 ],
             },
@@ -27198,7 +27198,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "UserCallable".to_string(),
-                    ty: DeclarationId(1604),
+                    ty: DeclarationId(1605),
                 }],
             },
             type_params: vec![],
@@ -27230,7 +27230,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(1605),
+                        ty: DeclarationId(1606),
                     },
                     Field {
                         label: "span".to_string(),
@@ -27238,11 +27238,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "lane2_workflow".to_string(),
-                        ty: DeclarationId(1606),
+                        ty: DeclarationId(1607),
                     },
                     Field {
                         label: "emit_participation".to_string(),
-                        ty: DeclarationId(1607),
+                        ty: DeclarationId(1608),
                     },
                 ],
             },
@@ -27263,23 +27263,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Value".to_string(),
-                        ty: DeclarationId(1608),
+                        ty: DeclarationId(1609),
                     },
                     Field {
                         label: "Transform".to_string(),
-                        ty: DeclarationId(1609),
+                        ty: DeclarationId(1610),
                     },
                     Field {
                         label: "Branch".to_string(),
-                        ty: DeclarationId(1610),
+                        ty: DeclarationId(1611),
                     },
                     Field {
                         label: "Loop".to_string(),
-                        ty: DeclarationId(1611),
+                        ty: DeclarationId(1612),
                     },
                     Field {
                         label: "Bind".to_string(),
-                        ty: DeclarationId(1612),
+                        ty: DeclarationId(1613),
                     },
                 ],
             },
@@ -27300,19 +27300,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "declarations".to_string(),
-                        ty: DeclarationId(1613),
+                        ty: DeclarationId(1614),
                     },
                     Field {
                         label: "nodes".to_string(),
-                        ty: DeclarationId(1614),
+                        ty: DeclarationId(1615),
                     },
                     Field {
                         label: "ports".to_string(),
-                        ty: DeclarationId(1615),
+                        ty: DeclarationId(1616),
                     },
                     Field {
                         label: "clusters".to_string(),
-                        ty: DeclarationId(1616),
+                        ty: DeclarationId(1617),
                     },
                 ],
             },
@@ -27379,7 +27379,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("port".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(722)],
-                output: DeclarationId(1499),
+                output: DeclarationId(1500),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22297,
@@ -27401,7 +27401,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("node".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-                output: DeclarationId(1500),
+                output: DeclarationId(1501),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22355,
@@ -27423,7 +27423,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("resolve_producer".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(722)],
-                output: DeclarationId(1501),
+                output: DeclarationId(1502),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22430,
@@ -27445,7 +27445,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("declaration_by_id".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(723)],
-                output: DeclarationId(1502),
+                output: DeclarationId(1503),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22819,
@@ -27467,7 +27467,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("declaration_by_name".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(230)],
-                output: DeclarationId(1503),
+                output: DeclarationId(1504),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     23694,
@@ -27489,7 +27489,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("lane2_workflow_at".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-                output: DeclarationId(1504),
+                output: DeclarationId(1505),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     24020,
@@ -27513,15 +27513,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "SingleRoot".to_string(),
-                        ty: DeclarationId(1617),
+                        ty: DeclarationId(1618),
                     },
                     Field {
                         label: "NoRoot".to_string(),
-                        ty: DeclarationId(1618),
+                        ty: DeclarationId(1619),
                     },
                     Field {
                         label: "AmbiguousRoot".to_string(),
-                        ty: DeclarationId(1620),
+                        ty: DeclarationId(1621),
                     },
                 ],
             },
@@ -27562,7 +27562,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(1505),
+                output: DeclarationId(1506),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     28025,
@@ -27584,7 +27584,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(723)],
-                output: DeclarationId(1506),
+                output: DeclarationId(1507),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     28110,
@@ -27627,15 +27627,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ShrinkEffect".to_string(),
-                        ty: DeclarationId(1645),
+                        ty: DeclarationId(1646),
                     },
                     Field {
                         label: "ProjectionEffect".to_string(),
-                        ty: DeclarationId(1646),
+                        ty: DeclarationId(1647),
                     },
                     Field {
                         label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(1647),
+                        ty: DeclarationId(1648),
                     },
                 ],
             },
@@ -27656,19 +27656,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ShapeConstant".to_string(),
-                        ty: DeclarationId(1648),
+                        ty: DeclarationId(1649),
                     },
                     Field {
                         label: "ShapeLinearScan".to_string(),
-                        ty: DeclarationId(1649),
+                        ty: DeclarationId(1650),
                     },
                     Field {
                         label: "ShapeIterateBody".to_string(),
-                        ty: DeclarationId(1650),
+                        ty: DeclarationId(1651),
                     },
                     Field {
                         label: "ShapeSortBody".to_string(),
-                        ty: DeclarationId(1651),
+                        ty: DeclarationId(1652),
                     },
                 ],
             },
@@ -27697,15 +27697,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "size_effect".to_string(),
-                        ty: DeclarationId(1652),
+                        ty: DeclarationId(1653),
                     },
                     Field {
                         label: "cost_shape".to_string(),
-                        ty: DeclarationId(1653),
+                        ty: DeclarationId(1654),
                     },
                     Field {
                         label: "callback_element_position".to_string(),
-                        ty: DeclarationId(1654),
+                        ty: DeclarationId(1655),
                     },
                 ],
             },
@@ -27730,7 +27730,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "display_name".to_string(),
-                        ty: DeclarationId(1655),
+                        ty: DeclarationId(1656),
                     },
                 ],
             },
@@ -27787,11 +27787,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DegreeTwo".to_string(),
-                        ty: DeclarationId(1656),
+                        ty: DeclarationId(1657),
                     },
                     Field {
                         label: "DegreeSuccessor".to_string(),
-                        ty: DeclarationId(1657),
+                        ty: DeclarationId(1658),
                     },
                 ],
             },
@@ -27812,31 +27812,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ConstantCost".to_string(),
-                        ty: DeclarationId(1658),
+                        ty: DeclarationId(1659),
                     },
                     Field {
                         label: "LinearCost".to_string(),
-                        ty: DeclarationId(1659),
+                        ty: DeclarationId(1660),
                     },
                     Field {
                         label: "PolynomialCost".to_string(),
-                        ty: DeclarationId(1660),
+                        ty: DeclarationId(1661),
                     },
                     Field {
                         label: "ProductCost".to_string(),
-                        ty: DeclarationId(1662),
+                        ty: DeclarationId(1663),
                     },
                     Field {
                         label: "SumCost".to_string(),
-                        ty: DeclarationId(1664),
+                        ty: DeclarationId(1665),
                     },
                     Field {
                         label: "LogCost".to_string(),
-                        ty: DeclarationId(1665),
+                        ty: DeclarationId(1666),
                     },
                     Field {
                         label: "UnknownCost".to_string(),
-                        ty: DeclarationId(1666),
+                        ty: DeclarationId(1667),
                     },
                 ],
             },
@@ -27844,7 +27844,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-            inhabits: Some(DeclarationId(1667)),
+            inhabits: Some(DeclarationId(1668)),
             value_body: None,
             refinement: None,
             nominal_opacity: None,
@@ -27898,7 +27898,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(1621),
+                output: DeclarationId(1622),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 10963, 10973)),
             },
             type_params: vec![],
@@ -27916,7 +27916,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(849)],
-                output: DeclarationId(1622),
+                output: DeclarationId(1623),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 11047, 11062)),
             },
             type_params: vec![],
@@ -27934,7 +27934,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("two_terms".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(849), DeclarationId(849)],
-                output: DeclarationId(1623),
+                output: DeclarationId(1624),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(185))),
             },
             type_params: vec![],
@@ -27951,8 +27951,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(855),
             name: Some("many_terms".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849), DeclarationId(849), DeclarationId(1624)],
-                output: DeclarationId(1625),
+                inputs: vec![DeclarationId(849), DeclarationId(849), DeclarationId(1625)],
+                output: DeclarationId(1626),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(187))),
             },
             type_params: vec![],
@@ -28077,7 +28077,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(862),
             name: Some("max_path".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1626)],
+                inputs: vec![DeclarationId(1627)],
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(220))),
             },
@@ -28134,35 +28134,35 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ClassConstant".to_string(),
-                        ty: DeclarationId(1668),
+                        ty: DeclarationId(1669),
                     },
                     Field {
                         label: "ClassLog".to_string(),
-                        ty: DeclarationId(1669),
+                        ty: DeclarationId(1670),
                     },
                     Field {
                         label: "ClassLinear".to_string(),
-                        ty: DeclarationId(1670),
+                        ty: DeclarationId(1671),
                     },
                     Field {
                         label: "ClassLinearithmic".to_string(),
-                        ty: DeclarationId(1671),
+                        ty: DeclarationId(1672),
                     },
                     Field {
                         label: "ClassQuadratic".to_string(),
-                        ty: DeclarationId(1672),
+                        ty: DeclarationId(1673),
                     },
                     Field {
                         label: "ClassPolynomial".to_string(),
-                        ty: DeclarationId(1673),
+                        ty: DeclarationId(1674),
                     },
                     Field {
                         label: "ClassExponential".to_string(),
-                        ty: DeclarationId(1674),
+                        ty: DeclarationId(1675),
                     },
                     Field {
                         label: "ClassUnknown".to_string(),
-                        ty: DeclarationId(1675),
+                        ty: DeclarationId(1676),
                     },
                 ],
             },
@@ -28170,7 +28170,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-            inhabits: Some(DeclarationId(1676)),
+            inhabits: Some(DeclarationId(1677)),
             value_body: None,
             refinement: None,
             nominal_opacity: None,
@@ -28270,8 +28270,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(871),
             name: Some("nsl_to_list".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1627)],
-                output: DeclarationId(1628),
+                inputs: vec![DeclarationId(1628)],
+                output: DeclarationId(1629),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(366))),
             },
             type_params: vec![],
@@ -28288,8 +28288,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(872),
             name: Some("drop_additive_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1629)],
-                output: DeclarationId(1630),
+                inputs: vec![DeclarationId(1630)],
+                output: DeclarationId(1631),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(379))),
             },
             type_params: vec![],
@@ -28306,8 +28306,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(873),
             name: Some("collapse_on_multiplicative_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1631)],
-                output: DeclarationId(1632),
+                inputs: vec![DeclarationId(1632)],
+                output: DeclarationId(1633),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(386))),
             },
             type_params: vec![],
@@ -28324,7 +28324,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(874),
             name: Some("any_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1633)],
+                inputs: vec![DeclarationId(1634)],
                 output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(395))),
             },
@@ -28342,8 +28342,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(875),
             name: Some("drop_multiplicative_one".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1634)],
-                output: DeclarationId(1635),
+                inputs: vec![DeclarationId(1635)],
+                output: DeclarationId(1636),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(408))),
             },
             type_params: vec![],
@@ -28396,7 +28396,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(878),
             name: Some("reduce_sum".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1636)],
+                inputs: vec![DeclarationId(1637)],
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(440))),
             },
@@ -28414,7 +28414,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(879),
             name: Some("wrap_sum".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1637)],
+                inputs: vec![DeclarationId(1638)],
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(452))),
             },
@@ -28432,7 +28432,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(880),
             name: Some("reduce_product".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1638)],
+                inputs: vec![DeclarationId(1639)],
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(469))),
             },
@@ -28581,8 +28581,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(888),
             name: Some("filter_not_dominated_by".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1639), DeclarationId(849)],
-                output: DeclarationId(1640),
+                inputs: vec![DeclarationId(1640), DeclarationId(849)],
+                output: DeclarationId(1641),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(517))),
             },
             type_params: vec![],
@@ -28599,8 +28599,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(889),
             name: Some("drop_dominated_step".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1641), DeclarationId(849)],
-                output: DeclarationId(1642),
+                inputs: vec![DeclarationId(1642), DeclarationId(849)],
+                output: DeclarationId(1643),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(524))),
             },
             type_params: vec![],
@@ -28617,8 +28617,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(890),
             name: Some("drop_dominated".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1643)],
-                output: DeclarationId(1644),
+                inputs: vec![DeclarationId(1644)],
+                output: DeclarationId(1645),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(527))),
             },
             type_params: vec![],
@@ -28638,10 +28638,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 inputs: vec![
                     DeclarationId(147),
                     DeclarationId(230),
-                    DeclarationId(1704),
-                    DeclarationId(93),
                     DeclarationId(1705),
+                    DeclarationId(93),
                     DeclarationId(1706),
+                    DeclarationId(1707),
                 ],
                 output: DeclarationId(912),
                 body: ArrowBody::Unparsed(SourceSpan::new(
@@ -28672,7 +28672,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1707)),
+            meta_tag: Some(DeclarationId(1708)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![])),
@@ -28687,11 +28687,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UserMessage".to_string(),
-                        ty: DeclarationId(1709),
+                        ty: DeclarationId(1710),
                     },
                     Field {
                         label: "AssistantMessage".to_string(),
-                        ty: DeclarationId(1711),
+                        ty: DeclarationId(1712),
                     },
                 ],
             },
@@ -28712,11 +28712,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Base64Image".to_string(),
-                        ty: DeclarationId(1712),
+                        ty: DeclarationId(1713),
                     },
                     Field {
                         label: "UrlImage".to_string(),
-                        ty: DeclarationId(1713),
+                        ty: DeclarationId(1714),
                     },
                 ],
             },
@@ -28737,11 +28737,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "TextContent".to_string(),
-                        ty: DeclarationId(1714),
+                        ty: DeclarationId(1715),
                     },
                     Field {
                         label: "ImageContent".to_string(),
-                        ty: DeclarationId(1715),
+                        ty: DeclarationId(1716),
                     },
                 ],
             },
@@ -28800,11 +28800,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ToolResultText".to_string(),
-                        ty: DeclarationId(1716),
+                        ty: DeclarationId(1717),
                     },
                     Field {
                         label: "ToolResultBlocks".to_string(),
-                        ty: DeclarationId(1718),
+                        ty: DeclarationId(1719),
                     },
                 ],
             },
@@ -28824,7 +28824,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Text".to_string(),
-                    ty: DeclarationId(1719),
+                    ty: DeclarationId(1720),
                 }],
             },
             type_params: vec![],
@@ -28843,7 +28843,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "TextPlain".to_string(),
-                    ty: DeclarationId(1720),
+                    ty: DeclarationId(1721),
                 }],
             },
             type_params: vec![],
@@ -28888,23 +28888,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "AnthropicTextBlock".to_string(),
-                        ty: DeclarationId(1721),
+                        ty: DeclarationId(1722),
                     },
                     Field {
                         label: "AnthropicImageBlock".to_string(),
-                        ty: DeclarationId(1722),
+                        ty: DeclarationId(1723),
                     },
                     Field {
                         label: "AnthropicDocumentBlock".to_string(),
-                        ty: DeclarationId(1723),
+                        ty: DeclarationId(1724),
                     },
                     Field {
                         label: "AnthropicSearchResultBlock".to_string(),
-                        ty: DeclarationId(1727),
+                        ty: DeclarationId(1728),
                     },
                     Field {
                         label: "AnthropicToolReferenceBlock".to_string(),
-                        ty: DeclarationId(1728),
+                        ty: DeclarationId(1729),
                     },
                 ],
             },
@@ -28954,11 +28954,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UserTextBlock".to_string(),
-                        ty: DeclarationId(1729),
+                        ty: DeclarationId(1730),
                     },
                     Field {
                         label: "UserToolResultBlock".to_string(),
-                        ty: DeclarationId(1732),
+                        ty: DeclarationId(1733),
                     },
                 ],
             },
@@ -28979,11 +28979,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "AssistantTextBlock".to_string(),
-                        ty: DeclarationId(1733),
+                        ty: DeclarationId(1734),
                     },
                     Field {
                         label: "AssistantToolUseBlock".to_string(),
-                        ty: DeclarationId(1734),
+                        ty: DeclarationId(1735),
                     },
                 ],
             },
@@ -29004,31 +29004,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "EndTurn".to_string(),
-                        ty: DeclarationId(1735),
+                        ty: DeclarationId(1736),
                     },
                     Field {
                         label: "MaxTokens".to_string(),
-                        ty: DeclarationId(1736),
+                        ty: DeclarationId(1737),
                     },
                     Field {
                         label: "StopSequence".to_string(),
-                        ty: DeclarationId(1737),
+                        ty: DeclarationId(1738),
                     },
                     Field {
                         label: "ToolUse".to_string(),
-                        ty: DeclarationId(1738),
+                        ty: DeclarationId(1739),
                     },
                     Field {
                         label: "PauseTurn".to_string(),
-                        ty: DeclarationId(1739),
+                        ty: DeclarationId(1740),
                     },
                     Field {
                         label: "Refusal".to_string(),
-                        ty: DeclarationId(1740),
+                        ty: DeclarationId(1741),
                     },
                     Field {
                         label: "ModelContextWindowExceeded".to_string(),
-                        ty: DeclarationId(1741),
+                        ty: DeclarationId(1742),
                     },
                 ],
             },
@@ -29049,23 +29049,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "CharLocation".to_string(),
-                        ty: DeclarationId(1744),
+                        ty: DeclarationId(1745),
                     },
                     Field {
                         label: "PageLocation".to_string(),
-                        ty: DeclarationId(1747),
+                        ty: DeclarationId(1748),
                     },
                     Field {
                         label: "ContentBlockLocation".to_string(),
-                        ty: DeclarationId(1750),
+                        ty: DeclarationId(1751),
                     },
                     Field {
                         label: "WebSearchResultLocation".to_string(),
-                        ty: DeclarationId(1752),
+                        ty: DeclarationId(1753),
                     },
                     Field {
                         label: "SearchResultLocation".to_string(),
-                        ty: DeclarationId(1754),
+                        ty: DeclarationId(1755),
                     },
                 ],
             },
@@ -29086,27 +29086,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "MessagesTextBlock".to_string(),
-                        ty: DeclarationId(1757),
+                        ty: DeclarationId(1758),
                     },
                     Field {
                         label: "MessagesThinkingBlock".to_string(),
-                        ty: DeclarationId(1758),
+                        ty: DeclarationId(1759),
                     },
                     Field {
                         label: "MessagesRedactedThinkingBlock".to_string(),
-                        ty: DeclarationId(1759),
+                        ty: DeclarationId(1760),
                     },
                     Field {
                         label: "MessagesToolUseBlock".to_string(),
-                        ty: DeclarationId(1761),
+                        ty: DeclarationId(1762),
                     },
                     Field {
                         label: "MessagesServerToolUseBlock".to_string(),
-                        ty: DeclarationId(1763),
+                        ty: DeclarationId(1764),
                     },
                     Field {
                         label: "MessagesWebSearchToolResultBlock".to_string(),
-                        ty: DeclarationId(1765),
+                        ty: DeclarationId(1766),
                     },
                 ],
             },
@@ -29127,35 +29127,35 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "WebSearch".to_string(),
-                        ty: DeclarationId(1766),
+                        ty: DeclarationId(1767),
                     },
                     Field {
                         label: "WebFetch".to_string(),
-                        ty: DeclarationId(1767),
+                        ty: DeclarationId(1768),
                     },
                     Field {
                         label: "CodeExecution".to_string(),
-                        ty: DeclarationId(1768),
+                        ty: DeclarationId(1769),
                     },
                     Field {
                         label: "BashCodeExecution".to_string(),
-                        ty: DeclarationId(1769),
+                        ty: DeclarationId(1770),
                     },
                     Field {
                         label: "TextEditorCodeExecution".to_string(),
-                        ty: DeclarationId(1770),
+                        ty: DeclarationId(1771),
                     },
                     Field {
                         label: "ToolSearchToolRegex".to_string(),
-                        ty: DeclarationId(1771),
+                        ty: DeclarationId(1772),
                     },
                     Field {
                         label: "ToolSearchToolBm25".to_string(),
-                        ty: DeclarationId(1772),
+                        ty: DeclarationId(1773),
                     },
                     Field {
                         label: "Advisor".to_string(),
-                        ty: DeclarationId(1773),
+                        ty: DeclarationId(1774),
                     },
                 ],
             },
@@ -29184,15 +29184,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "cache_creation_input_tokens".to_string(),
-                        ty: DeclarationId(1774),
+                        ty: DeclarationId(1775),
                     },
                     Field {
                         label: "cache_read_input_tokens".to_string(),
-                        ty: DeclarationId(1775),
+                        ty: DeclarationId(1776),
                     },
                     Field {
                         label: "service_tier".to_string(),
-                        ty: DeclarationId(1776),
+                        ty: DeclarationId(1777),
                     },
                 ],
             },
@@ -29212,7 +29212,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Assistant".to_string(),
-                    ty: DeclarationId(1777),
+                    ty: DeclarationId(1778),
                 }],
             },
             type_params: vec![],
@@ -29244,7 +29244,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(1778),
+                        ty: DeclarationId(1779),
                     },
                     Field {
                         label: "model".to_string(),
@@ -29256,7 +29256,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "stop_sequence".to_string(),
-                        ty: DeclarationId(1779),
+                        ty: DeclarationId(1780),
                     },
                     Field {
                         label: "usage".to_string(),
@@ -29264,7 +29264,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "container".to_string(),
-                        ty: DeclarationId(1780),
+                        ty: DeclarationId(1781),
                     },
                 ],
             },
@@ -29314,23 +29314,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "StdAuthority".to_string(),
-                        ty: DeclarationId(1781),
+                        ty: DeclarationId(1782),
                     },
                     Field {
                         label: "V3StdAuthority".to_string(),
-                        ty: DeclarationId(1782),
+                        ty: DeclarationId(1783),
                     },
                     Field {
                         label: "V3SpecAuthority".to_string(),
-                        ty: DeclarationId(1783),
+                        ty: DeclarationId(1784),
                     },
                     Field {
                         label: "CompilerAuthority".to_string(),
-                        ty: DeclarationId(1784),
+                        ty: DeclarationId(1785),
                     },
                     Field {
                         label: "ExtdepsFixtureAuthority".to_string(),
-                        ty: DeclarationId(1785),
+                        ty: DeclarationId(1786),
                     },
                 ],
             },
@@ -29387,483 +29387,483 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "dsl/std/logic.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1781),
+                            constructor: DeclarationId(1782),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/bit.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1781),
+                            constructor: DeclarationId(1782),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/error_primitives.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1781),
+                            constructor: DeclarationId(1782),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/algebra.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1781),
+                            constructor: DeclarationId(1782),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/magnitude.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1781),
+                            constructor: DeclarationId(1782),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/machine_constraints.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1781),
+                            constructor: DeclarationId(1782),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/nat.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1781),
+                            constructor: DeclarationId(1782),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/integer.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1781),
+                            constructor: DeclarationId(1782),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/rational.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1781),
+                            constructor: DeclarationId(1782),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/float.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1781),
+                            constructor: DeclarationId(1782),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/types.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1781),
+                            constructor: DeclarationId(1782),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/string_type.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1781),
+                            constructor: DeclarationId(1782),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/unicode.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1781),
+                            constructor: DeclarationId(1782),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/render_repeat_string_bootstrap.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1781),
+                            constructor: DeclarationId(1782),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/methods.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1781),
+                            constructor: DeclarationId(1782),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/serialization.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1781),
+                            constructor: DeclarationId(1782),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/algebra.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_messages.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_operations.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_schema.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/approximate_field.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bin_shim.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bootstrap_authority.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bridge_ledger.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/clean_emission.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/computation.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/computation_model.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/coproduct_projection.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/cross_target_coverage.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/diagnostics.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/dimensions.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/effects.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/emission_provenance.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/emit_model.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/extdeps_bootstrap_fixtures.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/go_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/induction.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/integer_diagnostic_order.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lens.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lens_application.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/list.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lookup.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/methods.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/parse_surface.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/python_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/resources.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/runtime.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/rust_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/services.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/substrate.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/substrate_minimal.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/termination.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/t_ci_workflow_as_data_demo.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/timing_lens.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/tokenize.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/verification.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/workflows.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1783),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/v3_l1.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1784),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/go.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1784),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/python.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1784),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/rust.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1784),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/pipeline.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1784),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/operators.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1784),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/regen.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1784),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/languages/rust/primitives.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1785),
+                            constructor: DeclarationId(1786),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/cron_schedule_model.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1785),
+                            constructor: DeclarationId(1786),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/github/github.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1785),
+                            constructor: DeclarationId(1786),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/github/actions.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1785),
+                            constructor: DeclarationId(1786),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/github/ci.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1785),
+                            constructor: DeclarationId(1786),
                             payload: vec![],
                         },
                     ),
@@ -29881,11 +29881,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Retired".to_string(),
-                        ty: DeclarationId(1786),
+                        ty: DeclarationId(1787),
                     },
                     Field {
                         label: "Open".to_string(),
-                        ty: DeclarationId(1787),
+                        ty: DeclarationId(1788),
                     },
                 ],
             },
@@ -29951,7 +29951,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6389, 6499),
         });
-        declarations.push(Declaration { id: DeclarationId(920), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(919) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1788)), 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(1787), 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(1786), 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(1786), 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(1786), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-pb-bridge-canonical-lens-name-dispatch-closure.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(1786), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/l1_5_fixed_point_test.rs".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(1786), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/bridge_lower_helpers_patch_zero_residual_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_semantic_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1787), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-v-bridge-row-4-exact-string-deeper-detail-receipt.md".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6963, 8416) });
+        declarations.push(Declaration { id: DeclarationId(920), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(919) }] }, 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(1787), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-pb-bridge-canonical-lens-name-dispatch-closure.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(1787), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/l1_5_fixed_point_test.rs".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(1787), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/bridge_lower_helpers_patch_zero_residual_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_semantic_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/r3-v-bridge-row-4-exact-string-deeper-detail-receipt.md".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6963, 8416) });
         declarations.push(Declaration {
             id: DeclarationId(921),
             name: Some("CleanEmissionContract".to_string()),
@@ -30037,15 +30037,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "WrapEverything".to_string(),
-                        ty: DeclarationId(1789),
+                        ty: DeclarationId(1790),
                     },
                     Field {
                         label: "WrapOnlyInOperandPosition".to_string(),
-                        ty: DeclarationId(1790),
+                        ty: DeclarationId(1791),
                     },
                     Field {
                         label: "NoWrapping".to_string(),
-                        ty: DeclarationId(1791),
+                        ty: DeclarationId(1792),
                     },
                 ],
             },
@@ -30066,19 +30066,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "EmitBindingAlways".to_string(),
-                        ty: DeclarationId(1792),
+                        ty: DeclarationId(1793),
                     },
                     Field {
                         label: "EmitUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(1793),
+                        ty: DeclarationId(1794),
                     },
                     Field {
                         label: "EmitPrefixedUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(1794),
+                        ty: DeclarationId(1795),
                     },
                     Field {
                         label: "NotApplicablePatternBinding".to_string(),
-                        ty: DeclarationId(1795),
+                        ty: DeclarationId(1796),
                     },
                 ],
             },
@@ -30099,11 +30099,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "AccessFromPayloadBinding".to_string(),
-                        ty: DeclarationId(1796),
+                        ty: DeclarationId(1797),
                     },
                     Field {
                         label: "OverrideNamedFieldsAtBindingSite".to_string(),
-                        ty: DeclarationId(1797),
+                        ty: DeclarationId(1798),
                     },
                 ],
             },
@@ -30124,15 +30124,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ImportEverythingDeclared".to_string(),
-                        ty: DeclarationId(1798),
+                        ty: DeclarationId(1799),
                     },
                     Field {
                         label: "IncludeOnlyReferenced".to_string(),
-                        ty: DeclarationId(1799),
+                        ty: DeclarationId(1800),
                     },
                     Field {
                         label: "ImportPerUsageSite".to_string(),
-                        ty: DeclarationId(1800),
+                        ty: DeclarationId(1801),
                     },
                 ],
             },
@@ -30153,15 +30153,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "WrapReturnValue".to_string(),
-                        ty: DeclarationId(1801),
+                        ty: DeclarationId(1802),
                     },
                     Field {
                         label: "NoWrappingOnTerminalExpression".to_string(),
-                        ty: DeclarationId(1802),
+                        ty: DeclarationId(1803),
                     },
                     Field {
                         label: "ExplicitReturnKeyword".to_string(),
-                        ty: DeclarationId(1803),
+                        ty: DeclarationId(1804),
                     },
                 ],
             },
@@ -30182,15 +30182,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "EmitLetBindingAlways".to_string(),
-                        ty: DeclarationId(1804),
+                        ty: DeclarationId(1805),
                     },
                     Field {
                         label: "EmitLetUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(1805),
+                        ty: DeclarationId(1806),
                     },
                     Field {
                         label: "OmitLetBinding".to_string(),
-                        ty: DeclarationId(1806),
+                        ty: DeclarationId(1807),
                     },
                 ],
             },
@@ -30211,15 +30211,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "WrapBody".to_string(),
-                        ty: DeclarationId(1807),
+                        ty: DeclarationId(1808),
                     },
                     Field {
                         label: "NoWrappingOnNonComplexBody".to_string(),
-                        ty: DeclarationId(1808),
+                        ty: DeclarationId(1809),
                     },
                     Field {
                         label: "NotApplicableMatchArmBody".to_string(),
-                        ty: DeclarationId(1809),
+                        ty: DeclarationId(1810),
                     },
                 ],
             },
@@ -30277,7 +30277,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(1810),
+                        ty: DeclarationId(1811),
                     },
                     Field {
                         label: "syntax_only".to_string(),
@@ -30310,19 +30310,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IgnoreVerifierOutput".to_string(),
-                        ty: DeclarationId(1811),
+                        ty: DeclarationId(1812),
                     },
                     Field {
                         label: "RequireEmptyStdout".to_string(),
-                        ty: DeclarationId(1812),
+                        ty: DeclarationId(1813),
                     },
                     Field {
                         label: "RequireEmptyStderr".to_string(),
-                        ty: DeclarationId(1813),
+                        ty: DeclarationId(1814),
                     },
                     Field {
                         label: "RequireEmptyStdoutAndStderr".to_string(),
-                        ty: DeclarationId(1814),
+                        ty: DeclarationId(1815),
                     },
                 ],
             },
@@ -30343,35 +30343,35 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "CollectionSize".to_string(),
-                        ty: DeclarationId(1821),
+                        ty: DeclarationId(1822),
                     },
                     Field {
                         label: "ParserStreamSize".to_string(),
-                        ty: DeclarationId(1822),
+                        ty: DeclarationId(1823),
                     },
                     Field {
                         label: "WorklistDrainSize".to_string(),
-                        ty: DeclarationId(1823),
+                        ty: DeclarationId(1824),
                     },
                     Field {
                         label: "TreeSize".to_string(),
-                        ty: DeclarationId(1824),
+                        ty: DeclarationId(1825),
                     },
                     Field {
                         label: "ArithmeticParam".to_string(),
-                        ty: DeclarationId(1825),
+                        ty: DeclarationId(1826),
                     },
                     Field {
                         label: "ExplicitCountZero".to_string(),
-                        ty: DeclarationId(1826),
+                        ty: DeclarationId(1827),
                     },
                     Field {
                         label: "ExplicitCountPositive".to_string(),
-                        ty: DeclarationId(1827),
+                        ty: DeclarationId(1828),
                     },
                     Field {
                         label: "Forever".to_string(),
-                        ty: DeclarationId(1828),
+                        ty: DeclarationId(1829),
                     },
                 ],
             },
@@ -30414,35 +30414,35 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ChildAccessorCall".to_string(),
-                        ty: DeclarationId(1829),
+                        ty: DeclarationId(1830),
                     },
                     Field {
                         label: "CollectionShrinkCall".to_string(),
-                        ty: DeclarationId(1830),
+                        ty: DeclarationId(1831),
                     },
                     Field {
                         label: "ArithmeticSubtractCall".to_string(),
-                        ty: DeclarationId(1831),
+                        ty: DeclarationId(1832),
                     },
                     Field {
                         label: "ArithmeticDivideCall".to_string(),
-                        ty: DeclarationId(1832),
+                        ty: DeclarationId(1833),
                     },
                     Field {
                         label: "ParserAdvanceCall".to_string(),
-                        ty: DeclarationId(1833),
+                        ty: DeclarationId(1834),
                     },
                     Field {
                         label: "WorklistDrainCall".to_string(),
-                        ty: DeclarationId(1834),
+                        ty: DeclarationId(1835),
                     },
                     Field {
                         label: "FoldBodyCall".to_string(),
-                        ty: DeclarationId(1835),
+                        ty: DeclarationId(1836),
                     },
                     Field {
                         label: "SameArgumentCall".to_string(),
-                        ty: DeclarationId(1836),
+                        ty: DeclarationId(1837),
                     },
                 ],
             },
@@ -30461,7 +30461,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("per_call_pattern_at".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-                output: DeclarationId(1815),
+                output: DeclarationId(1816),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     2764,
@@ -30483,7 +30483,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("per_call_descent_operand_port".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-                output: DeclarationId(1816),
+                output: DeclarationId(1817),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     2969,
@@ -30507,15 +30507,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UnitShrink".to_string(),
-                        ty: DeclarationId(1837),
+                        ty: DeclarationId(1838),
                     },
                     Field {
                         label: "ConstantShrink".to_string(),
-                        ty: DeclarationId(1838),
+                        ty: DeclarationId(1839),
                     },
                     Field {
                         label: "ProportionalShrink".to_string(),
-                        ty: DeclarationId(1839),
+                        ty: DeclarationId(1840),
                     },
                 ],
             },
@@ -30536,15 +30536,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Fold".to_string(),
-                        ty: DeclarationId(1840),
+                        ty: DeclarationId(1841),
                     },
                     Field {
                         label: "Descend".to_string(),
-                        ty: DeclarationId(1841),
+                        ty: DeclarationId(1842),
                     },
                     Field {
                         label: "Repeat".to_string(),
-                        ty: DeclarationId(1842),
+                        ty: DeclarationId(1843),
                     },
                 ],
             },
@@ -30577,7 +30577,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "factor".to_string(),
-                        ty: DeclarationId(1843),
+                        ty: DeclarationId(1844),
                     },
                 ],
             },
@@ -30618,7 +30618,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("size_bound_param".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(933)],
-                output: DeclarationId(1817),
+                output: DeclarationId(1818),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     5787,
@@ -30684,7 +30684,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("constant_bound_value".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(933)],
-                output: DeclarationId(1818),
+                output: DeclarationId(1819),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     6715,
@@ -30708,15 +30708,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "TreeDescent".to_string(),
-                        ty: DeclarationId(1844),
+                        ty: DeclarationId(1845),
                     },
                     Field {
                         label: "CollectionFold".to_string(),
-                        ty: DeclarationId(1845),
+                        ty: DeclarationId(1846),
                     },
                     Field {
                         label: "ArithmeticRepeat".to_string(),
-                        ty: DeclarationId(1846),
+                        ty: DeclarationId(1847),
                     },
                 ],
             },
@@ -30735,7 +30735,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("algebra_profile_to_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(53)],
-                output: DeclarationId(1819),
+                output: DeclarationId(1820),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     7781,
@@ -30757,7 +30757,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("type_iteration_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230)],
-                output: DeclarationId(1820),
+                output: DeclarationId(1821),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     8346,
@@ -30781,11 +30781,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Immutable".to_string(),
-                        ty: DeclarationId(1847),
+                        ty: DeclarationId(1848),
                     },
                     Field {
                         label: "Mutable".to_string(),
-                        ty: DeclarationId(1848),
+                        ty: DeclarationId(1849),
                     },
                 ],
             },
@@ -30806,11 +30806,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Pure".to_string(),
-                        ty: DeclarationId(1849),
+                        ty: DeclarationId(1850),
                     },
                     Field {
                         label: "Effectful".to_string(),
-                        ty: DeclarationId(1850),
+                        ty: DeclarationId(1851),
                     },
                 ],
             },
@@ -30831,11 +30831,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ExplicitDAG".to_string(),
-                        ty: DeclarationId(1851),
+                        ty: DeclarationId(1852),
                     },
                     Field {
                         label: "Arbitrary".to_string(),
-                        ty: DeclarationId(1852),
+                        ty: DeclarationId(1853),
                     },
                 ],
             },
@@ -30856,11 +30856,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Bounded".to_string(),
-                        ty: DeclarationId(1853),
+                        ty: DeclarationId(1854),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1854),
+                        ty: DeclarationId(1855),
                     },
                 ],
             },
@@ -30924,28 +30924,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "mutability".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1847),
+                            constructor: DeclarationId(1848),
                             payload: vec![],
                         },
                     ),
                     (
                         "purity".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1849),
+                            constructor: DeclarationId(1850),
                             payload: vec![],
                         },
                     ),
                     (
                         "structure".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1851),
+                            constructor: DeclarationId(1852),
                             payload: vec![],
                         },
                     ),
                     (
                         "iteration".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1853),
+                            constructor: DeclarationId(1854),
                             payload: vec![],
                         },
                     ),
@@ -30962,19 +30962,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ValueOnly".to_string(),
-                        ty: DeclarationId(1855),
+                        ty: DeclarationId(1856),
                     },
                     Field {
                         label: "GarbageCollected".to_string(),
-                        ty: DeclarationId(1856),
+                        ty: DeclarationId(1857),
                     },
                     Field {
                         label: "RefCounted".to_string(),
-                        ty: DeclarationId(1857),
+                        ty: DeclarationId(1858),
                     },
                     Field {
                         label: "OwnershipBased".to_string(),
-                        ty: DeclarationId(1858),
+                        ty: DeclarationId(1859),
                     },
                 ],
             },
@@ -30995,11 +30995,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LexicalScoping".to_string(),
-                        ty: DeclarationId(1859),
+                        ty: DeclarationId(1860),
                     },
                     Field {
                         label: "DynamicScoping".to_string(),
-                        ty: DeclarationId(1860),
+                        ty: DeclarationId(1861),
                     },
                 ],
             },
@@ -31044,7 +31044,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "excluded_prefixes".to_string(),
-                    ty: DeclarationId(1861),
+                    ty: DeclarationId(1862),
                 }],
             },
             type_params: vec![],
@@ -31068,7 +31068,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "additional_excluded_prefixes".to_string(),
-                        ty: DeclarationId(1862),
+                        ty: DeclarationId(1863),
                     },
                 ],
             },
@@ -31116,11 +31116,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "OwnershipBased".to_string(),
-                        ty: DeclarationId(1863),
+                        ty: DeclarationId(1864),
                     },
                     Field {
                         label: "GarbageCollected".to_string(),
-                        ty: DeclarationId(1864),
+                        ty: DeclarationId(1865),
                     },
                 ],
             },
@@ -31157,7 +31157,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "StringTag".to_string(),
-                    ty: DeclarationId(1865),
+                    ty: DeclarationId(1866),
                 }],
             },
             type_params: vec![],
@@ -31177,11 +31177,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Empty".to_string(),
-                        ty: DeclarationId(1866),
+                        ty: DeclarationId(1867),
                     },
                     Field {
                         label: "Populated".to_string(),
-                        ty: DeclarationId(1867),
+                        ty: DeclarationId(1868),
                     },
                 ],
             },
@@ -31235,7 +31235,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "variant_projections".to_string(),
-                        ty: DeclarationId(1868),
+                        ty: DeclarationId(1869),
                     },
                 ],
             },
@@ -31336,27 +31336,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Atom".to_string(),
-                        ty: DeclarationId(1869),
+                        ty: DeclarationId(1870),
                     },
                     Field {
                         label: "Conj".to_string(),
-                        ty: DeclarationId(1870),
+                        ty: DeclarationId(1871),
                     },
                     Field {
                         label: "Disj".to_string(),
-                        ty: DeclarationId(1871),
+                        ty: DeclarationId(1872),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(1872),
+                        ty: DeclarationId(1873),
                     },
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(1873),
+                        ty: DeclarationId(1874),
                     },
                     Field {
                         label: "Instantiation".to_string(),
-                        ty: DeclarationId(1874),
+                        ty: DeclarationId(1875),
                     },
                 ],
             },
@@ -31377,23 +31377,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Value".to_string(),
-                        ty: DeclarationId(1875),
+                        ty: DeclarationId(1876),
                     },
                     Field {
                         label: "Transform".to_string(),
-                        ty: DeclarationId(1876),
+                        ty: DeclarationId(1877),
                     },
                     Field {
                         label: "Branch".to_string(),
-                        ty: DeclarationId(1877),
+                        ty: DeclarationId(1878),
                     },
                     Field {
                         label: "Loop".to_string(),
-                        ty: DeclarationId(1878),
+                        ty: DeclarationId(1879),
                     },
                     Field {
                         label: "Bind".to_string(),
-                        ty: DeclarationId(1879),
+                        ty: DeclarationId(1880),
                     },
                 ],
             },
@@ -31468,7 +31468,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "cells".to_string(),
-                        ty: DeclarationId(1880),
+                        ty: DeclarationId(1881),
                     },
                 ],
             },
@@ -31494,7 +31494,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1881)),
+            meta_tag: Some(DeclarationId(1882)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -31521,14 +31521,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -31558,14 +31558,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -31595,14 +31595,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -31632,14 +31632,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -31669,14 +31669,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -31706,14 +31706,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -31743,14 +31743,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -31780,14 +31780,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -31817,14 +31817,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -31854,14 +31854,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -31891,14 +31891,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -31928,14 +31928,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -31965,14 +31965,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -32002,14 +32002,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -32039,14 +32039,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -32076,14 +32076,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -32113,14 +32113,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -32150,14 +32150,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -32187,14 +32187,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -32224,14 +32224,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -32261,14 +32261,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -32298,14 +32298,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -32335,14 +32335,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -32372,14 +32372,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -32409,14 +32409,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -32446,14 +32446,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -32483,14 +32483,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -32520,14 +32520,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -32557,14 +32557,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -32594,14 +32594,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -32631,14 +32631,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -32668,14 +32668,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -32705,14 +32705,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -32742,14 +32742,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -32779,14 +32779,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -32816,14 +32816,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -32853,14 +32853,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -32890,14 +32890,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -32927,14 +32927,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -32964,14 +32964,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -33001,14 +33001,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1873),
+                                    constructor: DeclarationId(1874),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1876),
+                                    constructor: DeclarationId(1877),
                                     payload: vec![],
                                 },
                             ),
@@ -33027,43 +33027,43 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-                        ty: DeclarationId(1882),
+                        ty: DeclarationId(1883),
                     },
                     Field {
                         label: "ParseError".to_string(),
-                        ty: DeclarationId(1883),
+                        ty: DeclarationId(1884),
                     },
                     Field {
                         label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(1884),
+                        ty: DeclarationId(1885),
                     },
                     Field {
                         label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(1885),
+                        ty: DeclarationId(1886),
                     },
                     Field {
                         label: "ResolveError".to_string(),
-                        ty: DeclarationId(1886),
+                        ty: DeclarationId(1887),
                     },
                     Field {
                         label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(1887),
+                        ty: DeclarationId(1888),
                     },
                     Field {
                         label: "BranchConditionNotBool".to_string(),
-                        ty: DeclarationId(1888),
+                        ty: DeclarationId(1889),
                     },
                     Field {
                         label: "MagnitudeOutOfRange".to_string(),
-                        ty: DeclarationId(1889),
+                        ty: DeclarationId(1890),
                     },
                     Field {
                         label: "MalformedIntegerRangeFact".to_string(),
-                        ty: DeclarationId(1890),
+                        ty: DeclarationId(1891),
                     },
                     Field {
                         label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(1891),
+                        ty: DeclarationId(1892),
                     },
                 ],
             },
@@ -33157,11 +33157,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "CompilerKind".to_string(),
-                        ty: DeclarationId(1892),
+                        ty: DeclarationId(1893),
                     },
                     Field {
                         label: "LensInstanceKind".to_string(),
-                        ty: DeclarationId(1893),
+                        ty: DeclarationId(1894),
                     },
                 ],
             },
@@ -33194,7 +33194,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "fixes".to_string(),
-                        ty: DeclarationId(1894),
+                        ty: DeclarationId(1895),
                     },
                 ],
             },
@@ -33215,31 +33215,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UnderRefined".to_string(),
-                        ty: DeclarationId(1895),
+                        ty: DeclarationId(1896),
                     },
                     Field {
                         label: "NoInhabitant".to_string(),
-                        ty: DeclarationId(1896),
+                        ty: DeclarationId(1897),
                     },
                     Field {
                         label: "ContradictoryUse".to_string(),
-                        ty: DeclarationId(1898),
+                        ty: DeclarationId(1899),
                     },
                     Field {
                         label: "OutOfR2Scope".to_string(),
-                        ty: DeclarationId(1899),
+                        ty: DeclarationId(1900),
                     },
                     Field {
                         label: "LifetimeProgramExtractionPending".to_string(),
-                        ty: DeclarationId(1900),
+                        ty: DeclarationId(1901),
                     },
                     Field {
                         label: "FoldNotImplemented".to_string(),
-                        ty: DeclarationId(1901),
+                        ty: DeclarationId(1902),
                     },
                     Field {
                         label: "MissingEmissionPath".to_string(),
-                        ty: DeclarationId(1902),
+                        ty: DeclarationId(1903),
                     },
                 ],
             },
@@ -33260,11 +33260,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Inhabits".to_string(),
-                        ty: DeclarationId(1917),
+                        ty: DeclarationId(1918),
                     },
                     Field {
                         label: "Violates".to_string(),
-                        ty: DeclarationId(1918),
+                        ty: DeclarationId(1919),
                     },
                 ],
             },
@@ -33299,11 +33299,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NoDiagnostic".to_string(),
-                        ty: DeclarationId(1919),
+                        ty: DeclarationId(1920),
                     },
                     Field {
                         label: "SomeDiagnostic".to_string(),
-                        ty: DeclarationId(1920),
+                        ty: DeclarationId(1921),
                     },
                 ],
             },
@@ -33324,11 +33324,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DimensionOk".to_string(),
-                        ty: DeclarationId(1923),
+                        ty: DeclarationId(1924),
                     },
                     Field {
                         label: "DimensionFail".to_string(),
-                        ty: DeclarationId(1927),
+                        ty: DeclarationId(1928),
                     },
                 ],
             },
@@ -33367,15 +33367,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "witness_of".to_string(),
-                        ty: DeclarationId(1929),
+                        ty: DeclarationId(1930),
                     },
                     Field {
                         label: "compose".to_string(),
-                        ty: DeclarationId(1930),
+                        ty: DeclarationId(1931),
                     },
                     Field {
                         label: "break_diagnostic".to_string(),
-                        ty: DeclarationId(1931),
+                        ty: DeclarationId(1932),
                     },
                 ],
             },
@@ -33415,7 +33415,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             type_params: vec![DeclarationId(992), DeclarationId(993)],
             phantom_params: vec![PhantomParameter {
                 parameter: DeclarationId(992),
-                algebra: DeclarationId(1932),
+                algebra: DeclarationId(1933),
             }],
             meta_tag: None,
             specialization_parent: None,
@@ -33556,11 +33556,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("add_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(1903),
                     DeclarationId(1904),
                     DeclarationId(1905),
+                    DeclarationId(1906),
                 ],
-                output: DeclarationId(1906),
+                output: DeclarationId(1907),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4966, 4988)),
             },
             type_params: vec![DeclarationId(1002), DeclarationId(1003)],
@@ -33606,11 +33606,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("sub_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(1907),
                     DeclarationId(1908),
                     DeclarationId(1909),
+                    DeclarationId(1910),
                 ],
-                output: DeclarationId(1910),
+                output: DeclarationId(1911),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5162, 5184)),
             },
             type_params: vec![DeclarationId(1005), DeclarationId(1006)],
@@ -33656,11 +33656,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("mul_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(1911),
                     DeclarationId(1912),
+                    DeclarationId(1913),
                     DeclarationId(1009),
                 ],
-                output: DeclarationId(1913),
+                output: DeclarationId(1914),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5350, 5379)),
             },
             type_params: vec![DeclarationId(1008), DeclarationId(1009)],
@@ -33706,11 +33706,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("div_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(1914),
                     DeclarationId(1915),
+                    DeclarationId(1916),
                     DeclarationId(1012),
                 ],
-                output: DeclarationId(1916),
+                output: DeclarationId(1917),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5545, 5574)),
             },
             type_params: vec![DeclarationId(1011), DeclarationId(1012)],
@@ -33775,11 +33775,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NoSourceSpan".to_string(),
-                        ty: DeclarationId(1933),
+                        ty: DeclarationId(1934),
                     },
                     Field {
                         label: "SomeSourceSpan".to_string(),
-                        ty: DeclarationId(1934),
+                        ty: DeclarationId(1935),
                     },
                 ],
             },
@@ -33845,7 +33845,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(1935),
+                        ty: DeclarationId(1936),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -33907,15 +33907,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "BoundUnspecified".to_string(),
-                        ty: DeclarationId(1936),
+                        ty: DeclarationId(1937),
                     },
                     Field {
                         label: "StaticBoundFact".to_string(),
-                        ty: DeclarationId(1937),
+                        ty: DeclarationId(1938),
                     },
                     Field {
                         label: "PlatformDependentFact".to_string(),
-                        ty: DeclarationId(1938),
+                        ty: DeclarationId(1939),
                     },
                 ],
             },
@@ -33965,11 +33965,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DirectField".to_string(),
-                        ty: DeclarationId(1939),
+                        ty: DeclarationId(1940),
                     },
                     Field {
                         label: "AccessorMethod".to_string(),
-                        ty: DeclarationId(1940),
+                        ty: DeclarationId(1941),
                     },
                 ],
             },
@@ -34072,7 +34072,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "parameters".to_string(),
-                        ty: DeclarationId(1941),
+                        ty: DeclarationId(1942),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -34122,11 +34122,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Borrowed".to_string(),
-                        ty: DeclarationId(1942),
+                        ty: DeclarationId(1943),
                     },
                     Field {
                         label: "Consumed".to_string(),
-                        ty: DeclarationId(1943),
+                        ty: DeclarationId(1944),
                     },
                 ],
             },
@@ -34147,11 +34147,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Owned".to_string(),
-                        ty: DeclarationId(1944),
+                        ty: DeclarationId(1945),
                     },
                     Field {
                         label: "Borrowed".to_string(),
-                        ty: DeclarationId(1945),
+                        ty: DeclarationId(1946),
                     },
                 ],
             },
@@ -34172,11 +34172,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "SelfContained".to_string(),
-                        ty: DeclarationId(1946),
+                        ty: DeclarationId(1947),
                     },
                     Field {
                         label: "Caller".to_string(),
-                        ty: DeclarationId(1947),
+                        ty: DeclarationId(1948),
                     },
                 ],
             },
@@ -34197,15 +34197,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Growable".to_string(),
-                        ty: DeclarationId(1948),
+                        ty: DeclarationId(1949),
                     },
                     Field {
                         label: "Fixed".to_string(),
-                        ty: DeclarationId(1949),
+                        ty: DeclarationId(1950),
                     },
                     Field {
                         label: "NotApplicable".to_string(),
-                        ty: DeclarationId(1950),
+                        ty: DeclarationId(1951),
                     },
                 ],
             },
@@ -34225,7 +34225,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Utf8FreeMonoidChar".to_string(),
-                    ty: DeclarationId(1951),
+                    ty: DeclarationId(1952),
                 }],
             },
             type_params: vec![],
@@ -34323,43 +34323,43 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ListEmpty".to_string(),
-                        ty: DeclarationId(1952),
+                        ty: DeclarationId(1953),
                     },
                     Field {
                         label: "ListSingleton".to_string(),
-                        ty: DeclarationId(1953),
+                        ty: DeclarationId(1954),
                     },
                     Field {
                         label: "ListCons".to_string(),
-                        ty: DeclarationId(1954),
+                        ty: DeclarationId(1955),
                     },
                     Field {
                         label: "ListConcat".to_string(),
-                        ty: DeclarationId(1955),
+                        ty: DeclarationId(1956),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(1956),
+                        ty: DeclarationId(1957),
                     },
                     Field {
                         label: "ListIsEmpty".to_string(),
-                        ty: DeclarationId(1957),
+                        ty: DeclarationId(1958),
                     },
                     Field {
                         label: "ListFold".to_string(),
-                        ty: DeclarationId(1958),
+                        ty: DeclarationId(1959),
                     },
                     Field {
                         label: "ListMap".to_string(),
-                        ty: DeclarationId(1959),
+                        ty: DeclarationId(1960),
                     },
                     Field {
                         label: "ListFilter".to_string(),
-                        ty: DeclarationId(1960),
+                        ty: DeclarationId(1961),
                     },
                     Field {
                         label: "ListContains".to_string(),
-                        ty: DeclarationId(1961),
+                        ty: DeclarationId(1962),
                     },
                 ],
             },
@@ -34441,11 +34441,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "PlaceholderPatternStrategy".to_string(),
-                        ty: DeclarationId(1962),
+                        ty: DeclarationId(1963),
                     },
                     Field {
                         label: "VectorList".to_string(),
-                        ty: DeclarationId(1963),
+                        ty: DeclarationId(1964),
                     },
                 ],
             },
@@ -34924,11 +34924,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Borrow".to_string(),
-                        ty: DeclarationId(1964),
+                        ty: DeclarationId(1965),
                     },
                     Field {
                         label: "PassByValue".to_string(),
-                        ty: DeclarationId(1965),
+                        ty: DeclarationId(1966),
                     },
                 ],
             },
@@ -34949,11 +34949,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "CopyOrClone".to_string(),
-                        ty: DeclarationId(1966),
+                        ty: DeclarationId(1967),
                     },
                     Field {
                         label: "PassByValue".to_string(),
-                        ty: DeclarationId(1967),
+                        ty: DeclarationId(1968),
                     },
                 ],
             },
@@ -35039,11 +35039,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IndexedArgs".to_string(),
-                        ty: DeclarationId(1968),
+                        ty: DeclarationId(1969),
                     },
                     Field {
                         label: "NamedArg".to_string(),
-                        ty: DeclarationId(1969),
+                        ty: DeclarationId(1970),
                     },
                 ],
             },
@@ -35064,11 +35064,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "SingleTemplate".to_string(),
-                        ty: DeclarationId(1970),
+                        ty: DeclarationId(1971),
                     },
                     Field {
                         label: "HigherOrderTemplates".to_string(),
-                        ty: DeclarationId(1971),
+                        ty: DeclarationId(1972),
                     },
                 ],
             },
@@ -35335,7 +35335,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({left}, {right}...)".to_string(),
                             ))],
@@ -35348,7 +35348,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -35386,7 +35386,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "int64(len({recv}))".to_string(),
                             ))],
@@ -35399,7 +35399,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -35437,7 +35437,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv}) == 0".to_string(),
                             ))],
@@ -35450,7 +35450,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -35490,7 +35490,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "/* fold({recv}, {init}, {body}) */".to_string(),
                             ))],
@@ -35503,7 +35503,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -35543,7 +35543,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "/* map({recv}, {body}) */".to_string(),
                             ))],
@@ -35556,7 +35556,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -35596,7 +35596,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Filter({recv}, {arg})".to_string(),
                             ))],
@@ -35609,7 +35609,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -35649,7 +35649,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Any({recv}, {arg})".to_string(),
                             ))],
@@ -35662,7 +35662,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -35702,7 +35702,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.All({recv}, {arg})".to_string(),
                             ))],
@@ -35715,7 +35715,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -35755,7 +35755,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.FlatMap({recv}, {arg})".to_string(),
                             ))],
@@ -35768,7 +35768,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -35790,7 +35790,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1972)),
+            meta_tag: Some(DeclarationId(1973)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -35809,7 +35809,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -35822,7 +35822,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -35844,7 +35844,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Join({recv}, {arg})".to_string(),
                             ))],
@@ -35857,7 +35857,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -35879,7 +35879,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Split({recv}, {arg})".to_string(),
                             ))],
@@ -35892,7 +35892,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -35916,7 +35916,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -35929,7 +35929,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -35949,7 +35949,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -35962,7 +35962,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -35984,7 +35984,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.SortBy({recv}, {arg})".to_string(),
                             ))],
@@ -35997,7 +35997,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -36019,7 +36019,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({recv}, {arg})".to_string(),
                             ))],
@@ -36032,7 +36032,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -36054,7 +36054,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Contains({recv}, {arg})".to_string(),
                             ))],
@@ -36067,7 +36067,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -36084,23 +36084,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DirectRecursion".to_string(),
-                        ty: DeclarationId(1986),
+                        ty: DeclarationId(1987),
                     },
                     Field {
                         label: "ListRecursion".to_string(),
-                        ty: DeclarationId(1987),
+                        ty: DeclarationId(1988),
                     },
                     Field {
                         label: "OptionalRecursion".to_string(),
-                        ty: DeclarationId(1988),
+                        ty: DeclarationId(1989),
                     },
                     Field {
                         label: "SetRecursion".to_string(),
-                        ty: DeclarationId(1989),
+                        ty: DeclarationId(1990),
                     },
                     Field {
                         label: "MapValueRecursion".to_string(),
-                        ty: DeclarationId(1990),
+                        ty: DeclarationId(1991),
                     },
                 ],
             },
@@ -36212,23 +36212,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "StrictSubValue".to_string(),
-                        ty: DeclarationId(1991),
+                        ty: DeclarationId(1992),
                     },
                     Field {
                         label: "IteratedSubValue".to_string(),
-                        ty: DeclarationId(1992),
+                        ty: DeclarationId(1993),
                     },
                     Field {
                         label: "ArithmeticDescent".to_string(),
-                        ty: DeclarationId(1993),
+                        ty: DeclarationId(1994),
                     },
                     Field {
                         label: "PreservedValue".to_string(),
-                        ty: DeclarationId(1994),
+                        ty: DeclarationId(1995),
                     },
                     Field {
                         label: "SubValueUnknown".to_string(),
-                        ty: DeclarationId(1995),
+                        ty: DeclarationId(1996),
                     },
                 ],
             },
@@ -36379,7 +36379,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(1073)],
-                output: DeclarationId(1973),
+                output: DeclarationId(1974),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     20571,
@@ -36401,7 +36401,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(1073)],
-                output: DeclarationId(1974),
+                output: DeclarationId(1975),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     21959,
@@ -36425,19 +36425,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IntegerExpZero".to_string(),
-                        ty: DeclarationId(1996),
+                        ty: DeclarationId(1997),
                     },
                     Field {
                         label: "IntegerExpPos".to_string(),
-                        ty: DeclarationId(1997),
+                        ty: DeclarationId(1998),
                     },
                     Field {
                         label: "FractionExp".to_string(),
-                        ty: DeclarationId(1998),
+                        ty: DeclarationId(1999),
                     },
                     Field {
                         label: "LogBasedExp".to_string(),
-                        ty: DeclarationId(1999),
+                        ty: DeclarationId(2000),
                     },
                 ],
             },
@@ -36480,11 +36480,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "PolyCost".to_string(),
-                        ty: DeclarationId(2000),
+                        ty: DeclarationId(2001),
                     },
                     Field {
                         label: "LogCost".to_string(),
-                        ty: DeclarationId(2001),
+                        ty: DeclarationId(2002),
                     },
                 ],
             },
@@ -36505,31 +36505,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ConstantBound".to_string(),
-                        ty: DeclarationId(2002),
+                        ty: DeclarationId(2003),
                     },
                     Field {
                         label: "AtomicBound".to_string(),
-                        ty: DeclarationId(2003),
+                        ty: DeclarationId(2004),
                     },
                     Field {
                         label: "ProductBound".to_string(),
-                        ty: DeclarationId(2005),
+                        ty: DeclarationId(2006),
                     },
                     Field {
                         label: "SumOfProductsBound".to_string(),
-                        ty: DeclarationId(2008),
+                        ty: DeclarationId(2009),
                     },
                     Field {
                         label: "SumBound".to_string(),
-                        ty: DeclarationId(2010),
+                        ty: DeclarationId(2011),
                     },
                     Field {
                         label: "ForeverBound".to_string(),
-                        ty: DeclarationId(2011),
+                        ty: DeclarationId(2012),
                     },
                     Field {
                         label: "ErrorBound".to_string(),
-                        ty: DeclarationId(2012),
+                        ty: DeclarationId(2013),
                     },
                 ],
             },
@@ -36547,7 +36547,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1086),
             name: Some("sum_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1975)],
+                inputs: vec![DeclarationId(1976)],
                 output: DeclarationId(1085),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -36627,7 +36627,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1090),
             name: Some("product_atoms_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1976)],
+                inputs: vec![DeclarationId(1977)],
                 output: DeclarationId(849),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -36649,7 +36649,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1091),
             name: Some("product_term_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1977)],
+                inputs: vec![DeclarationId(1978)],
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(555))),
             },
@@ -36667,7 +36667,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1092),
             name: Some("sum_products_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1979)],
+                inputs: vec![DeclarationId(1980)],
                 output: DeclarationId(849),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -36921,7 +36921,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("int_add_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(1980),
+                output: DeclarationId(1981),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33617,
@@ -36943,7 +36943,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("int_mul_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(1981),
+                output: DeclarationId(1982),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33913,
@@ -36965,7 +36965,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(93)],
-                output: DeclarationId(1982),
+                output: DeclarationId(1983),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35162,
@@ -36987,7 +36987,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("int_pow_bounded".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(1983),
+                output: DeclarationId(1984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35637,
@@ -37009,7 +37009,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("ceil_log".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(1984),
+                output: DeclarationId(1985),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     36900,
@@ -37036,7 +37036,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     DeclarationId(93),
                     DeclarationId(93),
                 ],
-                output: DeclarationId(1985),
+                output: DeclarationId(1986),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     37172,
@@ -37444,7 +37444,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2013)),
+            meta_tag: Some(DeclarationId(2014)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -37470,7 +37470,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2014)),
+            meta_tag: Some(DeclarationId(2015)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -37495,23 +37495,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "read".to_string(),
-                        ty: DeclarationId(2016),
+                        ty: DeclarationId(2017),
                     },
                     Field {
                         label: "sequential".to_string(),
-                        ty: DeclarationId(2017),
+                        ty: DeclarationId(2018),
                     },
                     Field {
                         label: "branch".to_string(),
-                        ty: DeclarationId(2018),
+                        ty: DeclarationId(2019),
                     },
                     Field {
                         label: "iterate".to_string(),
-                        ty: DeclarationId(2019),
+                        ty: DeclarationId(2020),
                     },
                     Field {
                         label: "validate".to_string(),
-                        ty: DeclarationId(2020),
+                        ty: DeclarationId(2021),
                     },
                 ],
             },
@@ -37546,11 +37546,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DeclarationScope".to_string(),
-                        ty: DeclarationId(2021),
+                        ty: DeclarationId(2022),
                     },
                     Field {
                         label: "NodeScope".to_string(),
-                        ty: DeclarationId(2022),
+                        ty: DeclarationId(2023),
                     },
                 ],
             },
@@ -37570,7 +37570,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Error".to_string(),
-                    ty: DeclarationId(2023),
+                    ty: DeclarationId(2024),
                 }],
             },
             type_params: vec![],
@@ -37590,11 +37590,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "project".to_string(),
-                        ty: DeclarationId(2024),
+                        ty: DeclarationId(2025),
                     },
                     Field {
                         label: "violates".to_string(),
-                        ty: DeclarationId(2025),
+                        ty: DeclarationId(2026),
                     },
                 ],
             },
@@ -37643,11 +37643,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "lens".to_string(),
-                        ty: DeclarationId(2026),
+                        ty: DeclarationId(2027),
                     },
                     Field {
                         label: "enforcement".to_string(),
-                        ty: DeclarationId(2027),
+                        ty: DeclarationId(2028),
                     },
                 ],
             },
@@ -37696,7 +37696,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "enforceable_lens".to_string(),
-                        ty: DeclarationId(2028),
+                        ty: DeclarationId(2029),
                     },
                     Field {
                         label: "section".to_string(),
@@ -37761,7 +37761,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "lens".to_string(),
-                        ty: DeclarationId(2029),
+                        ty: DeclarationId(2030),
                     },
                     Field {
                         label: "section".to_string(),
@@ -37804,11 +37804,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Miss".to_string(),
-                        ty: DeclarationId(2032),
+                        ty: DeclarationId(2033),
                     },
                     Field {
                         label: "Hit".to_string(),
-                        ty: DeclarationId(2033),
+                        ty: DeclarationId(2034),
                     },
                 ],
             },
@@ -37841,7 +37841,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(2030),
+                output: DeclarationId(2031),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4601, 4611)),
             },
             type_params: vec![],
@@ -37859,7 +37859,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("hit_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(2031),
+                output: DeclarationId(2032),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4654, 4666)),
             },
             type_params: vec![],
@@ -37900,7 +37900,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[*{left}, *{right}]".to_string(),
                             ))],
@@ -37913,7 +37913,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -37955,7 +37955,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -37968,7 +37968,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -38010,7 +38010,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "(len({recv}) == 0)".to_string(),
                             ))],
@@ -38023,7 +38023,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -38067,7 +38067,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "__v3_fold({recv}, {init}, {body})".to_string(),
                             ))],
@@ -38080,7 +38080,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -38124,7 +38124,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[{body} for {item} in {recv}]".to_string(),
                             ))],
@@ -38137,7 +38137,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -38181,7 +38181,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[x for x in {recv} if {arg}(x)]".to_string(),
                             ))],
@@ -38194,7 +38194,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -38238,7 +38238,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "any({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -38251,7 +38251,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -38295,7 +38295,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "all({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -38308,7 +38308,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -38352,7 +38352,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[y for x in {recv} for y in {arg}(x)]".to_string(),
                             ))],
@@ -38365,7 +38365,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -38391,7 +38391,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2034)),
+            meta_tag: Some(DeclarationId(2035)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -38410,7 +38410,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -38423,7 +38423,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -38443,7 +38443,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg}.join({recv})".to_string(),
                             ))],
@@ -38456,7 +38456,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -38476,7 +38476,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}.split({arg})".to_string(),
                             ))],
@@ -38489,7 +38489,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -38511,7 +38511,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[-1] if {recv} else None".to_string(),
                             ))],
@@ -38524,7 +38524,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -38546,7 +38546,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[0] if {recv} else None".to_string(),
                             ))],
@@ -38559,7 +38559,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -38581,7 +38581,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "list(enumerate({recv}))".to_string(),
                             ))],
@@ -38594,7 +38594,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -38616,7 +38616,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[ord(c) for c in {recv}]".to_string(),
                             ))],
@@ -38629,7 +38629,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -38653,7 +38653,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -38666,7 +38666,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -38686,7 +38686,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -38699,7 +38699,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -38721,7 +38721,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "sorted({recv}, key={arg})".to_string(),
                             ))],
@@ -38734,7 +38734,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -38754,7 +38754,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv} + [{arg}]".to_string(),
                             ))],
@@ -38767,7 +38767,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -38787,7 +38787,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1971),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg} in {recv}".to_string(),
                             ))],
@@ -38800,7 +38800,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1969),
+                            constructor: DeclarationId(1970),
                             payload: vec![],
                         },
                     ),
@@ -38898,23 +38898,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LiteralValue".to_string(),
-                        ty: DeclarationId(2036),
+                        ty: DeclarationId(2037),
                     },
                     Field {
                         label: "RecordValue".to_string(),
-                        ty: DeclarationId(2038),
+                        ty: DeclarationId(2039),
                     },
                     Field {
                         label: "VariantValue".to_string(),
-                        ty: DeclarationId(2039),
+                        ty: DeclarationId(2040),
                     },
                     Field {
                         label: "NodeRef".to_string(),
-                        ty: DeclarationId(2040),
+                        ty: DeclarationId(2041),
                     },
                     Field {
                         label: "CardinalityValue".to_string(),
-                        ty: DeclarationId(2041),
+                        ty: DeclarationId(2042),
                     },
                 ],
             },
@@ -38967,7 +38967,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bindings".to_string(),
-                    ty: DeclarationId(2042),
+                    ty: DeclarationId(2043),
                 }],
             },
             type_params: vec![],
@@ -38986,7 +38986,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "frames".to_string(),
-                    ty: DeclarationId(2043),
+                    ty: DeclarationId(2044),
                 }],
             },
             type_params: vec![],
@@ -39024,7 +39024,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "ApplicativeOrder".to_string(),
-                    ty: DeclarationId(2044),
+                    ty: DeclarationId(2045),
                 }],
             },
             type_params: vec![],
@@ -39044,11 +39044,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LeftFirst".to_string(),
-                        ty: DeclarationId(2045),
+                        ty: DeclarationId(2046),
                     },
                     Field {
                         label: "RightFirst".to_string(),
-                        ty: DeclarationId(2046),
+                        ty: DeclarationId(2047),
                     },
                 ],
             },
@@ -39099,7 +39099,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1169),
             name: Some("evaluate".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(721), DeclarationId(2035)],
+                inputs: vec![DeclarationId(828), DeclarationId(721), DeclarationId(2036)],
                 output: DeclarationId(1160),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/runtime.dag", 11265, 11284)),
             },
@@ -39113,11 +39113,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/runtime.dag", 11196, 11284),
         });
-        declarations.push(Declaration { id: DeclarationId(1170), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(263)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1971), payload: vec![FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __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(1969), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3555, 4208) });
-        declarations.push(Declaration { id: DeclarationId(1171), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(249)))])), ("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(1971), 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(1969), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4210, 4705) });
-        declarations.push(Declaration { id: DeclarationId(1172), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(248)))])), ("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(1971), 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(1969), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4707, 5196) });
-        declarations.push(Declaration { id: DeclarationId(1173), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(265)))])), ("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(1971), 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(1969), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5198, 5729) });
-        declarations.push(Declaration { id: DeclarationId(1174), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(1054) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2047)), 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(258)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1970), 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(1969), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(271)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1970), 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(1969), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(295)))])), ("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(1970), 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(1969), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(273)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1970), 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(1969), 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}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1970), 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(1969), 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}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1970), 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(1969), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(252)))])), ("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(1970), 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(1969), payload: vec![] })]), FieldValue::Reference(DeclarationId(1170)), FieldValue::Reference(DeclarationId(1171)), FieldValue::Reference(DeclarationId(1172)), FieldValue::Reference(DeclarationId(1173)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(293)))])), ("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(1970), 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(1969), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(299)))])), ("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(1970), 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(1969), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5732, 8453) });
+        declarations.push(Declaration { id: DeclarationId(1170), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(263)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1972), payload: vec![FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __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(1970), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3555, 4208) });
+        declarations.push(Declaration { id: DeclarationId(1171), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(249)))])), ("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(1972), 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(1970), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4210, 4705) });
+        declarations.push(Declaration { id: DeclarationId(1172), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(248)))])), ("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(1972), 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(1970), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4707, 5196) });
+        declarations.push(Declaration { id: DeclarationId(1173), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(265)))])), ("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(1972), 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(1970), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5198, 5729) });
+        declarations.push(Declaration { id: DeclarationId(1174), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(1054) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2048)), 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(258)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1971), 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(1970), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(271)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1971), 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(1970), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(295)))])), ("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(1971), 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(1970), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(273)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1971), 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(1970), 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}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1971), 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(1970), 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}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1971), 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(1970), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(252)))])), ("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(1971), 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(1970), payload: vec![] })]), FieldValue::Reference(DeclarationId(1170)), FieldValue::Reference(DeclarationId(1171)), FieldValue::Reference(DeclarationId(1172)), FieldValue::Reference(DeclarationId(1173)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(293)))])), ("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(1971), 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(1970), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(299)))])), ("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(1971), 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(1970), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5732, 8453) });
         declarations.push(Declaration {
             id: DeclarationId(1175),
             name: Some("InputField".to_string()),
@@ -39187,7 +39187,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(2048),
+                        ty: DeclarationId(2049),
                     },
                     Field {
                         label: "endpoint".to_string(),
@@ -39209,12 +39209,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1179),
             name: Some("modeled_gunbc_ci_workflow".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1355),
+                template: DeclarationId(1356),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1355)),
+            meta_tag: Some(DeclarationId(1356)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -39231,7 +39231,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("ci_demo_timing_read".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2049),
+                output: DeclarationId(2050),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(597))),
             },
             type_params: vec![],
@@ -39249,7 +39249,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("ci_wad_modeled_workflow_timing_witness".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2050),
+                output: DeclarationId(2051),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(599))),
             },
             type_params: vec![],
@@ -39267,7 +39267,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_seed_list_declaration_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2051),
+                output: DeclarationId(2052),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(601))),
             },
             type_params: vec![],
@@ -39285,7 +39285,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_seed_list_behavior_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2052),
+                output: DeclarationId(2053),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(603))),
             },
             type_params: vec![],
@@ -39303,7 +39303,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_seed_list_dagport_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2053),
+                output: DeclarationId(2054),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(605))),
             },
             type_params: vec![],
@@ -39321,7 +39321,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_seed_list_cluster_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2054),
+                output: DeclarationId(2055),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(607))),
             },
             type_params: vec![],
@@ -39339,7 +39339,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_empty_list_diagnostic".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2055),
+                output: DeclarationId(2056),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(609))),
             },
             type_params: vec![],
@@ -39357,7 +39357,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_empty_list_witness_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2057),
+                output: DeclarationId(2058),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(611))),
             },
             type_params: vec![],
@@ -39375,7 +39375,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_witnesses_singleton_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1222)],
-                output: DeclarationId(2059),
+                output: DeclarationId(2060),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(615))),
             },
             type_params: vec![],
@@ -39393,7 +39393,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_violations_singleton".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(982)],
-                output: DeclarationId(2060),
+                output: DeclarationId(2061),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(618))),
             },
             type_params: vec![],
@@ -39411,7 +39411,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_dimension_ok_tm_payload".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1222)],
-                output: DeclarationId(2061),
+                output: DeclarationId(2062),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(622))),
             },
             type_params: vec![],
@@ -39429,7 +39429,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_dimension_fail_tm_payload".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1222), DeclarationId(982)],
-                output: DeclarationId(2062),
+                output: DeclarationId(2063),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(627))),
             },
             type_params: vec![],
@@ -39447,7 +39447,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("report_dim_ok_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(1222)],
-                output: DeclarationId(2063),
+                output: DeclarationId(2064),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(634))),
             },
             type_params: vec![],
@@ -39465,7 +39465,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("report_dim_fail_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(1222), DeclarationId(982)],
-                output: DeclarationId(2064),
+                output: DeclarationId(2065),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(641))),
             },
             type_params: vec![],
@@ -39483,7 +39483,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("report_inhabits_branch_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(1222), DeclarationId(986)],
-                output: DeclarationId(2065),
+                output: DeclarationId(2066),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(646))),
             },
             type_params: vec![],
@@ -39500,8 +39500,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1195),
             name: Some("dimension_report_tm_from_witness".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(2066)],
-                output: DeclarationId(2067),
+                inputs: vec![DeclarationId(828), DeclarationId(2067)],
+                output: DeclarationId(2068),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(656))),
             },
             type_params: vec![],
@@ -39519,7 +39519,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("demo_ci_modeled_timing_dimension_report".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2068),
+                output: DeclarationId(2069),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(664))),
             },
             type_params: vec![],
@@ -39539,15 +39539,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Strict".to_string(),
-                        ty: DeclarationId(2098),
+                        ty: DeclarationId(2099),
                     },
                     Field {
                         label: "NonIncreasing".to_string(),
-                        ty: DeclarationId(2099),
+                        ty: DeclarationId(2100),
                     },
                     Field {
                         label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2100),
+                        ty: DeclarationId(2101),
                     },
                 ],
             },
@@ -39649,8 +39649,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1202),
             name: Some("optional_evidence_meet".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2090), DeclarationId(2091)],
-                output: DeclarationId(2092),
+                inputs: vec![DeclarationId(2091), DeclarationId(2092)],
+                output: DeclarationId(2093),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2488,
@@ -39671,8 +39671,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1203),
             name: Some("map_evidence_merge_at".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2093), DeclarationId(230), DeclarationId(1197)],
-                output: DeclarationId(2094),
+                inputs: vec![DeclarationId(2094), DeclarationId(230), DeclarationId(1197)],
+                output: DeclarationId(2095),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2833,
@@ -39696,23 +39696,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "TreeSize".to_string(),
-                        ty: DeclarationId(2101),
+                        ty: DeclarationId(2102),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(2102),
+                        ty: DeclarationId(2103),
                     },
                     Field {
                         label: "ArithmeticValue".to_string(),
-                        ty: DeclarationId(2103),
+                        ty: DeclarationId(2104),
                     },
                     Field {
                         label: "TokenPosition".to_string(),
-                        ty: DeclarationId(2104),
+                        ty: DeclarationId(2105),
                     },
                     Field {
                         label: "SetCardinality".to_string(),
-                        ty: DeclarationId(2105),
+                        ty: DeclarationId(2106),
                     },
                 ],
             },
@@ -39733,11 +39733,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "OneStep".to_string(),
-                        ty: DeclarationId(2106),
+                        ty: DeclarationId(2107),
                     },
                     Field {
                         label: "AdditionalStep".to_string(),
-                        ty: DeclarationId(2107),
+                        ty: DeclarationId(2108),
                     },
                 ],
             },
@@ -39780,11 +39780,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DivideByTwo".to_string(),
-                        ty: DeclarationId(2108),
+                        ty: DeclarationId(2109),
                     },
                     Field {
                         label: "StrictlyLarger".to_string(),
-                        ty: DeclarationId(2109),
+                        ty: DeclarationId(2110),
                     },
                 ],
             },
@@ -39847,7 +39847,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(93)],
-                output: DeclarationId(2095),
+                output: DeclarationId(2096),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     6420,
@@ -39869,7 +39869,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(93)],
-                output: DeclarationId(2096),
+                output: DeclarationId(2097),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     6860,
@@ -39893,31 +39893,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ChildAccessor".to_string(),
-                        ty: DeclarationId(2110),
+                        ty: DeclarationId(2111),
                     },
                     Field {
                         label: "ListShrink".to_string(),
-                        ty: DeclarationId(2111),
+                        ty: DeclarationId(2112),
                     },
                     Field {
                         label: "ArithmeticSubtractDescent".to_string(),
-                        ty: DeclarationId(2112),
+                        ty: DeclarationId(2113),
                     },
                     Field {
                         label: "ArithmeticDivideDescent".to_string(),
-                        ty: DeclarationId(2113),
+                        ty: DeclarationId(2114),
                     },
                     Field {
                         label: "ParserAdvance".to_string(),
-                        ty: DeclarationId(2114),
+                        ty: DeclarationId(2115),
                     },
                     Field {
                         label: "SetRemoval".to_string(),
-                        ty: DeclarationId(2115),
+                        ty: DeclarationId(2116),
                     },
                     Field {
                         label: "FoldIteration".to_string(),
-                        ty: DeclarationId(2116),
+                        ty: DeclarationId(2117),
                     },
                 ],
             },
@@ -39937,7 +39937,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "dimensions".to_string(),
-                    ty: DeclarationId(2117),
+                    ty: DeclarationId(2118),
                 }],
             },
             type_params: vec![],
@@ -39965,7 +39965,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "evidence".to_string(),
-                        ty: DeclarationId(2118),
+                        ty: DeclarationId(2119),
                     },
                 ],
             },
@@ -39985,7 +39985,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Strict".to_string(),
-                    ty: DeclarationId(2119),
+                    ty: DeclarationId(2120),
                 }],
             },
             type_params: vec![],
@@ -40005,11 +40005,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NonIncreasing".to_string(),
-                        ty: DeclarationId(2120),
+                        ty: DeclarationId(2121),
                     },
                     Field {
                         label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2121),
+                        ty: DeclarationId(2122),
                     },
                 ],
             },
@@ -40030,11 +40030,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "EvidenceUnknown".to_string(),
-                        ty: DeclarationId(2122),
+                        ty: DeclarationId(2123),
                     },
                     Field {
                         label: "EvidenceIncomplete".to_string(),
-                        ty: DeclarationId(2123),
+                        ty: DeclarationId(2124),
                     },
                 ],
             },
@@ -40063,7 +40063,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "per_path".to_string(),
-                        ty: DeclarationId(2124),
+                        ty: DeclarationId(2125),
                     },
                 ],
             },
@@ -40082,7 +40082,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("descent_execution_proof".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(724), DeclarationId(722)],
-                output: DeclarationId(2097),
+                output: DeclarationId(2098),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     12400,
@@ -40143,19 +40143,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Observed".to_string(),
-                        ty: DeclarationId(2127),
+                        ty: DeclarationId(2128),
                     },
                     Field {
                         label: "Unobserved".to_string(),
-                        ty: DeclarationId(2128),
+                        ty: DeclarationId(2129),
                     },
                     Field {
                         label: "Ambiguous".to_string(),
-                        ty: DeclarationId(2129),
+                        ty: DeclarationId(2130),
                     },
                     Field {
                         label: "Stale".to_string(),
-                        ty: DeclarationId(2130),
+                        ty: DeclarationId(2131),
                     },
                 ],
             },
@@ -40220,7 +40220,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "observations".to_string(),
-                    ty: DeclarationId(2131),
+                    ty: DeclarationId(2132),
                 }],
             },
             type_params: vec![],
@@ -40410,7 +40410,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("timing_lens_empty_corrections".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2125),
+                output: DeclarationId(2126),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(714))),
             },
             type_params: vec![],
@@ -40518,7 +40518,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("timing_lens_read".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2126),
+                output: DeclarationId(2127),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(793))),
             },
             type_params: vec![],
@@ -40556,183 +40556,183 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2143),
+                        ty: DeclarationId(2144),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2144),
+                        ty: DeclarationId(2145),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2145),
+                        ty: DeclarationId(2146),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2146),
+                        ty: DeclarationId(2147),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2147),
+                        ty: DeclarationId(2148),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2148),
+                        ty: DeclarationId(2149),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2149),
+                        ty: DeclarationId(2150),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2150),
+                        ty: DeclarationId(2151),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2151),
+                        ty: DeclarationId(2152),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2152),
+                        ty: DeclarationId(2153),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2153),
+                        ty: DeclarationId(2154),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2154),
+                        ty: DeclarationId(2155),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2155),
+                        ty: DeclarationId(2156),
                     },
                     Field {
                         label: "Ident".to_string(),
-                        ty: DeclarationId(2156),
+                        ty: DeclarationId(2157),
                     },
                     Field {
                         label: "IntLit".to_string(),
-                        ty: DeclarationId(2157),
+                        ty: DeclarationId(2158),
                     },
                     Field {
                         label: "StringLit".to_string(),
-                        ty: DeclarationId(2158),
+                        ty: DeclarationId(2159),
                     },
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2159),
+                        ty: DeclarationId(2160),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2160),
+                        ty: DeclarationId(2161),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2161),
+                        ty: DeclarationId(2162),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2162),
+                        ty: DeclarationId(2163),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2163),
+                        ty: DeclarationId(2164),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2164),
+                        ty: DeclarationId(2165),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2165),
+                        ty: DeclarationId(2166),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2166),
+                        ty: DeclarationId(2167),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2167),
+                        ty: DeclarationId(2168),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2168),
+                        ty: DeclarationId(2169),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2169),
+                        ty: DeclarationId(2170),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2170),
+                        ty: DeclarationId(2171),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2171),
+                        ty: DeclarationId(2172),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2172),
+                        ty: DeclarationId(2173),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2173),
+                        ty: DeclarationId(2174),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2174),
+                        ty: DeclarationId(2175),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2175),
+                        ty: DeclarationId(2176),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2176),
+                        ty: DeclarationId(2177),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2177),
+                        ty: DeclarationId(2178),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2178),
+                        ty: DeclarationId(2179),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2179),
+                        ty: DeclarationId(2180),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2180),
+                        ty: DeclarationId(2181),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2181),
+                        ty: DeclarationId(2182),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2182),
+                        ty: DeclarationId(2183),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2183),
+                        ty: DeclarationId(2184),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2184),
+                        ty: DeclarationId(2185),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2185),
+                        ty: DeclarationId(2186),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2186),
+                        ty: DeclarationId(2187),
                     },
                     Field {
                         label: "Eof".to_string(),
-                        ty: DeclarationId(2187),
+                        ty: DeclarationId(2188),
                     },
                 ],
             },
@@ -40778,55 +40778,55 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2188),
+                        ty: DeclarationId(2189),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2189),
+                        ty: DeclarationId(2190),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2190),
+                        ty: DeclarationId(2191),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2191),
+                        ty: DeclarationId(2192),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2192),
+                        ty: DeclarationId(2193),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2193),
+                        ty: DeclarationId(2194),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2194),
+                        ty: DeclarationId(2195),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2195),
+                        ty: DeclarationId(2196),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2196),
+                        ty: DeclarationId(2197),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2197),
+                        ty: DeclarationId(2198),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2198),
+                        ty: DeclarationId(2199),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2199),
+                        ty: DeclarationId(2200),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2200),
+                        ty: DeclarationId(2201),
                     },
                 ],
             },
@@ -40847,115 +40847,115 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2201),
+                        ty: DeclarationId(2202),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2202),
+                        ty: DeclarationId(2203),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2203),
+                        ty: DeclarationId(2204),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2204),
+                        ty: DeclarationId(2205),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2205),
+                        ty: DeclarationId(2206),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2206),
+                        ty: DeclarationId(2207),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2207),
+                        ty: DeclarationId(2208),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2208),
+                        ty: DeclarationId(2209),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2209),
+                        ty: DeclarationId(2210),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2210),
+                        ty: DeclarationId(2211),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2211),
+                        ty: DeclarationId(2212),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2212),
+                        ty: DeclarationId(2213),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2213),
+                        ty: DeclarationId(2214),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2214),
+                        ty: DeclarationId(2215),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2215),
+                        ty: DeclarationId(2216),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2216),
+                        ty: DeclarationId(2217),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2217),
+                        ty: DeclarationId(2218),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2218),
+                        ty: DeclarationId(2219),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2219),
+                        ty: DeclarationId(2220),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2220),
+                        ty: DeclarationId(2221),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2221),
+                        ty: DeclarationId(2222),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2222),
+                        ty: DeclarationId(2223),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2223),
+                        ty: DeclarationId(2224),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2224),
+                        ty: DeclarationId(2225),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2225),
+                        ty: DeclarationId(2226),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2226),
+                        ty: DeclarationId(2227),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2227),
+                        ty: DeclarationId(2228),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2228),
+                        ty: DeclarationId(2229),
                     },
                 ],
             },
@@ -41170,43 +41170,43 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-                        ty: DeclarationId(2232),
+                        ty: DeclarationId(2233),
                     },
                     Field {
                         label: "ParseError".to_string(),
-                        ty: DeclarationId(2233),
+                        ty: DeclarationId(2234),
                     },
                     Field {
                         label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(2234),
+                        ty: DeclarationId(2235),
                     },
                     Field {
                         label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(2235),
+                        ty: DeclarationId(2236),
                     },
                     Field {
                         label: "ResolveError".to_string(),
-                        ty: DeclarationId(2236),
+                        ty: DeclarationId(2237),
                     },
                     Field {
                         label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(2237),
+                        ty: DeclarationId(2238),
                     },
                     Field {
                         label: "BranchConditionNotBool".to_string(),
-                        ty: DeclarationId(2238),
+                        ty: DeclarationId(2239),
                     },
                     Field {
                         label: "MagnitudeOutOfRange".to_string(),
-                        ty: DeclarationId(2239),
+                        ty: DeclarationId(2240),
                     },
                     Field {
                         label: "MalformedIntegerRangeFact".to_string(),
-                        ty: DeclarationId(2240),
+                        ty: DeclarationId(2241),
                     },
                     Field {
                         label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(2241),
+                        ty: DeclarationId(2242),
                     },
                 ],
             },
@@ -41227,11 +41227,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "AnyDetail".to_string(),
-                        ty: DeclarationId(2242),
+                        ty: DeclarationId(2243),
                     },
                     Field {
                         label: "Contains".to_string(),
-                        ty: DeclarationId(2243),
+                        ty: DeclarationId(2244),
                     },
                 ],
             },
@@ -41277,11 +41277,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(2244),
+                        ty: DeclarationId(2245),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(2245),
+                        ty: DeclarationId(2246),
                     },
                 ],
             },
@@ -41301,7 +41301,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "AtMostBudget".to_string(),
-                    ty: DeclarationId(2246),
+                    ty: DeclarationId(2247),
                 }],
             },
             type_params: vec![],
@@ -41321,15 +41321,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Associativity".to_string(),
-                        ty: DeclarationId(2247),
+                        ty: DeclarationId(2248),
                     },
                     Field {
                         label: "Commutativity".to_string(),
-                        ty: DeclarationId(2248),
+                        ty: DeclarationId(2249),
                     },
                     Field {
                         label: "Identity".to_string(),
-                        ty: DeclarationId(2249),
+                        ty: DeclarationId(2250),
                     },
                 ],
             },
@@ -41368,7 +41368,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "LiteralProgram".to_string(),
-                    ty: DeclarationId(2250),
+                    ty: DeclarationId(2251),
                 }],
             },
             type_params: vec![],
@@ -41387,7 +41387,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "LinearCostForBindParam".to_string(),
-                    ty: DeclarationId(2251),
+                    ty: DeclarationId(2252),
                 }],
             },
             type_params: vec![],
@@ -41406,7 +41406,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "SelectedBindParamSizeVariable".to_string(),
-                    ty: DeclarationId(2252),
+                    ty: DeclarationId(2253),
                 }],
             },
             type_params: vec![],
@@ -41445,11 +41445,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LensCapabilityStructuralTerminal".to_string(),
-                        ty: DeclarationId(2253),
+                        ty: DeclarationId(2254),
                     },
                     Field {
                         label: "LensCapabilityStructuralPartial".to_string(),
-                        ty: DeclarationId(2254),
+                        ty: DeclarationId(2255),
                     },
                 ],
             },
@@ -41470,19 +41470,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LensCapabilityBehavioralComplete".to_string(),
-                        ty: DeclarationId(2255),
+                        ty: DeclarationId(2256),
                     },
                     Field {
                         label: "LensCapabilityBehavioralPartial".to_string(),
-                        ty: DeclarationId(2256),
+                        ty: DeclarationId(2257),
                     },
                     Field {
                         label: "LensCapabilityBehavioralStub".to_string(),
-                        ty: DeclarationId(2257),
+                        ty: DeclarationId(2258),
                     },
                     Field {
                         label: "LensCapabilityBehavioralNA".to_string(),
-                        ty: DeclarationId(2258),
+                        ty: DeclarationId(2259),
                     },
                 ],
             },
@@ -41503,15 +41503,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LensCapabilityV2RealV2".to_string(),
-                        ty: DeclarationId(2259),
+                        ty: DeclarationId(2260),
                     },
                     Field {
                         label: "LensCapabilityV2NoneV3Native".to_string(),
-                        ty: DeclarationId(2260),
+                        ty: DeclarationId(2261),
                     },
                     Field {
                         label: "LensCapabilityV2NotApplicable".to_string(),
-                        ty: DeclarationId(2261),
+                        ty: DeclarationId(2262),
                     },
                 ],
             },
@@ -41570,7 +41570,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2301)),
+            meta_tag: Some(DeclarationId(2302)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -41582,21 +41582,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2253),
+                            constructor: DeclarationId(2254),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2255),
+                            constructor: DeclarationId(2256),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2259),
+                            constructor: DeclarationId(2260),
                             payload: vec![],
                         },
                     ),
@@ -41609,21 +41609,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2253),
+                            constructor: DeclarationId(2254),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2255),
+                            constructor: DeclarationId(2256),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2259),
+                            constructor: DeclarationId(2260),
                             payload: vec![],
                         },
                     ),
@@ -41638,21 +41638,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2253),
+                            constructor: DeclarationId(2254),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2258),
+                            constructor: DeclarationId(2259),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2260),
+                            constructor: DeclarationId(2261),
                             payload: vec![],
                         },
                     ),
@@ -41667,21 +41667,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2253),
+                            constructor: DeclarationId(2254),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2256),
+                            constructor: DeclarationId(2257),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2260),
+                            constructor: DeclarationId(2261),
                             payload: vec![],
                         },
                     ),
@@ -41694,21 +41694,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2253),
+                            constructor: DeclarationId(2254),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2255),
+                            constructor: DeclarationId(2256),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2260),
+                            constructor: DeclarationId(2261),
                             payload: vec![],
                         },
                     ),
@@ -41728,14 +41728,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2257),
+                            constructor: DeclarationId(2256),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2260),
+                            constructor: DeclarationId(2261),
                             payload: vec![],
                         },
                     ),
@@ -41748,21 +41748,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2253),
+                            constructor: DeclarationId(2254),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2255),
+                            constructor: DeclarationId(2256),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2260),
+                            constructor: DeclarationId(2261),
                             payload: vec![],
                         },
                     ),
@@ -41777,21 +41777,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2253),
+                            constructor: DeclarationId(2254),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2255),
+                            constructor: DeclarationId(2256),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2260),
+                            constructor: DeclarationId(2261),
                             payload: vec![],
                         },
                     ),
@@ -41804,21 +41804,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2253),
+                            constructor: DeclarationId(2254),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2255),
+                            constructor: DeclarationId(2256),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2260),
+                            constructor: DeclarationId(2261),
                             payload: vec![],
                         },
                     ),
@@ -41833,21 +41833,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2253),
+                            constructor: DeclarationId(2254),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2255),
+                            constructor: DeclarationId(2256),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2260),
+                            constructor: DeclarationId(2261),
                             payload: vec![],
                         },
                     ),
@@ -41860,21 +41860,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2254),
+                            constructor: DeclarationId(2255),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2258),
+                            constructor: DeclarationId(2259),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2261),
+                            constructor: DeclarationId(2262),
                             payload: vec![],
                         },
                     ),
@@ -41887,21 +41887,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2254),
+                            constructor: DeclarationId(2255),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2258),
+                            constructor: DeclarationId(2259),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2261),
+                            constructor: DeclarationId(2262),
                             payload: vec![],
                         },
                     ),
@@ -41916,21 +41916,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2253),
+                            constructor: DeclarationId(2254),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2258),
+                            constructor: DeclarationId(2259),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2261),
+                            constructor: DeclarationId(2262),
                             payload: vec![],
                         },
                     ),
@@ -41938,7 +41938,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ])),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 6971, 9554),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6971, 9559),
         });
         declarations.push(Declaration {
             id: DeclarationId(1273),
@@ -41947,107 +41947,107 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Compiles".to_string(),
-                        ty: DeclarationId(2262),
+                        ty: DeclarationId(2263),
                     },
                     Field {
                         label: "FailsWithDiagnostic".to_string(),
-                        ty: DeclarationId(2263),
+                        ty: DeclarationId(2264),
                     },
                     Field {
                         label: "OutputEquals".to_string(),
-                        ty: DeclarationId(2264),
+                        ty: DeclarationId(2265),
                     },
                     Field {
                         label: "PortHasState".to_string(),
-                        ty: DeclarationId(2265),
+                        ty: DeclarationId(2266),
                     },
                     Field {
                         label: "DeclarationHasRefinement".to_string(),
-                        ty: DeclarationId(2266),
+                        ty: DeclarationId(2267),
                     },
                     Field {
                         label: "CostBounded".to_string(),
-                        ty: DeclarationId(2267),
+                        ty: DeclarationId(2268),
                     },
                     Field {
                         label: "BehavioralObservation".to_string(),
-                        ty: DeclarationId(2268),
+                        ty: DeclarationId(2269),
                     },
                     Field {
                         label: "MockBackedInvariant".to_string(),
-                        ty: DeclarationId(2269),
+                        ty: DeclarationId(2270),
                     },
                     Field {
                         label: "ExecuteCommand".to_string(),
-                        ty: DeclarationId(2271),
+                        ty: DeclarationId(2272),
                     },
                     Field {
                         label: "ForAllTargets".to_string(),
-                        ty: DeclarationId(2273),
+                        ty: DeclarationId(2274),
                     },
                     Field {
                         label: "LensOutputEquals".to_string(),
-                        ty: DeclarationId(2274),
+                        ty: DeclarationId(2275),
                     },
                     Field {
                         label: "DifferentialEquals".to_string(),
-                        ty: DeclarationId(2275),
+                        ty: DeclarationId(2276),
                     },
                     Field {
                         label: "SymbolicCostExprEquals".to_string(),
-                        ty: DeclarationId(2276),
+                        ty: DeclarationId(2277),
                     },
                     Field {
                         label: "SymbolicCostExprEqualsForBindParam".to_string(),
-                        ty: DeclarationId(2277),
+                        ty: DeclarationId(2278),
                     },
                     Field {
                         label: "PerfWithinBaseline".to_string(),
-                        ty: DeclarationId(2278),
+                        ty: DeclarationId(2279),
                     },
                     Field {
                         label: "BinaryDimensionReportEquals".to_string(),
-                        ty: DeclarationId(2279),
+                        ty: DeclarationId(2280),
                     },
                     Field {
                         label: "AlgebraicLaw".to_string(),
-                        ty: DeclarationId(2280),
+                        ty: DeclarationId(2281),
                     },
                     Field {
                         label: "CensusBoundCheck".to_string(),
-                        ty: DeclarationId(2281),
+                        ty: DeclarationId(2282),
                     },
                     Field {
                         label: "CensusSubsetCount".to_string(),
-                        ty: DeclarationId(2282),
+                        ty: DeclarationId(2283),
                     },
                     Field {
                         label: "FixedPointConverges".to_string(),
-                        ty: DeclarationId(2283),
+                        ty: DeclarationId(2284),
                     },
                     Field {
                         label: "RatchetZero".to_string(),
-                        ty: DeclarationId(2284),
+                        ty: DeclarationId(2285),
                     },
                     Field {
                         label: "GeneratedFromDag".to_string(),
-                        ty: DeclarationId(2286),
+                        ty: DeclarationId(2287),
                     },
                     Field {
                         label: "CementingDispatchMatchesProjection".to_string(),
-                        ty: DeclarationId(2287),
+                        ty: DeclarationId(2288),
                     },
                     Field {
                         label: "ReleaseDeferredClaim".to_string(),
-                        ty: DeclarationId(2288),
+                        ty: DeclarationId(2289),
                     },
                     Field {
                         label: "SubstrateResearchDeferredClaim".to_string(),
-                        ty: DeclarationId(2289),
+                        ty: DeclarationId(2290),
                     },
                     Field {
                         label: "BridgeLedgerZero".to_string(),
-                        ty: DeclarationId(2290),
+                        ty: DeclarationId(2291),
                     },
                 ],
             },
@@ -42059,7 +42059,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", 9556, 21968),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9561, 21973),
         });
         declarations.push(Declaration {
             id: DeclarationId(1274),
@@ -42073,7 +42073,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", 22076, 22096),
+            span: SourceSpan::new("src/v3/std/verification.dag", 22081, 22101),
         });
         declarations.push(Declaration {
             id: DeclarationId(1275),
@@ -42092,7 +42092,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", 22239, 22294),
+            span: SourceSpan::new("src/v3/std/verification.dag", 22244, 22299),
         });
         declarations.push(Declaration {
             id: DeclarationId(1276),
@@ -42117,7 +42117,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "requires".to_string(),
-                        ty: DeclarationId(2291),
+                        ty: DeclarationId(2292),
                     },
                 ],
             },
@@ -42129,7 +42129,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", 22904, 23037),
+            span: SourceSpan::new("src/v3/std/verification.dag", 22909, 23042),
         });
         declarations.push(Declaration {
             id: DeclarationId(1277),
@@ -42138,11 +42138,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ForAll".to_string(),
-                        ty: DeclarationId(2292),
+                        ty: DeclarationId(2293),
                     },
                     Field {
                         label: "Exists".to_string(),
-                        ty: DeclarationId(2293),
+                        ty: DeclarationId(2294),
                     },
                 ],
             },
@@ -42154,7 +42154,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", 23218, 23255),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23223, 23260),
         });
         declarations.push(Declaration {
             id: DeclarationId(1278),
@@ -42179,7 +42179,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "requires".to_string(),
-                        ty: DeclarationId(2294),
+                        ty: DeclarationId(2295),
                     },
                 ],
             },
@@ -42191,7 +42191,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", 23257, 23418),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23262, 23423),
         });
         declarations.push(Declaration {
             id: DeclarationId(1279),
@@ -42200,11 +42200,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "EnumeratedTestNode".to_string(),
-                        ty: DeclarationId(2295),
+                        ty: DeclarationId(2296),
                     },
                     Field {
                         label: "QuantifiedTestNode".to_string(),
-                        ty: DeclarationId(2296),
+                        ty: DeclarationId(2297),
                     },
                 ],
             },
@@ -42216,7 +42216,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", 25118, 25212),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25123, 25217),
         });
         declarations.push(Declaration {
             id: DeclarationId(1280),
@@ -42245,7 +42245,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", 25214, 25317),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25219, 25322),
         });
         declarations.push(Declaration {
             id: DeclarationId(1281),
@@ -42254,11 +42254,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Enumerated".to_string(),
-                        ty: DeclarationId(2297),
+                        ty: DeclarationId(2298),
                     },
                     Field {
                         label: "Quantified".to_string(),
-                        ty: DeclarationId(2298),
+                        ty: DeclarationId(2299),
                     },
                 ],
             },
@@ -42270,7 +42270,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", 26050, 26127),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26055, 26132),
         });
         declarations.push(Declaration {
             id: DeclarationId(1282),
@@ -42283,7 +42283,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "claims".to_string(),
-                        ty: DeclarationId(2299),
+                        ty: DeclarationId(2300),
                     },
                 ],
             },
@@ -42295,7 +42295,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", 26129, 26189),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26134, 26194),
         });
         declarations.push(Declaration {
             id: DeclarationId(1283),
@@ -42308,7 +42308,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "resources".to_string(),
-                        ty: DeclarationId(2300),
+                        ty: DeclarationId(2301),
                     },
                 ],
             },
@@ -42320,18 +42320,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", 26387, 26468),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26392, 26473),
         });
         declarations.push(Declaration {
             id: DeclarationId(1284),
             name: Some("claim_obligation_resources".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1276)],
-                output: DeclarationId(2229),
+                output: DeclarationId(2230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    26910,
-                    26926,
+                    26915,
+                    26931,
                 )),
             },
             type_params: vec![],
@@ -42342,7 +42342,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", 26839, 26926),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26844, 26931),
         });
         declarations.push(Declaration {
             id: DeclarationId(1285),
@@ -42352,8 +42352,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 output: DeclarationId(1283),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    26984,
-                    27069,
+                    26989,
+                    27074,
                 )),
             },
             type_params: vec![],
@@ -42364,7 +42364,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", 26928, 27069),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26933, 27074),
         });
         declarations.push(Declaration {
             id: DeclarationId(1286),
@@ -42374,8 +42374,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 output: DeclarationId(1283),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    27376,
-                    27442,
+                    27381,
+                    27447,
                 )),
             },
             type_params: vec![],
@@ -42386,7 +42386,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", 27299, 27442),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27304, 27447),
         });
         declarations.push(Declaration {
             id: DeclarationId(1287),
@@ -42404,18 +42404,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", 27747, 27936),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27752, 27941),
         });
         declarations.push(Declaration {
             id: DeclarationId(1288),
             name: Some("materialize_test_obligations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2230)],
-                output: DeclarationId(2231),
+                inputs: vec![DeclarationId(2231)],
+                output: DeclarationId(2232),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    28020,
-                    28065,
+                    28025,
+                    28070,
                 )),
             },
             type_params: vec![],
@@ -42426,14 +42426,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", 27938, 28065),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27943, 28070),
         });
         declarations.push(Declaration {
             id: DeclarationId(1289),
             name: Some("behavior_spine".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828)],
-                output: DeclarationId(2302),
+                output: DeclarationId(2303),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(813))),
             },
             type_params: vec![],
@@ -42570,15 +42570,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "SnapshotSurface".to_string(),
-                        ty: DeclarationId(2303),
+                        ty: DeclarationId(2304),
                     },
                     Field {
                         label: "SnapshotDag".to_string(),
-                        ty: DeclarationId(2304),
+                        ty: DeclarationId(2305),
                     },
                     Field {
                         label: "SnapshotText".to_string(),
-                        ty: DeclarationId(2305),
+                        ty: DeclarationId(2306),
                     },
                 ],
             },
@@ -42794,7 +42794,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2303),
+                            constructor: DeclarationId(2304),
                             payload: vec![],
                         },
                     ),
@@ -42829,7 +42829,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2304),
+                            constructor: DeclarationId(2305),
                             payload: vec![],
                         },
                     ),
@@ -42864,7 +42864,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2304),
+                            constructor: DeclarationId(2305),
                             payload: vec![],
                         },
                     ),
@@ -42899,7 +42899,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2304),
+                            constructor: DeclarationId(2305),
                             payload: vec![],
                         },
                     ),
@@ -42934,7 +42934,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2304),
+                            constructor: DeclarationId(2305),
                             payload: vec![],
                         },
                     ),
@@ -42969,7 +42969,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2305),
+                            constructor: DeclarationId(2306),
                             payload: vec![],
                         },
                     ),
@@ -43119,7 +43119,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("from_symbol".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230)],
-                output: DeclarationId(2306),
+                output: DeclarationId(2307),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/compiler/operators.dag",
                     156,
@@ -43350,6 +43350,42 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(1327),
+            name: Some("lens_parallelism_entry".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1322),
+                arguments: vec![],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: Some(DeclarationId(1322)),
+            specialization_parent: None,
+            inhabits: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "name".to_string(),
+                        FieldValue::Literal(LiteralBits::String("parallelism".to_string())),
+                    ),
+                    (
+                        "lens_file".to_string(),
+                        FieldValue::Literal(LiteralBits::String(
+                            "src/v3/lenses/parallelism.dag".to_string(),
+                        )),
+                    ),
+                    (
+                        "generated_file".to_string(),
+                        FieldValue::Literal(LiteralBits::String(
+                            "src/v3/compiler/src/lens_parallelism_generated.rs".to_string(),
+                        )),
+                    ),
+                ],
+            }),
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 3037, 3226),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1328),
             name: Some("lens_provenance_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1322),
@@ -43382,10 +43418,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 3037, 3222),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 3228, 3413),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1328),
+            id: DeclarationId(1329),
             name: Some("lens_structural_resolution_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1322),
@@ -43421,10 +43457,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 3224, 3453),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 3415, 3644),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1329),
+            id: DeclarationId(1330),
             name: Some("lens_unused_parameters_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1322),
@@ -43457,10 +43493,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 3455, 3668),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 3646, 3859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1330),
+            id: DeclarationId(1331),
             name: Some("lens_infer_helpers_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1322),
@@ -43493,10 +43529,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 4295, 4487),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 4486, 4678),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1331),
+            id: DeclarationId(1332),
             name: Some("lens_variant_payload_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1322),
@@ -43529,10 +43565,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 4489, 4689),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 4680, 4880),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1332),
+            id: DeclarationId(1333),
             name: Some("lens_lower_helpers_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1322),
@@ -43565,20 +43601,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 4939, 5131),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 5130, 5322),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1333),
+            id: DeclarationId(1334),
             name: Some("IntegerAlgebra".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "OrderedRingAlgebra".to_string(),
-                        ty: DeclarationId(2307),
+                        ty: DeclarationId(2308),
                     },
                     Field {
                         label: "SemiringAlgebra".to_string(),
-                        ty: DeclarationId(2308),
+                        ty: DeclarationId(2309),
                     },
                 ],
             },
@@ -43593,21 +43629,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6404, 6466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1334),
+            id: DeclarationId(1335),
             name: Some("NonIntegerAlgebra".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ApproximateFieldAlgebra".to_string(),
-                        ty: DeclarationId(2309),
+                        ty: DeclarationId(2310),
                     },
                     Field {
                         label: "BooleanAlgebraAlgebra".to_string(),
-                        ty: DeclarationId(2310),
+                        ty: DeclarationId(2311),
                     },
                     Field {
                         label: "TerminalAlgebra".to_string(),
-                        ty: DeclarationId(2311),
+                        ty: DeclarationId(2312),
                     },
                 ],
             },
@@ -43622,37 +43658,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6468, 6564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1335),
+            id: DeclarationId(1336),
             name: Some("TargetCarrier".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BitCarrier".to_string(),
-                        ty: DeclarationId(2312),
+                        ty: DeclarationId(2313),
                     },
                     Field {
                         label: "ByteCarrier".to_string(),
-                        ty: DeclarationId(2313),
+                        ty: DeclarationId(2314),
                     },
                     Field {
                         label: "Word16Carrier".to_string(),
-                        ty: DeclarationId(2314),
+                        ty: DeclarationId(2315),
                     },
                     Field {
                         label: "Word32Carrier".to_string(),
-                        ty: DeclarationId(2315),
+                        ty: DeclarationId(2316),
                     },
                     Field {
                         label: "Word64Carrier".to_string(),
-                        ty: DeclarationId(2316),
+                        ty: DeclarationId(2317),
                     },
                     Field {
                         label: "Word128Carrier".to_string(),
-                        ty: DeclarationId(2317),
+                        ty: DeclarationId(2318),
                     },
                     Field {
                         label: "TerminalCarrier".to_string(),
-                        ty: DeclarationId(2318),
+                        ty: DeclarationId(2319),
                     },
                 ],
             },
@@ -43667,21 +43703,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8154, 8296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1336),
+            id: DeclarationId(1337),
             name: Some("IntegerOverflow".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TwoComplementWrap".to_string(),
-                        ty: DeclarationId(2319),
+                        ty: DeclarationId(2320),
                     },
                     Field {
                         label: "Saturating".to_string(),
-                        ty: DeclarationId(2320),
+                        ty: DeclarationId(2321),
                     },
                     Field {
                         label: "Trap".to_string(),
-                        ty: DeclarationId(2321),
+                        ty: DeclarationId(2322),
                     },
                 ],
             },
@@ -43696,17 +43732,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9013, 9079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1337),
+            id: DeclarationId(1338),
             name: Some("RustPrimitive".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IntegerPrimitive".to_string(),
-                        ty: DeclarationId(2322),
+                        ty: DeclarationId(2323),
                     },
                     Field {
                         label: "NonIntegerPrimitive".to_string(),
-                        ty: DeclarationId(2323),
+                        ty: DeclarationId(2324),
                     },
                 ],
             },
@@ -43721,94 +43757,94 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9834, 10616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1338),
+            id: DeclarationId(1339),
             name: Some("rust_pilot_primitives".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1337),
+                    value: DeclarationId(1338),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2324)),
+            meta_tag: Some(DeclarationId(2325)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
                 FieldValue::Variant {
-                    constructor: DeclarationId(2322),
+                    constructor: DeclarationId(2323),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2307),
+                            constructor: DeclarationId(2308),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2313),
+                            constructor: DeclarationId(2314),
                             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(2319),
+                            constructor: DeclarationId(2320),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2322),
+                    constructor: DeclarationId(2323),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2307),
+                            constructor: DeclarationId(2308),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2314),
+                            constructor: DeclarationId(2315),
                             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(2319),
+                            constructor: DeclarationId(2320),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2322),
+                    constructor: DeclarationId(2323),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2307),
+                            constructor: DeclarationId(2308),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2315),
+                            constructor: DeclarationId(2316),
                             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(2319),
+                            constructor: DeclarationId(2320),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2322),
+                    constructor: DeclarationId(2323),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2307),
+                            constructor: DeclarationId(2308),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2316),
+                            constructor: DeclarationId(2317),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -43817,21 +43853,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(2319),
+                            constructor: DeclarationId(2320),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2322),
+                    constructor: DeclarationId(2323),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i128".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2307),
+                            constructor: DeclarationId(2308),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2317),
+                            constructor: DeclarationId(2318),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -43842,84 +43878,84 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2319),
+                            constructor: DeclarationId(2320),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2322),
+                    constructor: DeclarationId(2323),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2308),
+                            constructor: DeclarationId(2309),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2313),
+                            constructor: DeclarationId(2314),
                             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(2319),
+                            constructor: DeclarationId(2320),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2322),
+                    constructor: DeclarationId(2323),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2308),
+                            constructor: DeclarationId(2309),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2314),
+                            constructor: DeclarationId(2315),
                             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(2319),
+                            constructor: DeclarationId(2320),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2322),
+                    constructor: DeclarationId(2323),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2308),
+                            constructor: DeclarationId(2309),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2315),
+                            constructor: DeclarationId(2316),
                             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(2319),
+                            constructor: DeclarationId(2320),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2322),
+                    constructor: DeclarationId(2323),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2308),
+                            constructor: DeclarationId(2309),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2316),
+                            constructor: DeclarationId(2317),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
@@ -43928,21 +43964,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2319),
+                            constructor: DeclarationId(2320),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2322),
+                    constructor: DeclarationId(2323),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u128".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2308),
+                            constructor: DeclarationId(2309),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2317),
+                            constructor: DeclarationId(2318),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
@@ -43951,66 +43987,66 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2319),
+                            constructor: DeclarationId(2320),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2323),
+                    constructor: DeclarationId(2324),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("f32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2309),
+                            constructor: DeclarationId(2310),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2315),
+                            constructor: DeclarationId(2316),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2323),
+                    constructor: DeclarationId(2324),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("f64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2309),
+                            constructor: DeclarationId(2310),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2316),
+                            constructor: DeclarationId(2317),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2323),
+                    constructor: DeclarationId(2324),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("bool".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2310),
+                            constructor: DeclarationId(2311),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2312),
+                            constructor: DeclarationId(2313),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2323),
+                    constructor: DeclarationId(2324),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("()".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2311),
+                            constructor: DeclarationId(2312),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2318),
+                            constructor: DeclarationId(2319),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
@@ -44022,29 +44058,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10937, 15660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1339),
+            id: DeclarationId(1340),
             name: Some("CronField".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Wildcard".to_string(),
-                        ty: DeclarationId(2325),
+                        ty: DeclarationId(2326),
                     },
                     Field {
                         label: "Exact".to_string(),
-                        ty: DeclarationId(2326),
+                        ty: DeclarationId(2327),
                     },
                     Field {
                         label: "Listed".to_string(),
-                        ty: DeclarationId(2328),
+                        ty: DeclarationId(2329),
                     },
                     Field {
                         label: "Ranged".to_string(),
-                        ty: DeclarationId(2329),
+                        ty: DeclarationId(2330),
                     },
                     Field {
                         label: "Step".to_string(),
-                        ty: DeclarationId(2330),
+                        ty: DeclarationId(2331),
                     },
                 ],
             },
@@ -44059,29 +44095,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4214, 4433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1340),
+            id: DeclarationId(1341),
             name: Some("CronSchedule".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "minute".to_string(),
-                        ty: DeclarationId(1339),
+                        ty: DeclarationId(1340),
                     },
                     Field {
                         label: "hour".to_string(),
-                        ty: DeclarationId(1339),
+                        ty: DeclarationId(1340),
                     },
                     Field {
                         label: "day_of_month".to_string(),
-                        ty: DeclarationId(1339),
+                        ty: DeclarationId(1340),
                     },
                     Field {
                         label: "month".to_string(),
-                        ty: DeclarationId(1339),
+                        ty: DeclarationId(1340),
                     },
                     Field {
                         label: "day_of_week".to_string(),
-                        ty: DeclarationId(1339),
+                        ty: DeclarationId(1340),
                     },
                 ],
             },
@@ -44096,7 +44132,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4435, 4564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1341),
+            id: DeclarationId(1342),
             name: Some("CronEntry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44106,7 +44142,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "schedule".to_string(),
-                        ty: DeclarationId(1340),
+                        ty: DeclarationId(1341),
                     },
                     Field {
                         label: "command".to_string(),
@@ -44125,10 +44161,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4566, 4641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1342),
+            id: DeclarationId(1343),
             name: Some("render_cron_field".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1339)],
+                inputs: vec![DeclarationId(1340)],
                 output: DeclarationId(230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "dsl/extdeps/cron_schedule_model.dag",
@@ -44147,10 +44183,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4643, 4963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1343),
+            id: DeclarationId(1344),
             name: Some("render_cron_schedule".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1340)],
+                inputs: vec![DeclarationId(1341)],
                 output: DeclarationId(230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "dsl/extdeps/cron_schedule_model.dag",
@@ -44169,7 +44205,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4965, 5253),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1344),
+            id: DeclarationId(1345),
             name: Some("wire_contract".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(312),
@@ -44190,21 +44226,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 684, 758),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1345),
+            id: DeclarationId(1346),
             name: Some("UserType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "User".to_string(),
-                        ty: DeclarationId(2331),
+                        ty: DeclarationId(2332),
                     },
                     Field {
                         label: "Bot".to_string(),
-                        ty: DeclarationId(2332),
+                        ty: DeclarationId(2333),
                     },
                     Field {
                         label: "Organization".to_string(),
-                        ty: DeclarationId(2333),
+                        ty: DeclarationId(2334),
                     },
                 ],
             },
@@ -44219,7 +44255,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 831, 872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1346),
+            id: DeclarationId(1347),
             name: Some("GitHubUser".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44233,7 +44269,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "type".to_string(),
-                        ty: DeclarationId(1345),
+                        ty: DeclarationId(1346),
                     },
                 ],
             },
@@ -44248,7 +44284,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 874, 936),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1347),
+            id: DeclarationId(1348),
             name: Some("Repository".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44285,7 +44321,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1009, 1120),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1348),
+            id: DeclarationId(1349),
             name: Some("GitHubAuthToken".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44295,11 +44331,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "scopes".to_string(),
-                        ty: DeclarationId(2334),
+                        ty: DeclarationId(2335),
                     },
                     Field {
                         label: "expires_at".to_string(),
-                        ty: DeclarationId(2335),
+                        ty: DeclarationId(2336),
                     },
                 ],
             },
@@ -44314,29 +44350,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1193, 1286),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1349),
+            id: DeclarationId(1350),
             name: Some("GitHubScope".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ScopeRepo".to_string(),
-                        ty: DeclarationId(2336),
+                        ty: DeclarationId(2337),
                     },
                     Field {
                         label: "ScopeGist".to_string(),
-                        ty: DeclarationId(2337),
+                        ty: DeclarationId(2338),
                     },
                     Field {
                         label: "ScopeWorkflow".to_string(),
-                        ty: DeclarationId(2338),
+                        ty: DeclarationId(2339),
                     },
                     Field {
                         label: "ScopeReadOrg".to_string(),
-                        ty: DeclarationId(2339),
+                        ty: DeclarationId(2340),
                     },
                     Field {
                         label: "ScopeReadUser".to_string(),
-                        ty: DeclarationId(2340),
+                        ty: DeclarationId(2341),
                     },
                 ],
             },
@@ -44351,7 +44387,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1288, 1385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1350),
+            id: DeclarationId(1351),
             name: Some("Pagination".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44361,7 +44397,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "cursor".to_string(),
-                        ty: DeclarationId(2341),
+                        ty: DeclarationId(2342),
                     },
                     Field {
                         label: "has_next".to_string(),
@@ -44380,21 +44416,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1510, 1580),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1351),
+            id: DeclarationId(1352),
             name: Some("GitHubPermission".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PermRead".to_string(),
-                        ty: DeclarationId(2342),
+                        ty: DeclarationId(2343),
                     },
                     Field {
                         label: "PermWrite".to_string(),
-                        ty: DeclarationId(2343),
+                        ty: DeclarationId(2344),
                     },
                     Field {
                         label: "PermAdmin".to_string(),
-                        ty: DeclarationId(2344),
+                        ty: DeclarationId(2345),
                     },
                 ],
             },
@@ -44409,7 +44445,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1653, 1709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1352),
+            id: DeclarationId(1353),
             name: Some("default_api_base".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -44428,7 +44464,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1782, 1838),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1353),
+            id: DeclarationId(1354),
             name: Some("default_per_page".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -44445,7 +44481,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1840, 1871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1354),
+            id: DeclarationId(1355),
             name: Some("max_per_page".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -44462,7 +44498,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1873, 1901),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1355),
+            id: DeclarationId(1356),
             name: Some("Workflow".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44472,23 +44508,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "on".to_string(),
-                        ty: DeclarationId(2345),
+                        ty: DeclarationId(2346),
                     },
                     Field {
                         label: "concurrency".to_string(),
-                        ty: DeclarationId(2346),
+                        ty: DeclarationId(2347),
                     },
                     Field {
                         label: "jobs".to_string(),
-                        ty: DeclarationId(2347),
+                        ty: DeclarationId(2348),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(2349),
+                        ty: DeclarationId(2350),
                     },
                     Field {
                         label: "permissions".to_string(),
-                        ty: DeclarationId(2350),
+                        ty: DeclarationId(2351),
                     },
                 ],
             },
@@ -44503,25 +44539,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1484, 1748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1356),
+            id: DeclarationId(1357),
             name: Some("WorkflowPermissions".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "contents".to_string(),
-                        ty: DeclarationId(1357),
+                        ty: DeclarationId(1358),
                     },
                     Field {
                         label: "pull_requests".to_string(),
-                        ty: DeclarationId(1357),
+                        ty: DeclarationId(1358),
                     },
                     Field {
                         label: "issues".to_string(),
-                        ty: DeclarationId(1357),
+                        ty: DeclarationId(1358),
                     },
                     Field {
                         label: "actions".to_string(),
-                        ty: DeclarationId(1357),
+                        ty: DeclarationId(1358),
                     },
                 ],
             },
@@ -44536,21 +44572,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1750, 1892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1357),
+            id: DeclarationId(1358),
             name: Some("PermissionLevel".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PermRead".to_string(),
-                        ty: DeclarationId(2351),
+                        ty: DeclarationId(2352),
                     },
                     Field {
                         label: "PermWrite".to_string(),
-                        ty: DeclarationId(2352),
+                        ty: DeclarationId(2353),
                     },
                     Field {
                         label: "PermNone".to_string(),
-                        ty: DeclarationId(2353),
+                        ty: DeclarationId(2354),
                     },
                 ],
             },
@@ -44565,29 +44601,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1894, 1948),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1358),
+            id: DeclarationId(1359),
             name: Some("WorkflowTrigger".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Push".to_string(),
-                        ty: DeclarationId(2356),
+                        ty: DeclarationId(2357),
                     },
                     Field {
                         label: "PullRequest".to_string(),
-                        ty: DeclarationId(2359),
+                        ty: DeclarationId(2360),
                     },
                     Field {
                         label: "Schedule".to_string(),
-                        ty: DeclarationId(2360),
+                        ty: DeclarationId(2361),
                     },
                     Field {
                         label: "WorkflowDispatch".to_string(),
-                        ty: DeclarationId(2362),
+                        ty: DeclarationId(2363),
                     },
                     Field {
                         label: "WorkflowCall".to_string(),
-                        ty: DeclarationId(2364),
+                        ty: DeclarationId(2365),
                     },
                 ],
             },
@@ -44602,29 +44638,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2064, 2356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1359),
+            id: DeclarationId(1360),
             name: Some("PullRequestActivity".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Opened".to_string(),
-                        ty: DeclarationId(2365),
+                        ty: DeclarationId(2366),
                     },
                     Field {
                         label: "Synchronize".to_string(),
-                        ty: DeclarationId(2366),
+                        ty: DeclarationId(2367),
                     },
                     Field {
                         label: "Reopened".to_string(),
-                        ty: DeclarationId(2367),
+                        ty: DeclarationId(2368),
                     },
                     Field {
                         label: "ReadyForReview".to_string(),
-                        ty: DeclarationId(2368),
+                        ty: DeclarationId(2369),
                     },
                     Field {
                         label: "Closed".to_string(),
-                        ty: DeclarationId(2369),
+                        ty: DeclarationId(2370),
                     },
                 ],
             },
@@ -44639,7 +44675,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2358, 2452),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1360),
+            id: DeclarationId(1361),
             name: Some("DispatchInput".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44649,7 +44685,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "description".to_string(),
-                        ty: DeclarationId(2370),
+                        ty: DeclarationId(2371),
                     },
                     Field {
                         label: "required".to_string(),
@@ -44657,11 +44693,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "default".to_string(),
-                        ty: DeclarationId(2371),
+                        ty: DeclarationId(2372),
                     },
                     Field {
                         label: "type".to_string(),
-                        ty: DeclarationId(1361),
+                        ty: DeclarationId(1362),
                     },
                 ],
             },
@@ -44676,25 +44712,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2454, 2576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1361),
+            id: DeclarationId(1362),
             name: Some("DispatchInputType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "InputString".to_string(),
-                        ty: DeclarationId(2372),
+                        ty: DeclarationId(2373),
                     },
                     Field {
                         label: "InputBoolean".to_string(),
-                        ty: DeclarationId(2373),
+                        ty: DeclarationId(2374),
                     },
                     Field {
                         label: "InputChoice".to_string(),
-                        ty: DeclarationId(2374),
+                        ty: DeclarationId(2375),
                     },
                     Field {
                         label: "InputEnvironment".to_string(),
-                        ty: DeclarationId(2375),
+                        ty: DeclarationId(2376),
                     },
                 ],
             },
@@ -44709,21 +44745,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2578, 2662),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1362),
+            id: DeclarationId(1363),
             name: Some("SecretScope".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "StepScope".to_string(),
-                        ty: DeclarationId(2376),
+                        ty: DeclarationId(2377),
                     },
                     Field {
                         label: "JobScope".to_string(),
-                        ty: DeclarationId(2377),
+                        ty: DeclarationId(2378),
                     },
                     Field {
                         label: "WorkflowScope".to_string(),
-                        ty: DeclarationId(2378),
+                        ty: DeclarationId(2379),
                     },
                 ],
             },
@@ -44738,7 +44774,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4765, 4820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1363),
+            id: DeclarationId(1364),
             name: Some("WorkflowSecret".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44748,7 +44784,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "scope".to_string(),
-                        ty: DeclarationId(1362),
+                        ty: DeclarationId(1363),
                     },
                 ],
             },
@@ -44763,7 +44799,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5095, 5158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1364),
+            id: DeclarationId(1365),
             name: Some("Job".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44773,39 +44809,39 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(2379),
+                        ty: DeclarationId(2380),
                     },
                     Field {
                         label: "runner".to_string(),
-                        ty: DeclarationId(1368),
+                        ty: DeclarationId(1369),
                     },
                     Field {
                         label: "steps".to_string(),
-                        ty: DeclarationId(2380),
+                        ty: DeclarationId(2381),
                     },
                     Field {
                         label: "needs".to_string(),
-                        ty: DeclarationId(2381),
+                        ty: DeclarationId(2382),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(2383),
+                        ty: DeclarationId(2384),
                     },
                     Field {
                         label: "outputs".to_string(),
-                        ty: DeclarationId(2385),
+                        ty: DeclarationId(2386),
                     },
                     Field {
                         label: "if_condition".to_string(),
-                        ty: DeclarationId(2386),
+                        ty: DeclarationId(2387),
                     },
                     Field {
                         label: "strategy".to_string(),
-                        ty: DeclarationId(2387),
+                        ty: DeclarationId(2388),
                     },
                     Field {
                         label: "timeout_minutes".to_string(),
-                        ty: DeclarationId(2388),
+                        ty: DeclarationId(2389),
                     },
                     Field {
                         label: "continue_on_error".to_string(),
@@ -44813,7 +44849,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "concurrency".to_string(),
-                        ty: DeclarationId(2389),
+                        ty: DeclarationId(2390),
                     },
                 ],
             },
@@ -44828,17 +44864,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5302, 5771),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1365),
+            id: DeclarationId(1366),
             name: Some("CancelInProgressSpec".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "CancelInProgressBool".to_string(),
-                        ty: DeclarationId(2390),
+                        ty: DeclarationId(2391),
                     },
                     Field {
                         label: "CancelInProgressExpression".to_string(),
-                        ty: DeclarationId(2391),
+                        ty: DeclarationId(2392),
                     },
                 ],
             },
@@ -44853,17 +44889,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6589, 6709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1366),
+            id: DeclarationId(1367),
             name: Some("CancelInProgressWhenQueueMax".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "QueueMaxCancelInProgressFalse".to_string(),
-                        ty: DeclarationId(2392),
+                        ty: DeclarationId(2393),
                     },
                     Field {
                         label: "QueueMaxCancelInProgressExpression".to_string(),
-                        ty: DeclarationId(2393),
+                        ty: DeclarationId(2394),
                     },
                 ],
             },
@@ -44878,21 +44914,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7517, 7646),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1367),
+            id: DeclarationId(1368),
             name: Some("ConcurrencySpec".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ConcurrencyScalar".to_string(),
-                        ty: DeclarationId(2394),
+                        ty: DeclarationId(2395),
                     },
                     Field {
                         label: "ConcurrencyMappingQueueMax".to_string(),
-                        ty: DeclarationId(2396),
+                        ty: DeclarationId(2397),
                     },
                     Field {
                         label: "ConcurrencyMappingQueueNotMax".to_string(),
-                        ty: DeclarationId(2399),
+                        ty: DeclarationId(2400),
                     },
                 ],
             },
@@ -44907,21 +44943,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8199, 8845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1368),
+            id: DeclarationId(1369),
             name: Some("RunnerSpec".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "HostedRunner".to_string(),
-                        ty: DeclarationId(2400),
+                        ty: DeclarationId(2401),
                     },
                     Field {
                         label: "SelfHosted".to_string(),
-                        ty: DeclarationId(2402),
+                        ty: DeclarationId(2403),
                     },
                     Field {
                         label: "RunsOnExpression".to_string(),
-                        ty: DeclarationId(2403),
+                        ty: DeclarationId(2404),
                     },
                 ],
             },
@@ -44936,33 +44972,33 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10017, 10240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1369),
+            id: DeclarationId(1370),
             name: Some("RunnerLabel".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "UbuntuLatest".to_string(),
-                        ty: DeclarationId(2404),
+                        ty: DeclarationId(2405),
                     },
                     Field {
                         label: "Ubuntu2404".to_string(),
-                        ty: DeclarationId(2405),
+                        ty: DeclarationId(2406),
                     },
                     Field {
                         label: "Ubuntu2204".to_string(),
-                        ty: DeclarationId(2406),
+                        ty: DeclarationId(2407),
                     },
                     Field {
                         label: "MacosLatest".to_string(),
-                        ty: DeclarationId(2407),
+                        ty: DeclarationId(2408),
                     },
                     Field {
                         label: "Macos14".to_string(),
-                        ty: DeclarationId(2408),
+                        ty: DeclarationId(2409),
                     },
                     Field {
                         label: "WindowsLatest".to_string(),
-                        ty: DeclarationId(2409),
+                        ty: DeclarationId(2410),
                     },
                 ],
             },
@@ -44977,17 +45013,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10242, 10351),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1370),
+            id: DeclarationId(1371),
             name: Some("Step".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "RunStep".to_string(),
-                        ty: DeclarationId(2417),
+                        ty: DeclarationId(2418),
                     },
                     Field {
                         label: "UsesStep".to_string(),
-                        ty: DeclarationId(2425),
+                        ty: DeclarationId(2426),
                     },
                 ],
             },
@@ -45002,29 +45038,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10496, 11001),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1371),
+            id: DeclarationId(1372),
             name: Some("ShellType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Bash".to_string(),
-                        ty: DeclarationId(2426),
+                        ty: DeclarationId(2427),
                     },
                     Field {
                         label: "Sh".to_string(),
-                        ty: DeclarationId(2427),
+                        ty: DeclarationId(2428),
                     },
                     Field {
                         label: "Pwsh".to_string(),
-                        ty: DeclarationId(2428),
+                        ty: DeclarationId(2429),
                     },
                     Field {
                         label: "Python".to_string(),
-                        ty: DeclarationId(2429),
+                        ty: DeclarationId(2430),
                     },
                     Field {
                         label: "Cmd".to_string(),
-                        ty: DeclarationId(2430),
+                        ty: DeclarationId(2431),
                     },
                 ],
             },
@@ -45039,7 +45075,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11003, 11051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1372),
+            id: DeclarationId(1373),
             name: Some("ActionRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -45068,41 +45104,41 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11053, 11116),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1373),
+            id: DeclarationId(1374),
             name: Some("LogAnnotation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "AnnotationError".to_string(),
-                        ty: DeclarationId(2434),
+                        ty: DeclarationId(2435),
                     },
                     Field {
                         label: "AnnotationWarning".to_string(),
-                        ty: DeclarationId(2438),
+                        ty: DeclarationId(2439),
                     },
                     Field {
                         label: "AnnotationNotice".to_string(),
-                        ty: DeclarationId(2442),
+                        ty: DeclarationId(2443),
                     },
                     Field {
                         label: "AnnotationGroup".to_string(),
-                        ty: DeclarationId(2443),
+                        ty: DeclarationId(2444),
                     },
                     Field {
                         label: "AnnotationEndGroup".to_string(),
-                        ty: DeclarationId(2444),
+                        ty: DeclarationId(2445),
                     },
                     Field {
                         label: "SetOutput".to_string(),
-                        ty: DeclarationId(2445),
+                        ty: DeclarationId(2446),
                     },
                     Field {
                         label: "AddMask".to_string(),
-                        ty: DeclarationId(2446),
+                        ty: DeclarationId(2447),
                     },
                     Field {
                         label: "StopCommands".to_string(),
-                        ty: DeclarationId(2447),
+                        ty: DeclarationId(2448),
                     },
                 ],
             },
@@ -45117,7 +45153,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11350, 11777),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1374),
+            id: DeclarationId(1375),
             name: Some("annotation_error_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45136,7 +45172,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11843, 11892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1375),
+            id: DeclarationId(1376),
             name: Some("annotation_warning_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45155,7 +45191,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11893, 11946),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1376),
+            id: DeclarationId(1377),
             name: Some("annotation_notice_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45174,7 +45210,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11947, 11998),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1377),
+            id: DeclarationId(1378),
             name: Some("annotation_group_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45193,7 +45229,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11999, 12049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1378),
+            id: DeclarationId(1379),
             name: Some("annotation_endgroup".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45212,7 +45248,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12050, 12099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1379),
+            id: DeclarationId(1380),
             name: Some("annotation_set_output_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45231,7 +45267,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12100, 12164),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1380),
+            id: DeclarationId(1381),
             name: Some("annotation_add_mask_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45250,7 +45286,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12165, 12221),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1381),
+            id: DeclarationId(1382),
             name: Some("annotation_stop_commands_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45269,17 +45305,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12222, 12288),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1382),
+            id: DeclarationId(1383),
             name: Some("ArtifactOp".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Upload".to_string(),
-                        ty: DeclarationId(2449),
+                        ty: DeclarationId(2450),
                     },
                     Field {
                         label: "Download".to_string(),
-                        ty: DeclarationId(2451),
+                        ty: DeclarationId(2452),
                     },
                 ],
             },
@@ -45294,21 +45330,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12510, 12675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1383),
+            id: DeclarationId(1384),
             name: Some("MissingFilesBehavior".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Warn".to_string(),
-                        ty: DeclarationId(2452),
+                        ty: DeclarationId(2453),
                     },
                     Field {
                         label: "ErrorOut".to_string(),
-                        ty: DeclarationId(2453),
+                        ty: DeclarationId(2454),
                     },
                     Field {
                         label: "Ignore".to_string(),
-                        ty: DeclarationId(2454),
+                        ty: DeclarationId(2455),
                     },
                 ],
             },
@@ -45323,15 +45359,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12677, 12729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1384),
+            id: DeclarationId(1385),
             name: Some("upload_artifact_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1372),
+                template: DeclarationId(1373),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1372)),
+            meta_tag: Some(DeclarationId(1373)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -45344,15 +45380,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12780, 12889),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1385),
+            id: DeclarationId(1386),
             name: Some("download_artifact_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1372),
+                template: DeclarationId(1373),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1372)),
+            meta_tag: Some(DeclarationId(1373)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -45365,21 +45401,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12891, 13004),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1386),
+            id: DeclarationId(1387),
             name: Some("MatrixStrategy".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "dimensions".to_string(),
-                        ty: DeclarationId(2456),
+                        ty: DeclarationId(2457),
                     },
                     Field {
                         label: "include".to_string(),
-                        ty: DeclarationId(2458),
+                        ty: DeclarationId(2459),
                     },
                     Field {
                         label: "exclude".to_string(),
-                        ty: DeclarationId(2460),
+                        ty: DeclarationId(2461),
                     },
                     Field {
                         label: "fail_fast".to_string(),
@@ -45387,7 +45423,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "max_parallel".to_string(),
-                        ty: DeclarationId(2461),
+                        ty: DeclarationId(2462),
                     },
                 ],
             },
@@ -45402,33 +45438,33 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13143, 13319),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1387),
+            id: DeclarationId(1388),
             name: Some("CheckConclusion".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Success".to_string(),
-                        ty: DeclarationId(2462),
+                        ty: DeclarationId(2463),
                     },
                     Field {
                         label: "Failure".to_string(),
-                        ty: DeclarationId(2463),
+                        ty: DeclarationId(2464),
                     },
                     Field {
                         label: "Cancelled".to_string(),
-                        ty: DeclarationId(2464),
+                        ty: DeclarationId(2465),
                     },
                     Field {
                         label: "Skipped".to_string(),
-                        ty: DeclarationId(2465),
+                        ty: DeclarationId(2466),
                     },
                     Field {
                         label: "TimedOut".to_string(),
-                        ty: DeclarationId(2466),
+                        ty: DeclarationId(2467),
                     },
                     Field {
                         label: "ActionRequired".to_string(),
-                        ty: DeclarationId(2467),
+                        ty: DeclarationId(2468),
                     },
                 ],
             },
@@ -45443,15 +45479,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13448, 13550),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1388),
+            id: DeclarationId(1389),
             name: Some("checkout_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1372),
+                template: DeclarationId(1373),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1372)),
+            meta_tag: Some(DeclarationId(1373)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -45464,15 +45500,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13676, 13771),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1389),
+            id: DeclarationId(1390),
             name: Some("setup_rust_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1372),
+                template: DeclarationId(1373),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1372)),
+            meta_tag: Some(DeclarationId(1373)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -45485,15 +45521,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13773, 13897),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1390),
+            id: DeclarationId(1391),
             name: Some("cache_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1372),
+                template: DeclarationId(1373),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1372)),
+            meta_tag: Some(DeclarationId(1373)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -45506,7 +45542,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13899, 13988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1391),
+            id: DeclarationId(1392),
             name: Some("max_job_timeout_minutes".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -45523,7 +45559,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14064, 14103),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1392),
+            id: DeclarationId(1393),
             name: Some("default_job_timeout_minutes".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -45540,7 +45576,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14105, 14148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1393),
+            id: DeclarationId(1394),
             name: Some("max_matrix_combinations".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -45557,7 +45593,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14150, 14189),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1394),
+            id: DeclarationId(1395),
             name: Some("github_actions_workflows_dir".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45576,17 +45612,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1207, 1270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1395),
+            id: DeclarationId(1396),
             name: Some("GitHubActionsWorkflowExtension".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "GitHubActionsWorkflowYml".to_string(),
-                        ty: DeclarationId(2468),
+                        ty: DeclarationId(2469),
                     },
                     Field {
                         label: "GitHubActionsWorkflowYaml".to_string(),
-                        ty: DeclarationId(2469),
+                        ty: DeclarationId(2470),
                     },
                 ],
             },
@@ -45601,7 +45637,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1895, 1989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1396),
+            id: DeclarationId(1397),
             name: Some("GitHubActionsWorkflowStemSegment".to_string()),
             connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
@@ -45610,17 +45646,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(2470)),
+            refinement: Some(DeclarationId(2471)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2615, 2714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1397),
+            id: DeclarationId(1398),
             name: Some("GitHubActionsWorkflowStem".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "segment".to_string(),
-                    ty: DeclarationId(1396),
+                    ty: DeclarationId(1397),
                 }],
             },
             type_params: vec![],
@@ -45634,17 +45670,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2916, 2994),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1398),
+            id: DeclarationId(1399),
             name: Some("GitHubActionsWorkflowFileRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "stem".to_string(),
-                        ty: DeclarationId(1397),
+                        ty: DeclarationId(1398),
                     },
                     Field {
                         label: "extension".to_string(),
-                        ty: DeclarationId(1395),
+                        ty: DeclarationId(1396),
                     },
                 ],
             },
@@ -45659,7 +45695,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 3398, 3513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1399),
+            id: DeclarationId(1400),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45679,7 +45715,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(1400),
+            id: DeclarationId(1401),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45699,7 +45735,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(1401),
+            id: DeclarationId(1402),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45719,7 +45755,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(1402),
+            id: DeclarationId(1403),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45739,7 +45775,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(1403),
+            id: DeclarationId(1404),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45759,7 +45795,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(1404),
+            id: DeclarationId(1405),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(695), DeclarationId(694)],
@@ -45777,7 +45813,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(1405),
+            id: DeclarationId(1406),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45797,7 +45833,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(1406),
+            id: DeclarationId(1407),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(697), DeclarationId(698)],
@@ -45815,7 +45851,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(1407),
+            id: DeclarationId(1408),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45835,7 +45871,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(1408),
+            id: DeclarationId(1409),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45855,7 +45891,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(1409),
+            id: DeclarationId(1410),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45875,7 +45911,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(1410),
+            id: DeclarationId(1411),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45895,7 +45931,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(1411),
+            id: DeclarationId(1412),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(702)],
@@ -45913,7 +45949,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(1412),
+            id: DeclarationId(1413),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45933,7 +45969,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(1413),
+            id: DeclarationId(1414),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45953,7 +45989,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(1414),
+            id: DeclarationId(1415),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(705)],
@@ -45971,7 +46007,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(1415),
+            id: DeclarationId(1416),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45991,7 +46027,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(1416),
+            id: DeclarationId(1417),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46011,7 +46047,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(1417),
+            id: DeclarationId(1418),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46031,11 +46067,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(1418),
+            id: DeclarationId(1419),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(707)],
-                output: DeclarationId(1417),
+                output: DeclarationId(1418),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -46049,7 +46085,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(1419),
+            id: DeclarationId(1420),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46069,7 +46105,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(1420),
+            id: DeclarationId(1421),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46089,7 +46125,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(1421),
+            id: DeclarationId(1422),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46109,7 +46145,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(1422),
+            id: DeclarationId(1423),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46129,7 +46165,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(1423),
+            id: DeclarationId(1424),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(713),
@@ -46149,13 +46185,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(1424),
+            id: DeclarationId(1425),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1423),
+                    value: DeclarationId(1424),
                 }],
             },
             type_params: vec![],
@@ -46169,7 +46205,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(1425),
+            id: DeclarationId(1426),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46189,7 +46225,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(1426),
+            id: DeclarationId(1427),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(713),
@@ -46209,13 +46245,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(1427),
+            id: DeclarationId(1428),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1426),
+                    value: DeclarationId(1427),
                 }],
             },
             type_params: vec![],
@@ -46229,7 +46265,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(1428),
+            id: DeclarationId(1429),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46249,7 +46285,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(1429),
+            id: DeclarationId(1430),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -46263,7 +46299,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(1430),
+            id: DeclarationId(1431),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46283,7 +46319,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(1431),
+            id: DeclarationId(1432),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -46293,7 +46329,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "tail".to_string(),
-                        ty: DeclarationId(1430),
+                        ty: DeclarationId(1431),
                     },
                 ],
             },
@@ -46308,7 +46344,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(1432),
+            id: DeclarationId(1433),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46328,7 +46364,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(1433),
+            id: DeclarationId(1434),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46348,7 +46384,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(1434),
+            id: DeclarationId(1435),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -46367,7 +46403,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(1435),
+            id: DeclarationId(1436),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -46387,7 +46423,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(1436),
+            id: DeclarationId(1437),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(713),
@@ -46407,7 +46443,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(1437),
+            id: DeclarationId(1438),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -46427,11 +46463,11 @@ 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(1438),
+            id: DeclarationId(1439),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1437),
+                    DeclarationId(1438),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -46446,7 +46482,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(1439),
+            id: DeclarationId(1440),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46466,7 +46502,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(1440),
+            id: DeclarationId(1441),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -46486,11 +46522,11 @@ 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(1441),
+            id: DeclarationId(1442),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1440),
+                    DeclarationId(1441),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -46505,7 +46541,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(1442),
+            id: DeclarationId(1443),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46525,7 +46561,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(1443),
+            id: DeclarationId(1444),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -46544,7 +46580,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(1444),
+            id: DeclarationId(1445),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -46563,7 +46599,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(1445),
+            id: DeclarationId(1446),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -46582,7 +46618,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(1446),
+            id: DeclarationId(1447),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46602,7 +46638,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 36581, 36602),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1447),
+            id: DeclarationId(1448),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46622,7 +46658,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 36608, 36639),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1448),
+            id: DeclarationId(1449),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -46641,7 +46677,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(1449),
+            id: DeclarationId(1450),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -46660,7 +46696,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(1450),
+            id: DeclarationId(1451),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46680,7 +46716,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(1451),
+            id: DeclarationId(1452),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46700,12 +46736,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(1452),
+            id: DeclarationId(1453),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tokens".to_string(),
-                    ty: DeclarationId(1451),
+                    ty: DeclarationId(1452),
                 }],
             },
             type_params: vec![],
@@ -46719,7 +46755,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(1453),
+            id: DeclarationId(1454),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -46744,7 +46780,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(1454),
+            id: DeclarationId(1455),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -46763,7 +46799,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(1455),
+            id: DeclarationId(1456),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -46792,7 +46828,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(1456),
+            id: DeclarationId(1457),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -46806,7 +46842,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(1457),
+            id: DeclarationId(1458),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -46825,7 +46861,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(1458),
+            id: DeclarationId(1459),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -46844,7 +46880,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(1459),
+            id: DeclarationId(1460),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -46863,7 +46899,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(1460),
+            id: DeclarationId(1461),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -46877,7 +46913,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(1461),
+            id: DeclarationId(1462),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -46896,7 +46932,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(1462),
+            id: DeclarationId(1463),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -46915,7 +46951,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(1463),
+            id: DeclarationId(1464),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -46929,7 +46965,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(1464),
+            id: DeclarationId(1465),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -46948,7 +46984,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(1465),
+            id: DeclarationId(1466),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -46967,7 +47003,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(1466),
+            id: DeclarationId(1467),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -46986,7 +47022,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(1467),
+            id: DeclarationId(1468),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -47006,12 +47042,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(1468),
+            id: DeclarationId(1469),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "fields".to_string(),
-                    ty: DeclarationId(1467),
+                    ty: DeclarationId(1468),
                 }],
             },
             type_params: vec![],
@@ -47025,7 +47061,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(1469),
+            id: DeclarationId(1470),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47039,7 +47075,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(1470),
+            id: DeclarationId(1471),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47053,7 +47089,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(1471),
+            id: DeclarationId(1472),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47072,7 +47108,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(1472),
+            id: DeclarationId(1473),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47091,7 +47127,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(1473),
+            id: DeclarationId(1474),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -47116,7 +47152,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(1474),
+            id: DeclarationId(1475),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -47153,7 +47189,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(1475),
+            id: DeclarationId(1476),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47167,7 +47203,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(1476),
+            id: DeclarationId(1477),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -47187,12 +47223,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(1477),
+            id: DeclarationId(1478),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "first_breaker".to_string(),
-                    ty: DeclarationId(1476),
+                    ty: DeclarationId(1477),
                 }],
             },
             type_params: vec![],
@@ -47206,7 +47242,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(1478),
+            id: DeclarationId(1479),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -47226,12 +47262,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(1479),
+            id: DeclarationId(1480),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "ops".to_string(),
-                    ty: DeclarationId(1478),
+                    ty: DeclarationId(1479),
                 }],
             },
             type_params: vec![],
@@ -47245,7 +47281,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(1480),
+            id: DeclarationId(1481),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -47265,12 +47301,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(1481),
+            id: DeclarationId(1482),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "arms".to_string(),
-                    ty: DeclarationId(1480),
+                    ty: DeclarationId(1481),
                 }],
             },
             type_params: vec![],
@@ -47284,7 +47320,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(1482),
+            id: DeclarationId(1483),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47303,7 +47339,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(1483),
+            id: DeclarationId(1484),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -47323,12 +47359,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(1484),
+            id: DeclarationId(1485),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "branches".to_string(),
-                    ty: DeclarationId(1483),
+                    ty: DeclarationId(1484),
                 }],
             },
             type_params: vec![],
@@ -47342,7 +47378,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(1485),
+            id: DeclarationId(1486),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47361,7 +47397,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(1486),
+            id: DeclarationId(1487),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47380,7 +47416,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(1487),
+            id: DeclarationId(1488),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47394,7 +47430,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(1488),
+            id: DeclarationId(1489),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47408,7 +47444,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(1489),
+            id: DeclarationId(1490),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47422,7 +47458,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(1490),
+            id: DeclarationId(1491),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47436,7 +47472,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(1491),
+            id: DeclarationId(1492),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47450,7 +47486,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(1492),
+            id: DeclarationId(1493),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47469,7 +47505,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(1493),
+            id: DeclarationId(1494),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47488,7 +47524,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(1494),
+            id: DeclarationId(1495),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47502,7 +47538,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 32458, 32464),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1495),
+            id: DeclarationId(1496),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47521,7 +47557,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 32469, 32506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1496),
+            id: DeclarationId(1497),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47540,7 +47576,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 32511, 32548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1497),
+            id: DeclarationId(1498),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47554,7 +47590,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 33022, 33041),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1498),
+            id: DeclarationId(1499),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47573,7 +47609,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 33046, 33095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1499),
+            id: DeclarationId(1500),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -47592,7 +47628,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1500),
+            id: DeclarationId(1501),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -47611,7 +47647,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1501),
+            id: DeclarationId(1502),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -47630,7 +47666,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1502),
+            id: DeclarationId(1503),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -47649,7 +47685,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1503),
+            id: DeclarationId(1504),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -47668,7 +47704,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1504),
+            id: DeclarationId(1505),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -47687,7 +47723,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1505),
+            id: DeclarationId(1506),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -47707,7 +47743,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 28003, 28024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1506),
+            id: DeclarationId(1507),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -47727,7 +47763,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 28088, 28109),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1507),
+            id: DeclarationId(1508),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47741,7 +47777,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 754, 764),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1508),
+            id: DeclarationId(1509),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47760,7 +47796,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 769, 788),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1509),
+            id: DeclarationId(1510),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47774,7 +47810,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 793, 803),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1510),
+            id: DeclarationId(1511),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -47793,7 +47829,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1511),
+            id: DeclarationId(1512),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47812,7 +47848,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 1379, 1393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1512),
+            id: DeclarationId(1513),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47831,7 +47867,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 1398, 1411),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1513),
+            id: DeclarationId(1514),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47850,7 +47886,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 1416, 1433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1514),
+            id: DeclarationId(1515),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47869,7 +47905,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 3566, 3586),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1515),
+            id: DeclarationId(1516),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47888,7 +47924,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 3591, 3619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1516),
+            id: DeclarationId(1517),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47907,7 +47943,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 3624, 3658),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1517),
+            id: DeclarationId(1518),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47926,7 +47962,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 3663, 3692),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1518),
+            id: DeclarationId(1519),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47945,7 +47981,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 3697, 3714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1519),
+            id: DeclarationId(1520),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47959,7 +47995,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 4338, 4345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1520),
+            id: DeclarationId(1521),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47978,7 +48014,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 4350, 4400),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1521),
+            id: DeclarationId(1522),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47997,7 +48033,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 5964, 5988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1522),
+            id: DeclarationId(1523),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48011,7 +48047,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6013, 6022),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1523),
+            id: DeclarationId(1524),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48030,7 +48066,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6027, 6063),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1524),
+            id: DeclarationId(1525),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -48055,7 +48091,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6375, 6425),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1525),
+            id: DeclarationId(1526),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48069,7 +48105,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6430, 6439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1526),
+            id: DeclarationId(1527),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(786),
@@ -48089,12 +48125,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7015, 7028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1527),
+            id: DeclarationId(1528),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1526),
+                    ty: DeclarationId(1527),
                 }],
             },
             type_params: vec![],
@@ -48108,7 +48144,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7003, 7029),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1528),
+            id: DeclarationId(1529),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48122,7 +48158,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7034, 7051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1529),
+            id: DeclarationId(1530),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48141,7 +48177,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7302, 7312),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1530),
+            id: DeclarationId(1531),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48155,7 +48191,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7317, 7326),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1531),
+            id: DeclarationId(1532),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48169,7 +48205,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7331, 7340),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1532),
+            id: DeclarationId(1533),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48188,7 +48224,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7767, 7787),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1533),
+            id: DeclarationId(1534),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48207,7 +48243,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7792, 7816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1534),
+            id: DeclarationId(1535),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48227,12 +48263,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7828, 7844),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1535),
+            id: DeclarationId(1536),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1534),
+                    ty: DeclarationId(1535),
                 }],
             },
             type_params: vec![],
@@ -48246,7 +48282,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7821, 7845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1536),
+            id: DeclarationId(1537),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48266,12 +48302,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7855, 7871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1537),
+            id: DeclarationId(1538),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1536),
+                    ty: DeclarationId(1537),
                 }],
             },
             type_params: vec![],
@@ -48285,7 +48321,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7850, 7872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1538),
+            id: DeclarationId(1539),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48305,12 +48341,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7881, 7897),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1539),
+            id: DeclarationId(1540),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1538),
+                    ty: DeclarationId(1539),
                 }],
             },
             type_params: vec![],
@@ -48324,7 +48360,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7877, 7898),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1540),
+            id: DeclarationId(1541),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48344,7 +48380,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7961, 7977),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1541),
+            id: DeclarationId(1542),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -48354,7 +48390,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "payload".to_string(),
-                        ty: DeclarationId(1540),
+                        ty: DeclarationId(1541),
                     },
                 ],
             },
@@ -48369,7 +48405,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7903, 7983),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1542),
+            id: DeclarationId(1543),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48388,7 +48424,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9596, 9625),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1543),
+            id: DeclarationId(1544),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48408,12 +48444,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9660, 9676),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1544),
+            id: DeclarationId(1545),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "fields".to_string(),
-                    ty: DeclarationId(1543),
+                    ty: DeclarationId(1544),
                 }],
             },
             type_params: vec![],
@@ -48427,7 +48463,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9630, 9678),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1545),
+            id: DeclarationId(1546),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48446,7 +48482,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9683, 9711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1546),
+            id: DeclarationId(1547),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48466,12 +48502,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9730, 9746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1547),
+            id: DeclarationId(1548),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1546),
+                    ty: DeclarationId(1547),
                 }],
             },
             type_params: vec![],
@@ -48485,7 +48521,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9716, 9747),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1548),
+            id: DeclarationId(1549),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48505,12 +48541,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9765, 9781),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1549),
+            id: DeclarationId(1550),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1548),
+                    ty: DeclarationId(1549),
                 }],
             },
             type_params: vec![],
@@ -48524,7 +48560,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9752, 9782),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1550),
+            id: DeclarationId(1551),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48543,7 +48579,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11036, 11059),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1551),
+            id: DeclarationId(1552),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48562,7 +48598,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11064, 11098),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1552),
+            id: DeclarationId(1553),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48576,7 +48612,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11103, 11110),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1553),
+            id: DeclarationId(1554),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48590,7 +48626,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11115, 11121),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1554),
+            id: DeclarationId(1555),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48609,7 +48645,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11126, 11146),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1555),
+            id: DeclarationId(1556),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48628,7 +48664,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11375, 11392),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1556),
+            id: DeclarationId(1557),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48648,12 +48684,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11414, 11429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1557),
+            id: DeclarationId(1558),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "children".to_string(),
-                    ty: DeclarationId(1556),
+                    ty: DeclarationId(1557),
                 }],
             },
             type_params: vec![],
@@ -48667,7 +48703,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11397, 11431),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1558),
+            id: DeclarationId(1559),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48687,12 +48723,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11453, 11468),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1559),
+            id: DeclarationId(1560),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "variants".to_string(),
-                    ty: DeclarationId(1558),
+                    ty: DeclarationId(1559),
                 }],
             },
             type_params: vec![],
@@ -48706,7 +48742,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11436, 11470),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1560),
+            id: DeclarationId(1561),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48726,13 +48762,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11497, 11516),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1561),
+            id: DeclarationId(1562),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(1560),
+                        ty: DeclarationId(1561),
                     },
                     Field {
                         label: "output".to_string(),
@@ -48755,7 +48791,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11475, 11572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1562),
+            id: DeclarationId(1563),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -48780,7 +48816,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11577, 11655),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1563),
+            id: DeclarationId(1564),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48800,7 +48836,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11723, 11745),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1564),
+            id: DeclarationId(1565),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -48810,7 +48846,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "arguments".to_string(),
-                        ty: DeclarationId(1563),
+                        ty: DeclarationId(1564),
                     },
                 ],
             },
@@ -48825,7 +48861,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11660, 11751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1565),
+            id: DeclarationId(1566),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -48844,7 +48880,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1566),
+            id: DeclarationId(1567),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48864,7 +48900,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11852, 11871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1567),
+            id: DeclarationId(1568),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48884,7 +48920,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11890, 11912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1568),
+            id: DeclarationId(1569),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -48903,7 +48939,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1569),
+            id: DeclarationId(1570),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -48922,7 +48958,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1570),
+            id: DeclarationId(1571),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -48941,7 +48977,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1571),
+            id: DeclarationId(1572),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -48960,7 +48996,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1572),
+            id: DeclarationId(1573),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48980,7 +49016,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13149, 13168),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1573),
+            id: DeclarationId(1574),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48994,7 +49030,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13449, 13452),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1574),
+            id: DeclarationId(1575),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49008,7 +49044,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13457, 13460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1575),
+            id: DeclarationId(1576),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49022,7 +49058,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13465, 13468),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1576),
+            id: DeclarationId(1577),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49036,7 +49072,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13473, 13476),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1577),
+            id: DeclarationId(1578),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49050,7 +49086,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13600, 13602),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1578),
+            id: DeclarationId(1579),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49064,7 +49100,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13607, 13609),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1579),
+            id: DeclarationId(1580),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49078,7 +49114,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13614, 13616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1580),
+            id: DeclarationId(1581),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49092,7 +49128,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13621, 13623),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1581),
+            id: DeclarationId(1582),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49106,7 +49142,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13628, 13630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1582),
+            id: DeclarationId(1583),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49120,7 +49156,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13635, 13637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1583),
+            id: DeclarationId(1584),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49134,7 +49170,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14414, 14417),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1584),
+            id: DeclarationId(1585),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49148,7 +49184,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14422, 14424),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1585),
+            id: DeclarationId(1586),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49167,7 +49203,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14660, 14684),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1586),
+            id: DeclarationId(1587),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49186,7 +49222,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14689, 14713),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1587),
+            id: DeclarationId(1588),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49205,7 +49241,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14718, 14736),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1588),
+            id: DeclarationId(1589),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49224,7 +49260,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14923, 14946),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1589),
+            id: DeclarationId(1590),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49243,7 +49279,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14951, 15007),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1590),
+            id: DeclarationId(1591),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49262,7 +49298,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15012, 15066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1591),
+            id: DeclarationId(1592),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49281,7 +49317,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15071, 15093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1592),
+            id: DeclarationId(1593),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -49306,7 +49342,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15218, 15270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1593),
+            id: DeclarationId(1594),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49325,7 +49361,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15275, 15305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1594),
+            id: DeclarationId(1595),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49344,7 +49380,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1595),
+            id: DeclarationId(1596),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -49364,7 +49400,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 17460, 17491),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1596),
+            id: DeclarationId(1597),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(725),
@@ -49384,7 +49420,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 17515, 17545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1597),
+            id: DeclarationId(1598),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49403,7 +49439,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18168, 18197),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1598),
+            id: DeclarationId(1599),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -49428,7 +49464,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18202, 18249),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1599),
+            id: DeclarationId(1600),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49447,7 +49483,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1600),
+            id: DeclarationId(1601),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49467,7 +49503,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18607, 18619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1601),
+            id: DeclarationId(1602),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49481,7 +49517,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18860, 18869),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1602),
+            id: DeclarationId(1603),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49501,7 +49537,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18927, 18943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1603),
+            id: DeclarationId(1604),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49520,7 +49556,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1604),
+            id: DeclarationId(1605),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49534,7 +49570,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19445, 19457),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1605),
+            id: DeclarationId(1606),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49554,7 +49590,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19535, 19547),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1606),
+            id: DeclarationId(1607),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49573,7 +49609,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1607),
+            id: DeclarationId(1608),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49592,7 +49628,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1608),
+            id: DeclarationId(1609),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49611,7 +49647,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19737, 19753),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1609),
+            id: DeclarationId(1610),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49630,7 +49666,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19758, 19782),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1610),
+            id: DeclarationId(1611),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49649,7 +49685,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19787, 19805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1611),
+            id: DeclarationId(1612),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49668,7 +49704,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19810, 19824),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1612),
+            id: DeclarationId(1613),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49687,7 +49723,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19829, 19843),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1613),
+            id: DeclarationId(1614),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49707,7 +49743,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19872, 19889),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1614),
+            id: DeclarationId(1615),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49727,7 +49763,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19899, 19913),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1615),
+            id: DeclarationId(1616),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49747,7 +49783,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19923, 19936),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1616),
+            id: DeclarationId(1617),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49767,7 +49803,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19949, 19962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1617),
+            id: DeclarationId(1618),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49786,7 +49822,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 26045, 26063),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1618),
+            id: DeclarationId(1619),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49800,7 +49836,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 26068, 26074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1619),
+            id: DeclarationId(1620),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -49820,12 +49856,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 26107, 26131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1620),
+            id: DeclarationId(1621),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "candidates".to_string(),
-                    ty: DeclarationId(1619),
+                    ty: DeclarationId(1620),
                 }],
             },
             type_params: vec![],
@@ -49839,7 +49875,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 26079, 26133),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1621),
+            id: DeclarationId(1622),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -49859,7 +49895,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 10942, 10962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1622),
+            id: DeclarationId(1623),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -49879,7 +49915,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11026, 11046),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1623),
+            id: DeclarationId(1624),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -49899,7 +49935,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11114, 11144),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1624),
+            id: DeclarationId(1625),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49919,7 +49955,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11611, 11629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1625),
+            id: DeclarationId(1626),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -49939,7 +49975,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11635, 11665),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1626),
+            id: DeclarationId(1627),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49959,7 +49995,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 14162, 14180),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1627),
+            id: DeclarationId(1628),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -49979,7 +50015,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22217, 22247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1628),
+            id: DeclarationId(1629),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49999,7 +50035,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22252, 22270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1629),
+            id: DeclarationId(1630),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50019,7 +50055,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22530, 22548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1630),
+            id: DeclarationId(1631),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50039,7 +50075,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22553, 22571),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1631),
+            id: DeclarationId(1632),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50059,7 +50095,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23044, 23062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1632),
+            id: DeclarationId(1633),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50079,7 +50115,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23067, 23085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1633),
+            id: DeclarationId(1634),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50099,7 +50135,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23186, 23204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1634),
+            id: DeclarationId(1635),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50119,7 +50155,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23524, 23542),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1635),
+            id: DeclarationId(1636),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50139,7 +50175,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23547, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1636),
+            id: DeclarationId(1637),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50159,7 +50195,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 25113, 25131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1637),
+            id: DeclarationId(1638),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50179,7 +50215,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 25384, 25402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1638),
+            id: DeclarationId(1639),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50199,7 +50235,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 25850, 25868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1639),
+            id: DeclarationId(1640),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50219,7 +50255,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 27885, 27903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1640),
+            id: DeclarationId(1641),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50239,7 +50275,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 27933, 27951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1641),
+            id: DeclarationId(1642),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50259,7 +50295,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28238, 28256),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1642),
+            id: DeclarationId(1643),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50279,7 +50315,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28284, 28302),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1643),
+            id: DeclarationId(1644),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50299,7 +50335,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28662, 28680),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1644),
+            id: DeclarationId(1645),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50319,7 +50355,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28685, 28703),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1645),
+            id: DeclarationId(1646),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50333,7 +50369,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 4953, 4965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1646),
+            id: DeclarationId(1647),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50347,7 +50383,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 4970, 4986),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1647),
+            id: DeclarationId(1648),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50361,7 +50397,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 4991, 5005),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1648),
+            id: DeclarationId(1649),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50375,7 +50411,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 5855, 5868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1649),
+            id: DeclarationId(1650),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50389,7 +50425,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 5873, 5888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1650),
+            id: DeclarationId(1651),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50403,7 +50439,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 5893, 5909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1651),
+            id: DeclarationId(1652),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50417,7 +50453,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 5914, 5927),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1652),
+            id: DeclarationId(1653),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -50436,7 +50472,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1653),
+            id: DeclarationId(1654),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -50455,7 +50491,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1654),
+            id: DeclarationId(1655),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -50474,7 +50510,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1655),
+            id: DeclarationId(1656),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -50493,7 +50529,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1656),
+            id: DeclarationId(1657),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50507,7 +50543,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 8405, 8414),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1657),
+            id: DeclarationId(1658),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50526,7 +50562,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 8419, 8465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1658),
+            id: DeclarationId(1659),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50545,7 +50581,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9506, 9523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1659),
+            id: DeclarationId(1660),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50564,7 +50600,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9528, 9552),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1660),
+            id: DeclarationId(1661),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -50589,7 +50625,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9557, 9619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1661),
+            id: DeclarationId(1662),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -50609,12 +50645,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9636, 9666),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1662),
+            id: DeclarationId(1663),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1661),
+                    ty: DeclarationId(1662),
                 }],
             },
             type_params: vec![],
@@ -50628,7 +50664,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9624, 9667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1663),
+            id: DeclarationId(1664),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -50648,12 +50684,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9680, 9710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1664),
+            id: DeclarationId(1665),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1663),
+                    ty: DeclarationId(1664),
                 }],
             },
             type_params: vec![],
@@ -50667,7 +50703,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9672, 9711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1665),
+            id: DeclarationId(1666),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50686,7 +50722,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9716, 9737),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1666),
+            id: DeclarationId(1667),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50705,7 +50741,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9742, 9761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1667),
+            id: DeclarationId(1668),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(31),
@@ -50725,7 +50761,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9479, 9501),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1668),
+            id: DeclarationId(1669),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50739,7 +50775,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18143, 18156),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1669),
+            id: DeclarationId(1670),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50753,7 +50789,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18161, 18169),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1670),
+            id: DeclarationId(1671),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50767,7 +50803,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18174, 18185),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1671),
+            id: DeclarationId(1672),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50781,7 +50817,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18190, 18207),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1672),
+            id: DeclarationId(1673),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50795,7 +50831,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18212, 18226),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1673),
+            id: DeclarationId(1674),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50814,7 +50850,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18231, 18280),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1674),
+            id: DeclarationId(1675),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50828,7 +50864,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18285, 18301),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1675),
+            id: DeclarationId(1676),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50842,7 +50878,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18306, 18318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1676),
+            id: DeclarationId(1677),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(43),
@@ -50862,7 +50898,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18107, 18138),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1677),
+            id: DeclarationId(1678),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(691),
@@ -50882,7 +50918,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11495, 11507),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1678),
+            id: DeclarationId(1679),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(728)],
@@ -50900,7 +50936,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(1679),
+            id: DeclarationId(1680),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(704),
@@ -50910,7 +50946,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         value: DeclarationId(849),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1414),
+                        parameter: DeclarationId(1415),
                         value: DeclarationId(856),
                     },
                 ],
@@ -50926,7 +50962,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11488, 11535),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1680),
+            id: DeclarationId(1681),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(691),
@@ -50946,7 +50982,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11795, 11810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1681),
+            id: DeclarationId(1682),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(849), DeclarationId(849)],
@@ -50964,7 +51000,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(1682),
+            id: DeclarationId(1683),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
@@ -50978,7 +51014,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         value: DeclarationId(849),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1404),
+                        parameter: DeclarationId(1405),
                         value: DeclarationId(860),
                     },
                 ],
@@ -50994,7 +51030,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 14202, 14245),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1683),
+            id: DeclarationId(1684),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(850), DeclarationId(694)],
@@ -51012,7 +51048,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(1684),
+            id: DeclarationId(1685),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
@@ -51022,7 +51058,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         value: DeclarationId(850),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1404),
+                        parameter: DeclarationId(1405),
                         value: DeclarationId(886),
                     },
                     TemplateArgument {
@@ -51042,7 +51078,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 16911, 17021),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1685),
+            id: DeclarationId(1686),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(850), DeclarationId(694)],
@@ -51060,7 +51096,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(1686),
+            id: DeclarationId(1687),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
@@ -51070,7 +51106,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         value: DeclarationId(850),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1404),
+                        parameter: DeclarationId(1405),
                         value: DeclarationId(886),
                     },
                     TemplateArgument {
@@ -51090,7 +51126,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 17076, 17186),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1687),
+            id: DeclarationId(1688),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -51110,7 +51146,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22293, 22323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1688),
+            id: DeclarationId(1689),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -51130,7 +51166,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22275, 22324),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1689),
+            id: DeclarationId(1690),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -51150,7 +51186,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22603, 22610),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1690),
+            id: DeclarationId(1691),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -51170,7 +51206,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22737, 22789),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1691),
+            id: DeclarationId(1692),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -51190,7 +51226,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23140, 23147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1692),
+            id: DeclarationId(1693),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -51210,7 +51246,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23118, 23148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1693),
+            id: DeclarationId(1694),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -51230,7 +51266,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23597, 23604),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1694),
+            id: DeclarationId(1695),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -51250,7 +51286,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23735, 23792),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1695),
+            id: DeclarationId(1696),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -51270,7 +51306,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 25317, 25349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1696),
+            id: DeclarationId(1697),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -51290,7 +51326,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 27988, 27995),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1697),
+            id: DeclarationId(1698),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -51310,7 +51346,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28136, 28201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1698),
+            id: DeclarationId(1699),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(850), DeclarationId(849)],
@@ -51328,7 +51364,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(1699),
+            id: DeclarationId(1700),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
@@ -51342,7 +51378,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         value: DeclarationId(849),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1404),
+                        parameter: DeclarationId(1405),
                         value: DeclarationId(886),
                     },
                 ],
@@ -51358,7 +51394,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28319, 28377),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1700),
+            id: DeclarationId(1701),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -51378,7 +51414,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28403, 28449),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1701),
+            id: DeclarationId(1702),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -51398,11 +51434,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28720, 28727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1702),
+            id: DeclarationId(1703),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1644), DeclarationId(849)],
-                output: DeclarationId(1644),
+                inputs: vec![DeclarationId(1645), DeclarationId(849)],
+                output: DeclarationId(1645),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -51416,21 +51452,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(1703),
+            id: DeclarationId(1704),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
                 arguments: vec![
                     TemplateArgument {
                         parameter: DeclarationId(695),
-                        value: DeclarationId(1644),
+                        value: DeclarationId(1645),
                     },
                     TemplateArgument {
                         parameter: DeclarationId(694),
                         value: DeclarationId(849),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1404),
+                        parameter: DeclarationId(1405),
                         value: DeclarationId(889),
                     },
                 ],
@@ -51446,7 +51482,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28708, 28749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1704),
+            id: DeclarationId(1705),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -51466,7 +51502,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(1705),
+            id: DeclarationId(1706),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -51485,7 +51521,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(1706),
+            id: DeclarationId(1707),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -51504,7 +51540,7 @@ 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(1707),
+            id: DeclarationId(1708),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -51524,7 +51560,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_operations.dag", 6546, 6561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1708),
+            id: DeclarationId(1709),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -51544,12 +51580,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2718, 2749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1709),
+            id: DeclarationId(1710),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "content".to_string(),
-                    ty: DeclarationId(1708),
+                    ty: DeclarationId(1709),
                 }],
             },
             type_params: vec![],
@@ -51563,7 +51599,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2690, 2751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1710),
+            id: DeclarationId(1711),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -51583,12 +51619,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2784, 2820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1711),
+            id: DeclarationId(1712),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "content".to_string(),
-                    ty: DeclarationId(1710),
+                    ty: DeclarationId(1711),
                 }],
             },
             type_params: vec![],
@@ -51602,7 +51638,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2756, 2822),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1712),
+            id: DeclarationId(1713),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -51627,7 +51663,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3211, 3276),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1713),
+            id: DeclarationId(1714),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51646,7 +51682,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3281, 3305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1714),
+            id: DeclarationId(1715),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51665,7 +51701,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3568, 3596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1715),
+            id: DeclarationId(1716),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51684,7 +51720,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3601, 3637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1716),
+            id: DeclarationId(1717),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51703,7 +51739,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4332, 4354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1717),
+            id: DeclarationId(1718),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -51723,12 +51759,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4376, 4406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1718),
+            id: DeclarationId(1719),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1717),
+                    ty: DeclarationId(1718),
                 }],
             },
             type_params: vec![],
@@ -51742,7 +51778,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4359, 4407),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1719),
+            id: DeclarationId(1720),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51756,7 +51792,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5616, 5623),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1720),
+            id: DeclarationId(1721),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51770,7 +51806,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5749, 5761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1721),
+            id: DeclarationId(1722),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51789,7 +51825,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5979, 6014),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1722),
+            id: DeclarationId(1723),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51808,7 +51844,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6019, 6062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1723),
+            id: DeclarationId(1724),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51827,7 +51863,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6067, 6144),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1724),
+            id: DeclarationId(1725),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -51847,7 +51883,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6234, 6268),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1725),
+            id: DeclarationId(1726),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -51866,7 +51902,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1726),
+            id: DeclarationId(1727),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -51885,7 +51921,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1727),
+            id: DeclarationId(1728),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -51899,15 +51935,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(1724),
+                        ty: DeclarationId(1725),
                     },
                     Field {
                         label: "citations".to_string(),
-                        ty: DeclarationId(1725),
+                        ty: DeclarationId(1726),
                     },
                     Field {
                         label: "cache_control".to_string(),
-                        ty: DeclarationId(1726),
+                        ty: DeclarationId(1727),
                     },
                 ],
             },
@@ -51922,7 +51958,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6149, 6364),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1728),
+            id: DeclarationId(1729),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51941,7 +51977,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6369, 6418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1729),
+            id: DeclarationId(1730),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51960,7 +51996,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6926, 6962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1730),
+            id: DeclarationId(1731),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -51979,7 +52015,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1731),
+            id: DeclarationId(1732),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -51998,7 +52034,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1732),
+            id: DeclarationId(1733),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52008,11 +52044,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(1730),
+                        ty: DeclarationId(1731),
                     },
                     Field {
                         label: "is_error".to_string(),
-                        ty: DeclarationId(1731),
+                        ty: DeclarationId(1732),
                     },
                 ],
             },
@@ -52027,7 +52063,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6967, 7085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1733),
+            id: DeclarationId(1734),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52046,7 +52082,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7532, 7570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1734),
+            id: DeclarationId(1735),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52075,7 +52111,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7575, 7658),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1735),
+            id: DeclarationId(1736),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52089,7 +52125,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8016, 8023),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1736),
+            id: DeclarationId(1737),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52103,7 +52139,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8028, 8037),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1737),
+            id: DeclarationId(1738),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52117,7 +52153,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8042, 8054),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1738),
+            id: DeclarationId(1739),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52131,7 +52167,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8059, 8066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1739),
+            id: DeclarationId(1740),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52145,7 +52181,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8071, 8080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1740),
+            id: DeclarationId(1741),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52159,7 +52195,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8085, 8092),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1741),
+            id: DeclarationId(1742),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52173,7 +52209,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8097, 8123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1742),
+            id: DeclarationId(1743),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52192,7 +52228,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1743),
+            id: DeclarationId(1744),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52211,7 +52247,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1744),
+            id: DeclarationId(1745),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52225,11 +52261,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "document_title".to_string(),
-                        ty: DeclarationId(1742),
+                        ty: DeclarationId(1743),
                     },
                     Field {
                         label: "file_id".to_string(),
-                        ty: DeclarationId(1743),
+                        ty: DeclarationId(1744),
                     },
                     Field {
                         label: "start_char_index".to_string(),
@@ -52252,7 +52288,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8363, 8506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1745),
+            id: DeclarationId(1746),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52271,7 +52307,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1746),
+            id: DeclarationId(1747),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52290,7 +52326,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1747),
+            id: DeclarationId(1748),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52304,11 +52340,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "document_title".to_string(),
-                        ty: DeclarationId(1745),
+                        ty: DeclarationId(1746),
                     },
                     Field {
                         label: "file_id".to_string(),
-                        ty: DeclarationId(1746),
+                        ty: DeclarationId(1747),
                     },
                     Field {
                         label: "start_page_number".to_string(),
@@ -52331,7 +52367,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8511, 8656),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1748),
+            id: DeclarationId(1749),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52350,7 +52386,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1749),
+            id: DeclarationId(1750),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52369,7 +52405,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1750),
+            id: DeclarationId(1751),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52383,11 +52419,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "document_title".to_string(),
-                        ty: DeclarationId(1748),
+                        ty: DeclarationId(1749),
                     },
                     Field {
                         label: "file_id".to_string(),
-                        ty: DeclarationId(1749),
+                        ty: DeclarationId(1750),
                     },
                     Field {
                         label: "start_block_index".to_string(),
@@ -52410,7 +52446,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8661, 8814),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1751),
+            id: DeclarationId(1752),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52429,7 +52465,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1752),
+            id: DeclarationId(1753),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52443,7 +52479,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "title".to_string(),
-                        ty: DeclarationId(1751),
+                        ty: DeclarationId(1752),
                     },
                     Field {
                         label: "url".to_string(),
@@ -52462,7 +52498,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8819, 8919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1753),
+            id: DeclarationId(1754),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52481,7 +52517,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1754),
+            id: DeclarationId(1755),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52495,7 +52531,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "title".to_string(),
-                        ty: DeclarationId(1753),
+                        ty: DeclarationId(1754),
                     },
                     Field {
                         label: "search_result_index".to_string(),
@@ -52522,7 +52558,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8924, 9071),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1755),
+            id: DeclarationId(1756),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -52542,11 +52578,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1756),
+            id: DeclarationId(1757),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1755),
+                    DeclarationId(1756),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -52561,7 +52597,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1757),
+            id: DeclarationId(1758),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52571,7 +52607,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "citations".to_string(),
-                        ty: DeclarationId(1756),
+                        ty: DeclarationId(1757),
                     },
                 ],
             },
@@ -52586,7 +52622,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9650, 9732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1758),
+            id: DeclarationId(1759),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52611,7 +52647,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9737, 9798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1759),
+            id: DeclarationId(1760),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52630,7 +52666,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9803, 9858),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1760),
+            id: DeclarationId(1761),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52649,7 +52685,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1761),
+            id: DeclarationId(1762),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52667,7 +52703,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "caller".to_string(),
-                        ty: DeclarationId(1760),
+                        ty: DeclarationId(1761),
                     },
                 ],
             },
@@ -52682,7 +52718,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9863, 9940),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1762),
+            id: DeclarationId(1763),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52701,7 +52737,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1763),
+            id: DeclarationId(1764),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52719,7 +52755,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "caller".to_string(),
-                        ty: DeclarationId(1762),
+                        ty: DeclarationId(1763),
                     },
                 ],
             },
@@ -52734,7 +52770,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9945, 10045),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1764),
+            id: DeclarationId(1765),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52753,7 +52789,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1765),
+            id: DeclarationId(1766),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52767,7 +52803,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "caller".to_string(),
-                        ty: DeclarationId(1764),
+                        ty: DeclarationId(1765),
                     },
                 ],
             },
@@ -52782,7 +52818,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10050, 10136),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1766),
+            id: DeclarationId(1767),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52796,7 +52832,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10357, 10366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1767),
+            id: DeclarationId(1768),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52810,7 +52846,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10371, 10379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1768),
+            id: DeclarationId(1769),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52824,7 +52860,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10384, 10397),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1769),
+            id: DeclarationId(1770),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52838,7 +52874,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10402, 10419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1770),
+            id: DeclarationId(1771),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52852,7 +52888,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10424, 10447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1771),
+            id: DeclarationId(1772),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52866,7 +52902,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10452, 10471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1772),
+            id: DeclarationId(1773),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52880,7 +52916,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10476, 10494),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1773),
+            id: DeclarationId(1774),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52894,7 +52930,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10499, 10506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1774),
+            id: DeclarationId(1775),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52913,7 +52949,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1775),
+            id: DeclarationId(1776),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52932,7 +52968,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1776),
+            id: DeclarationId(1777),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52951,7 +52987,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1777),
+            id: DeclarationId(1778),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52965,7 +53001,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11192, 11201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1778),
+            id: DeclarationId(1779),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -52985,7 +53021,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11687, 11725),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1779),
+            id: DeclarationId(1780),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53004,7 +53040,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1780),
+            id: DeclarationId(1781),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53023,7 +53059,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1781),
+            id: DeclarationId(1782),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53037,7 +53073,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1013, 1025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1782),
+            id: DeclarationId(1783),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53051,7 +53087,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1030, 1044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1783),
+            id: DeclarationId(1784),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53065,7 +53101,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1049, 1064),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1784),
+            id: DeclarationId(1785),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53079,7 +53115,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1069, 1086),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1785),
+            id: DeclarationId(1786),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53093,7 +53129,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1091, 1114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1786),
+            id: DeclarationId(1787),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53107,7 +53143,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4719, 4726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1787),
+            id: DeclarationId(1788),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53121,7 +53157,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4731, 4735),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1788),
+            id: DeclarationId(1789),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -53141,7 +53177,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6983, 7004),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1789),
+            id: DeclarationId(1790),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53155,7 +53191,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(1790),
+            id: DeclarationId(1791),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53169,7 +53205,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(1791),
+            id: DeclarationId(1792),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53183,7 +53219,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(1792),
+            id: DeclarationId(1793),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53197,7 +53233,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(1793),
+            id: DeclarationId(1794),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53211,7 +53247,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(1794),
+            id: DeclarationId(1795),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53225,7 +53261,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(1795),
+            id: DeclarationId(1796),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53239,7 +53275,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(1796),
+            id: DeclarationId(1797),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53253,7 +53289,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(1797),
+            id: DeclarationId(1798),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53267,7 +53303,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(1798),
+            id: DeclarationId(1799),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53281,7 +53317,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(1799),
+            id: DeclarationId(1800),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53295,7 +53331,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(1800),
+            id: DeclarationId(1801),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53309,7 +53345,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(1801),
+            id: DeclarationId(1802),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53323,7 +53359,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(1802),
+            id: DeclarationId(1803),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53337,7 +53373,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(1803),
+            id: DeclarationId(1804),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53351,7 +53387,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(1804),
+            id: DeclarationId(1805),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53365,7 +53401,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(1805),
+            id: DeclarationId(1806),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53379,7 +53415,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(1806),
+            id: DeclarationId(1807),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53393,7 +53429,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(1807),
+            id: DeclarationId(1808),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53407,7 +53443,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(1808),
+            id: DeclarationId(1809),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53421,7 +53457,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(1809),
+            id: DeclarationId(1810),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53435,7 +53471,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(1810),
+            id: DeclarationId(1811),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -53455,7 +53491,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(1811),
+            id: DeclarationId(1812),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53469,7 +53505,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(1812),
+            id: DeclarationId(1813),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53483,7 +53519,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(1813),
+            id: DeclarationId(1814),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53497,7 +53533,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(1814),
+            id: DeclarationId(1815),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53511,7 +53547,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(1815),
+            id: DeclarationId(1816),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53530,7 +53566,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1816),
+            id: DeclarationId(1817),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53549,7 +53585,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1817),
+            id: DeclarationId(1818),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53568,7 +53604,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1818),
+            id: DeclarationId(1819),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53587,7 +53623,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1819),
+            id: DeclarationId(1820),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53606,7 +53642,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1820),
+            id: DeclarationId(1821),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53625,7 +53661,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1821),
+            id: DeclarationId(1822),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53644,7 +53680,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1430, 1462),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1822),
+            id: DeclarationId(1823),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53663,7 +53699,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1467, 1503),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1823),
+            id: DeclarationId(1824),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53682,7 +53718,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1508, 1545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1824),
+            id: DeclarationId(1825),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53701,7 +53737,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1550, 1576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1825),
+            id: DeclarationId(1826),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53720,7 +53756,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1581, 1614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1826),
+            id: DeclarationId(1827),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53734,7 +53770,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1619, 1636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1827),
+            id: DeclarationId(1828),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53753,7 +53789,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1641, 1695),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1828),
+            id: DeclarationId(1829),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53767,7 +53803,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1700, 1707),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1829),
+            id: DeclarationId(1830),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53786,7 +53822,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2059, 2097),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1830),
+            id: DeclarationId(1831),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -53811,7 +53847,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2102, 2176),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1831),
+            id: DeclarationId(1832),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -53836,7 +53872,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2181, 2256),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1832),
+            id: DeclarationId(1833),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -53861,7 +53897,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2261, 2334),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1833),
+            id: DeclarationId(1834),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53880,7 +53916,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2339, 2376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1834),
+            id: DeclarationId(1835),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53899,7 +53935,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2381, 2418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1835),
+            id: DeclarationId(1836),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53918,7 +53954,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2423, 2464),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1836),
+            id: DeclarationId(1837),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53932,7 +53968,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2469, 2485),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1837),
+            id: DeclarationId(1838),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53946,7 +53982,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3221, 3231),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1838),
+            id: DeclarationId(1839),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53965,7 +54001,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3236, 3283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1839),
+            id: DeclarationId(1840),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53984,7 +54020,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3288, 3339),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1840),
+            id: DeclarationId(1841),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53998,7 +54034,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3529, 3533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1841),
+            id: DeclarationId(1842),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54012,7 +54048,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3538, 3545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1842),
+            id: DeclarationId(1843),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54026,7 +54062,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3550, 3556),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1843),
+            id: DeclarationId(1844),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54045,7 +54081,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1844),
+            id: DeclarationId(1845),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54059,7 +54095,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7493, 7504),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1845),
+            id: DeclarationId(1846),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54073,7 +54109,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7553, 7567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1846),
+            id: DeclarationId(1847),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54087,7 +54123,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7632, 7648),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1847),
+            id: DeclarationId(1848),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54101,7 +54137,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(1848),
+            id: DeclarationId(1849),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54115,7 +54151,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(1849),
+            id: DeclarationId(1850),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54129,7 +54165,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(1850),
+            id: DeclarationId(1851),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54143,7 +54179,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(1851),
+            id: DeclarationId(1852),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54157,7 +54193,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(1852),
+            id: DeclarationId(1853),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54171,7 +54207,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(1853),
+            id: DeclarationId(1854),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54185,7 +54221,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(1854),
+            id: DeclarationId(1855),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54199,7 +54235,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(1855),
+            id: DeclarationId(1856),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54213,7 +54249,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(1856),
+            id: DeclarationId(1857),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54227,7 +54263,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(1857),
+            id: DeclarationId(1858),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54241,7 +54277,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(1858),
+            id: DeclarationId(1859),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54255,7 +54291,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(1859),
+            id: DeclarationId(1860),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54269,7 +54305,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(1860),
+            id: DeclarationId(1861),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54283,7 +54319,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(1861),
+            id: DeclarationId(1862),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -54303,7 +54339,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(1862),
+            id: DeclarationId(1863),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -54323,7 +54359,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(1863),
+            id: DeclarationId(1864),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54337,7 +54373,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(1864),
+            id: DeclarationId(1865),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54351,7 +54387,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(1865),
+            id: DeclarationId(1866),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54370,7 +54406,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 6759, 6786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1866),
+            id: DeclarationId(1867),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54384,7 +54420,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7611, 7616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1867),
+            id: DeclarationId(1868),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54398,7 +54434,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7621, 7630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1868),
+            id: DeclarationId(1869),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -54424,7 +54460,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 9513, 9555),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1869),
+            id: DeclarationId(1870),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54438,7 +54474,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3853, 3857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1870),
+            id: DeclarationId(1871),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54452,7 +54488,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3860, 3864),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1871),
+            id: DeclarationId(1872),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54466,7 +54502,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3867, 3871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1872),
+            id: DeclarationId(1873),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54480,7 +54516,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3874, 3879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1873),
+            id: DeclarationId(1874),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54494,7 +54530,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3882, 3893),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1874),
+            id: DeclarationId(1875),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54508,7 +54544,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3896, 3909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1875),
+            id: DeclarationId(1876),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54522,7 +54558,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4489, 4494),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1876),
+            id: DeclarationId(1877),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54536,7 +54572,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4497, 4506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1877),
+            id: DeclarationId(1878),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54550,7 +54586,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4509, 4515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1878),
+            id: DeclarationId(1879),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54564,7 +54600,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4518, 4522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1879),
+            id: DeclarationId(1880),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54578,7 +54614,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4525, 4529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1880),
+            id: DeclarationId(1881),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -54598,7 +54634,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5923, 5941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1881),
+            id: DeclarationId(1882),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -54618,7 +54654,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6396, 6424),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1882),
+            id: DeclarationId(1883),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54632,7 +54668,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1099, 1113),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1883),
+            id: DeclarationId(1884),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54646,7 +54682,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1118, 1128),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1884),
+            id: DeclarationId(1885),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54660,7 +54696,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1133, 1145),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1885),
+            id: DeclarationId(1886),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54674,7 +54710,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1150, 1163),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1886),
+            id: DeclarationId(1887),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54688,7 +54724,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1168, 1180),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1887),
+            id: DeclarationId(1888),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54702,7 +54738,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1185, 1197),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1888),
+            id: DeclarationId(1889),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54716,7 +54752,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1202, 1224),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1889),
+            id: DeclarationId(1890),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54730,7 +54766,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1229, 1248),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1890),
+            id: DeclarationId(1891),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54744,7 +54780,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1253, 1278),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1891),
+            id: DeclarationId(1892),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54758,7 +54794,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1283, 1306),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1892),
+            id: DeclarationId(1893),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54777,7 +54813,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5506, 5542),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1893),
+            id: DeclarationId(1894),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54796,7 +54832,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5547, 5588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1894),
+            id: DeclarationId(1895),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -54816,7 +54852,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 6047, 6063),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1895),
+            id: DeclarationId(1896),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54835,7 +54871,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9175, 9216),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1896),
+            id: DeclarationId(1897),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54849,7 +54885,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9513, 9525),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1897),
+            id: DeclarationId(1898),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -54869,7 +54905,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9795, 9807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1898),
+            id: DeclarationId(1899),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -54879,7 +54915,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "sites".to_string(),
-                        ty: DeclarationId(1897),
+                        ty: DeclarationId(1898),
                     },
                 ],
             },
@@ -54894,7 +54930,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9752, 9809),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1899),
+            id: DeclarationId(1900),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54913,7 +54949,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10119, 10153),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1900),
+            id: DeclarationId(1901),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54932,7 +54968,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10556, 10607),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1901),
+            id: DeclarationId(1902),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54946,7 +54982,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10950, 10968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1902),
+            id: DeclarationId(1903),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -54975,7 +55011,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 11357, 11469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1903),
+            id: DeclarationId(1904),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -54995,7 +55031,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(1904),
+            id: DeclarationId(1905),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -55021,7 +55057,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(1905),
+            id: DeclarationId(1906),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -55047,7 +55083,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(1906),
+            id: DeclarationId(1907),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -55073,7 +55109,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(1907),
+            id: DeclarationId(1908),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -55093,7 +55129,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(1908),
+            id: DeclarationId(1909),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -55119,7 +55155,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(1909),
+            id: DeclarationId(1910),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -55145,7 +55181,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(1910),
+            id: DeclarationId(1911),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -55171,7 +55207,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(1911),
+            id: DeclarationId(1912),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -55191,7 +55227,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(1912),
+            id: DeclarationId(1913),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -55217,7 +55253,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(1913),
+            id: DeclarationId(1914),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -55243,7 +55279,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(1914),
+            id: DeclarationId(1915),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -55263,7 +55299,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(1915),
+            id: DeclarationId(1916),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -55289,7 +55325,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(1916),
+            id: DeclarationId(1917),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -55315,7 +55351,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(1917),
+            id: DeclarationId(1918),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55334,7 +55370,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(1918),
+            id: DeclarationId(1919),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -55359,7 +55395,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(1919),
+            id: DeclarationId(1920),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55373,7 +55409,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(1920),
+            id: DeclarationId(1921),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55392,7 +55428,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(1921),
+            id: DeclarationId(1922),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -55412,13 +55448,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(1922),
+            id: DeclarationId(1923),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1921),
+                    value: DeclarationId(1922),
                 }],
             },
             type_params: vec![],
@@ -55432,7 +55468,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(1923),
+            id: DeclarationId(1924),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -55446,7 +55482,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "witnesses".to_string(),
-                        ty: DeclarationId(1922),
+                        ty: DeclarationId(1923),
                     },
                 ],
             },
@@ -55461,7 +55497,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(1924),
+            id: DeclarationId(1925),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -55481,7 +55517,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(1925),
+            id: DeclarationId(1926),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -55501,13 +55537,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(1926),
+            id: DeclarationId(1927),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1925),
+                    value: DeclarationId(1926),
                 }],
             },
             type_params: vec![],
@@ -55521,7 +55557,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(1927),
+            id: DeclarationId(1928),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -55531,11 +55567,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "violations".to_string(),
-                        ty: DeclarationId(1924),
+                        ty: DeclarationId(1925),
                     },
                     Field {
                         label: "witnesses".to_string(),
-                        ty: DeclarationId(1926),
+                        ty: DeclarationId(1927),
                     },
                 ],
             },
@@ -55550,7 +55586,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(1928),
+            id: DeclarationId(1929),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -55570,11 +55606,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(1929),
+            id: DeclarationId(1930),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(1928),
+                output: DeclarationId(1929),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -55588,7 +55624,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(1930),
+            id: DeclarationId(1931),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
@@ -55608,7 +55644,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(1931),
+            id: DeclarationId(1932),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(827), DeclarationId(990)],
@@ -55626,7 +55662,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(1932),
+            id: DeclarationId(1933),
             name: Some("DimensionUnitAbelianGroup".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(25),
@@ -55646,7 +55682,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(1933),
+            id: DeclarationId(1934),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55660,7 +55696,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3709, 3721),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1934),
+            id: DeclarationId(1935),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55679,7 +55715,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3726, 3762),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1935),
+            id: DeclarationId(1936),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -55699,7 +55735,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(1936),
+            id: DeclarationId(1937),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55713,7 +55749,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4373, 4389),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1937),
+            id: DeclarationId(1938),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55732,7 +55768,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4394, 4422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1938),
+            id: DeclarationId(1939),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55746,7 +55782,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4665, 4686),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1939),
+            id: DeclarationId(1940),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55765,7 +55801,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5176, 5195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1940),
+            id: DeclarationId(1941),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55784,7 +55820,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5200, 5222),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1941),
+            id: DeclarationId(1942),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -55804,7 +55840,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5591, 5614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1942),
+            id: DeclarationId(1943),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55818,7 +55854,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6611, 6619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1943),
+            id: DeclarationId(1944),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55832,7 +55868,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6624, 6632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1944),
+            id: DeclarationId(1945),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55846,7 +55882,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7073, 7078),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1945),
+            id: DeclarationId(1946),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55860,7 +55896,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7083, 7091),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1946),
+            id: DeclarationId(1947),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55874,7 +55910,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7427, 7440),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1947),
+            id: DeclarationId(1948),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55888,7 +55924,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7445, 7451),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1948),
+            id: DeclarationId(1949),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55902,7 +55938,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7709, 7717),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1949),
+            id: DeclarationId(1950),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55916,7 +55952,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7722, 7727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1950),
+            id: DeclarationId(1951),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55930,7 +55966,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7732, 7745),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1951),
+            id: DeclarationId(1952),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55944,7 +55980,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8082, 8100),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1952),
+            id: DeclarationId(1953),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55958,7 +55994,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9475, 9484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1953),
+            id: DeclarationId(1954),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55972,7 +56008,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9489, 9502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1954),
+            id: DeclarationId(1955),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55986,7 +56022,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9507, 9515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1955),
+            id: DeclarationId(1956),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56000,7 +56036,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9520, 9530),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1956),
+            id: DeclarationId(1957),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56014,7 +56050,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9535, 9545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1957),
+            id: DeclarationId(1958),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56028,7 +56064,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9550, 9561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1958),
+            id: DeclarationId(1959),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56042,7 +56078,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9566, 9574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1959),
+            id: DeclarationId(1960),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56056,7 +56092,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9579, 9586),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1960),
+            id: DeclarationId(1961),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56070,7 +56106,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9591, 9601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1961),
+            id: DeclarationId(1962),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56084,7 +56120,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9606, 9618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1962),
+            id: DeclarationId(1963),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56098,7 +56134,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12311, 12337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1963),
+            id: DeclarationId(1964),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56112,7 +56148,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12342, 12352),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1964),
+            id: DeclarationId(1965),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56126,7 +56162,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17117, 17123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1965),
+            id: DeclarationId(1966),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56140,7 +56176,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17128, 17139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1966),
+            id: DeclarationId(1967),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56154,7 +56190,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17459, 17470),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1967),
+            id: DeclarationId(1968),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56168,7 +56204,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17475, 17486),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1968),
+            id: DeclarationId(1969),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56182,7 +56218,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 19419, 19430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1969),
+            id: DeclarationId(1970),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56196,7 +56232,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 19435, 19443),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1970),
+            id: DeclarationId(1971),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56215,7 +56251,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 20606, 20641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1971),
+            id: DeclarationId(1972),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56240,7 +56276,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 20646, 20734),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1972),
+            id: DeclarationId(1973),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -56260,7 +56296,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6894, 6922),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1973),
+            id: DeclarationId(1974),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56279,7 +56315,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1974),
+            id: DeclarationId(1975),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56298,7 +56334,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1975),
+            id: DeclarationId(1976),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -56318,7 +56354,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27850, 27865),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1976),
+            id: DeclarationId(1977),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -56338,7 +56374,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 29879, 29895),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1977),
+            id: DeclarationId(1978),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -56358,7 +56394,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 29988, 30004),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1978),
+            id: DeclarationId(1979),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -56378,13 +56414,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 30102, 30118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1979),
+            id: DeclarationId(1980),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1978),
+                    value: DeclarationId(1979),
                 }],
             },
             type_params: vec![],
@@ -56398,7 +56434,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 30097, 30119),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1980),
+            id: DeclarationId(1981),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56417,7 +56453,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1981),
+            id: DeclarationId(1982),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56436,7 +56472,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1982),
+            id: DeclarationId(1983),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56455,7 +56491,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1983),
+            id: DeclarationId(1984),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56474,7 +56510,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1984),
+            id: DeclarationId(1985),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56493,7 +56529,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1985),
+            id: DeclarationId(1986),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56512,7 +56548,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1986),
+            id: DeclarationId(1987),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56526,7 +56562,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5629, 5644),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1987),
+            id: DeclarationId(1988),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56540,7 +56576,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5684, 5697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1988),
+            id: DeclarationId(1989),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56554,7 +56590,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5745, 5762),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1989),
+            id: DeclarationId(1990),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56568,7 +56604,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5801, 5813),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1990),
+            id: DeclarationId(1991),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56582,7 +56618,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5861, 5878),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1991),
+            id: DeclarationId(1992),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56607,7 +56643,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 9971, 10033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1992),
+            id: DeclarationId(1993),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56626,7 +56662,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10038, 10080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1993),
+            id: DeclarationId(1994),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56651,7 +56687,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10085, 10142),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1994),
+            id: DeclarationId(1995),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56665,7 +56701,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10147, 10161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1995),
+            id: DeclarationId(1996),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56679,7 +56715,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10166, 10181),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1996),
+            id: DeclarationId(1997),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56693,7 +56729,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24135, 24149),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1997),
+            id: DeclarationId(1998),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56712,7 +56748,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24154, 24201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1998),
+            id: DeclarationId(1999),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56737,7 +56773,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24206, 24283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1999),
+            id: DeclarationId(2000),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56762,7 +56798,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24288, 24362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2000),
+            id: DeclarationId(2001),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56787,7 +56823,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24982, 25038),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2001),
+            id: DeclarationId(2002),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56806,7 +56842,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 25054, 25079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2002),
+            id: DeclarationId(2003),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56820,7 +56856,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26728, 26741),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2003),
+            id: DeclarationId(2004),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56839,7 +56875,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26785, 26817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2004),
+            id: DeclarationId(2005),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -56859,12 +56895,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26880, 26896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2005),
+            id: DeclarationId(2006),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "factors".to_string(),
-                    ty: DeclarationId(2004),
+                    ty: DeclarationId(2005),
                 }],
             },
             type_params: vec![],
@@ -56878,7 +56914,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26856, 26898),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2006),
+            id: DeclarationId(2007),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -56898,13 +56934,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26960, 26976),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2007),
+            id: DeclarationId(2008),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2006),
+                    value: DeclarationId(2007),
                 }],
             },
             type_params: vec![],
@@ -56918,12 +56954,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26955, 26977),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2008),
+            id: DeclarationId(2009),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-                    ty: DeclarationId(2007),
+                    ty: DeclarationId(2008),
                 }],
             },
             type_params: vec![],
@@ -56937,7 +56973,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26927, 26979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2009),
+            id: DeclarationId(2010),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -56957,12 +56993,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27277, 27292),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2010),
+            id: DeclarationId(2011),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-                    ty: DeclarationId(2009),
+                    ty: DeclarationId(2010),
                 }],
             },
             type_params: vec![],
@@ -56976,7 +57012,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27259, 27294),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2011),
+            id: DeclarationId(2012),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56990,7 +57026,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27377, 27389),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2012),
+            id: DeclarationId(2013),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57004,7 +57040,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27459, 27469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2013),
+            id: DeclarationId(2014),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57024,7 +57060,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(2014),
+            id: DeclarationId(2015),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57044,7 +57080,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(2015),
+            id: DeclarationId(2016),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -57064,11 +57100,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(2016),
+            id: DeclarationId(2017),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2015),
+                output: DeclarationId(2016),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -57082,7 +57118,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(2017),
+            id: DeclarationId(2018),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
@@ -57102,7 +57138,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(2018),
+            id: DeclarationId(2019),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1129), DeclarationId(1129)],
@@ -57120,7 +57156,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(2019),
+            id: DeclarationId(2020),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1129), DeclarationId(818)],
@@ -57138,7 +57174,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(2020),
+            id: DeclarationId(2021),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(1129)],
@@ -57156,7 +57192,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(2021),
+            id: DeclarationId(2022),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57175,7 +57211,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 3305, 3352),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2022),
+            id: DeclarationId(2023),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -57200,7 +57236,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 3357, 3418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2023),
+            id: DeclarationId(2024),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57214,7 +57250,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 4297, 4302),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2024),
+            id: DeclarationId(2025),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1133)],
@@ -57232,7 +57268,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 5301, 5321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2025),
+            id: DeclarationId(2026),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1134), DeclarationId(1134)],
@@ -57250,7 +57286,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 5334, 5360),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2026),
+            id: DeclarationId(2027),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1128),
@@ -57270,7 +57306,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 7360, 7372),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2027),
+            id: DeclarationId(2028),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1132),
@@ -57296,7 +57332,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 7388, 7419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2028),
+            id: DeclarationId(2029),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1135),
@@ -57322,7 +57358,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 9093, 9124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2029),
+            id: DeclarationId(2030),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1128),
@@ -57342,7 +57378,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 10144, 10156),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2030),
+            id: DeclarationId(2031),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -57362,7 +57398,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4589, 4600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2031),
+            id: DeclarationId(2032),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -57382,7 +57418,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4642, 4653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2032),
+            id: DeclarationId(2033),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57396,7 +57432,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4544, 4548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2033),
+            id: DeclarationId(2034),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57415,7 +57451,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4553, 4563),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2034),
+            id: DeclarationId(2035),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57439,7 +57475,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2035),
+            id: DeclarationId(2036),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57459,7 +57495,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 11243, 11254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2036),
+            id: DeclarationId(2037),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57478,7 +57514,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2137, 2162),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2037),
+            id: DeclarationId(2038),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57498,12 +57534,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2179, 2195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2038),
+            id: DeclarationId(2039),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2037),
+                    ty: DeclarationId(2038),
                 }],
             },
             type_params: vec![],
@@ -57517,7 +57553,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2167, 2196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2039),
+            id: DeclarationId(2040),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -57542,7 +57578,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2201, 2252),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2040),
+            id: DeclarationId(2041),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57561,7 +57597,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2257, 2272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2041),
+            id: DeclarationId(2042),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57580,7 +57616,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2277, 2304),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2042),
+            id: DeclarationId(2043),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -57606,7 +57642,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 3936, 3954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2043),
+            id: DeclarationId(2044),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57626,7 +57662,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 4542, 4557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2044),
+            id: DeclarationId(2045),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57645,7 +57681,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 5388, 5442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2045),
+            id: DeclarationId(2046),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57659,7 +57695,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 5682, 5691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2046),
+            id: DeclarationId(2047),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57673,7 +57709,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 5694, 5704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2047),
+            id: DeclarationId(2048),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57693,7 +57729,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5769, 5797),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2048),
+            id: DeclarationId(2049),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -57719,7 +57755,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/services.dag", 6785, 6808),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2049),
+            id: DeclarationId(2050),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -57739,7 +57775,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2050),
+            id: DeclarationId(2051),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -57759,7 +57795,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4594, 4620),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2051),
+            id: DeclarationId(2052),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57779,7 +57815,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4888, 4905),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2052),
+            id: DeclarationId(2053),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57799,7 +57835,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4956, 4970),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2053),
+            id: DeclarationId(2054),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57819,7 +57855,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5020, 5033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2054),
+            id: DeclarationId(2055),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57839,7 +57875,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5083, 5096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2055),
+            id: DeclarationId(2056),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57859,7 +57895,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5144, 5160),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2056),
+            id: DeclarationId(2057),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -57879,13 +57915,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5213, 5239),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2057),
+            id: DeclarationId(2058),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2056),
+                    value: DeclarationId(2057),
                 }],
             },
             type_params: vec![],
@@ -57899,7 +57935,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5208, 5240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2058),
+            id: DeclarationId(2059),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -57919,13 +57955,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5314, 5340),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2059),
+            id: DeclarationId(2060),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2058),
+                    value: DeclarationId(2059),
                 }],
             },
             type_params: vec![],
@@ -57939,7 +57975,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5309, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2060),
+            id: DeclarationId(2061),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57959,7 +57995,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5466, 5482),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2061),
+            id: DeclarationId(2062),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -57979,7 +58015,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5607, 5641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2062),
+            id: DeclarationId(2063),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -57999,7 +58035,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5853, 5887),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2063),
+            id: DeclarationId(2064),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -58019,7 +58055,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6372, 6406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2064),
+            id: DeclarationId(2065),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -58039,7 +58075,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6633, 6667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2065),
+            id: DeclarationId(2066),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -58059,7 +58095,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6923, 6957),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2066),
+            id: DeclarationId(2067),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -58079,7 +58115,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7137, 7163),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2067),
+            id: DeclarationId(2068),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -58099,7 +58135,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7168, 7202),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2068),
+            id: DeclarationId(2069),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -58119,10 +58155,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8437, 8471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2069),
+            id: DeclarationId(2070),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1917),
+                template: DeclarationId(1918),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58139,10 +58175,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2070),
+            id: DeclarationId(2071),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1917),
+                template: DeclarationId(1918),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58159,10 +58195,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2071),
+            id: DeclarationId(2072),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1917),
+                template: DeclarationId(1918),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58179,10 +58215,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2072),
+            id: DeclarationId(2073),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1917),
+                template: DeclarationId(1918),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58199,10 +58235,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2073),
+            id: DeclarationId(2074),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1917),
+                template: DeclarationId(1918),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58219,10 +58255,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2074),
+            id: DeclarationId(2075),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1917),
+                template: DeclarationId(1918),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58239,10 +58275,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2075),
+            id: DeclarationId(2076),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1917),
+                template: DeclarationId(1918),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58259,10 +58295,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2076),
+            id: DeclarationId(2077),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1917),
+                template: DeclarationId(1918),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58279,10 +58315,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2077),
+            id: DeclarationId(2078),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1917),
+                template: DeclarationId(1918),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58299,10 +58335,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2078),
+            id: DeclarationId(2079),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1917),
+                template: DeclarationId(1918),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58319,10 +58355,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2079),
+            id: DeclarationId(2080),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1429),
+                template: DeclarationId(1430),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(799),
@@ -58339,10 +58375,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4888, 4905),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2080),
+            id: DeclarationId(2081),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1429),
+                template: DeclarationId(1430),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(827),
@@ -58359,10 +58395,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4956, 4970),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2081),
+            id: DeclarationId(2082),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1429),
+                template: DeclarationId(1430),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(781),
@@ -58379,10 +58415,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5020, 5033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2082),
+            id: DeclarationId(2083),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1429),
+                template: DeclarationId(1430),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(817),
@@ -58399,10 +58435,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5083, 5096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2083),
+            id: DeclarationId(2084),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1429),
+                template: DeclarationId(1430),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(982),
@@ -58419,13 +58455,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5144, 5160),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2084),
+            id: DeclarationId(2085),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1429),
+                template: DeclarationId(1430),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2056),
+                    value: DeclarationId(2057),
                 }],
             },
             type_params: vec![],
@@ -58439,13 +58475,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5208, 5240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2085),
+            id: DeclarationId(2086),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1431),
+                template: DeclarationId(1432),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2058),
+                    value: DeclarationId(2059),
                 }],
             },
             type_params: vec![],
@@ -58459,10 +58495,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5309, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2086),
+            id: DeclarationId(2087),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1917),
+                template: DeclarationId(1918),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58479,10 +58515,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5314, 5340),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2087),
+            id: DeclarationId(2088),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1431),
+                template: DeclarationId(1432),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(982),
@@ -58499,10 +58535,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5466, 5482),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2088),
+            id: DeclarationId(2089),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1923),
+                template: DeclarationId(1924),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(988),
                     value: DeclarationId(1222),
@@ -58519,10 +58555,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5607, 5641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2089),
+            id: DeclarationId(2090),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1927),
+                template: DeclarationId(1928),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(988),
                     value: DeclarationId(1222),
@@ -58539,7 +58575,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5853, 5887),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2090),
+            id: DeclarationId(2091),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -58558,7 +58594,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2091),
+            id: DeclarationId(2092),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -58577,7 +58613,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2092),
+            id: DeclarationId(2093),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -58595,32 +58631,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
-        declarations.push(Declaration {
-            id: DeclarationId(2093),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(137),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(138),
-                        value: DeclarationId(230),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(139),
-                        value: DeclarationId(1197),
-                    },
-                ],
-            },
-            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/termination.dag", 2732, 2760),
-        });
         declarations.push(Declaration {
             id: DeclarationId(2094),
             name: None,
@@ -58645,11 +58655,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 2804, 2832),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2732, 2760),
         });
         declarations.push(Declaration {
             id: DeclarationId(2095),
             name: None,
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(137),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(1197),
+                    },
+                ],
+            },
+            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/termination.dag", 2804, 2832),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2096),
+            name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
                     DeclarationId(1205),
@@ -58667,7 +58703,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2096),
+            id: DeclarationId(2097),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -58686,7 +58722,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2097),
+            id: DeclarationId(2098),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(11),
@@ -58712,7 +58748,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 12353, 12399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2098),
+            id: DeclarationId(2099),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58726,7 +58762,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 767, 773),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2099),
+            id: DeclarationId(2100),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58740,7 +58776,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 778, 791),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2100),
+            id: DeclarationId(2101),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58754,7 +58790,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 796, 810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2101),
+            id: DeclarationId(2102),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58773,7 +58809,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3332, 3358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2102),
+            id: DeclarationId(2103),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58792,7 +58828,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3363, 3391),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2103),
+            id: DeclarationId(2104),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58811,7 +58847,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3396, 3429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2104),
+            id: DeclarationId(2105),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58830,7 +58866,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3434, 3465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2105),
+            id: DeclarationId(2106),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58849,7 +58885,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3470, 3502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2106),
+            id: DeclarationId(2107),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58863,7 +58899,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 4509, 4516),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2107),
+            id: DeclarationId(2108),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58882,7 +58918,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 4521, 4571),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2108),
+            id: DeclarationId(2109),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58896,7 +58932,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 5484, 5495),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2109),
+            id: DeclarationId(2110),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58915,7 +58951,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 5500, 5545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2110),
+            id: DeclarationId(2111),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58934,7 +58970,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7649, 7683),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2111),
+            id: DeclarationId(2112),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58953,7 +58989,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7688, 7732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2112),
+            id: DeclarationId(2113),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58972,7 +59008,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7737, 7795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2113),
+            id: DeclarationId(2114),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58991,7 +59027,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7800, 7856),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2114),
+            id: DeclarationId(2115),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59010,7 +59046,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7861, 7894),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2115),
+            id: DeclarationId(2116),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59029,7 +59065,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7899, 7929),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2116),
+            id: DeclarationId(2117),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59043,7 +59079,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7934, 7947),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2117),
+            id: DeclarationId(2118),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -59063,7 +59099,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7987, 8009),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2118),
+            id: DeclarationId(2119),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -59083,7 +59119,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 8219, 8240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2119),
+            id: DeclarationId(2120),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59097,7 +59133,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 8740, 8746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2120),
+            id: DeclarationId(2121),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59111,7 +59147,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 9139, 9152),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2121),
+            id: DeclarationId(2122),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59125,7 +59161,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 9157, 9171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2122),
+            id: DeclarationId(2123),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59144,7 +59180,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 10263, 10297),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2123),
+            id: DeclarationId(2124),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59158,7 +59194,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 10302, 10320),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2124),
+            id: DeclarationId(2125),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -59184,7 +59220,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 11234, 11261),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2125),
+            id: DeclarationId(2126),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -59204,7 +59240,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8271, 8287),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2126),
+            id: DeclarationId(2127),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -59224,7 +59260,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2127),
+            id: DeclarationId(2128),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59243,7 +59279,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4032, 4066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2128),
+            id: DeclarationId(2129),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59257,7 +59293,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4071, 4081),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2129),
+            id: DeclarationId(2130),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59271,7 +59307,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4086, 4095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2130),
+            id: DeclarationId(2131),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59285,7 +59321,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4100, 4105),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2131),
+            id: DeclarationId(2132),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -59305,10 +59341,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 5943, 5971),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2132),
+            id: DeclarationId(2133),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1429),
+                template: DeclarationId(1430),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(978),
@@ -59325,10 +59361,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8271, 8287),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2133),
+            id: DeclarationId(2134),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1917),
+                template: DeclarationId(1918),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -59345,10 +59381,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2134),
+            id: DeclarationId(2135),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1917),
+                template: DeclarationId(1918),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -59365,10 +59401,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2135),
+            id: DeclarationId(2136),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1917),
+                template: DeclarationId(1918),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -59385,10 +59421,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2136),
+            id: DeclarationId(2137),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1917),
+                template: DeclarationId(1918),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -59405,10 +59441,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2137),
+            id: DeclarationId(2138),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1917),
+                template: DeclarationId(1918),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -59425,10 +59461,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2138),
+            id: DeclarationId(2139),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1917),
+                template: DeclarationId(1918),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -59445,10 +59481,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2139),
+            id: DeclarationId(2140),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1917),
+                template: DeclarationId(1918),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -59465,10 +59501,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2140),
+            id: DeclarationId(2141),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1917),
+                template: DeclarationId(1918),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -59485,10 +59521,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2141),
+            id: DeclarationId(2142),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1917),
+                template: DeclarationId(1918),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -59505,10 +59541,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2142),
+            id: DeclarationId(2143),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1917),
+                template: DeclarationId(1918),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -59525,7 +59561,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2143),
+            id: DeclarationId(2144),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59539,7 +59575,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(2144),
+            id: DeclarationId(2145),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59553,7 +59589,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(2145),
+            id: DeclarationId(2146),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59567,7 +59603,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(2146),
+            id: DeclarationId(2147),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59581,7 +59617,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(2147),
+            id: DeclarationId(2148),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59595,7 +59631,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(2148),
+            id: DeclarationId(2149),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59609,7 +59645,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(2149),
+            id: DeclarationId(2150),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59623,7 +59659,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(2150),
+            id: DeclarationId(2151),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59637,7 +59673,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(2151),
+            id: DeclarationId(2152),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59651,7 +59687,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(2152),
+            id: DeclarationId(2153),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59665,7 +59701,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(2153),
+            id: DeclarationId(2154),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59679,7 +59715,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(2154),
+            id: DeclarationId(2155),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59693,7 +59729,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(2155),
+            id: DeclarationId(2156),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59707,7 +59743,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(2156),
+            id: DeclarationId(2157),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59726,7 +59762,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(2157),
+            id: DeclarationId(2158),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59745,7 +59781,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 889, 903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2158),
+            id: DeclarationId(2159),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59764,7 +59800,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 908, 925),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2159),
+            id: DeclarationId(2160),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59778,7 +59814,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 930, 932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2160),
+            id: DeclarationId(2161),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59792,7 +59828,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 937, 941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2161),
+            id: DeclarationId(2162),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59806,7 +59842,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 946, 951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2162),
+            id: DeclarationId(2163),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59820,7 +59856,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 956, 958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2163),
+            id: DeclarationId(2164),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59834,7 +59870,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 963, 965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2164),
+            id: DeclarationId(2165),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59848,7 +59884,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 970, 972),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2165),
+            id: DeclarationId(2166),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59862,7 +59898,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 977, 979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2166),
+            id: DeclarationId(2167),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59876,7 +59912,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 984, 988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2167),
+            id: DeclarationId(2168),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59890,7 +59926,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 993, 998),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2168),
+            id: DeclarationId(2169),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59904,7 +59940,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1003, 1007),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2169),
+            id: DeclarationId(2170),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59918,7 +59954,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1012, 1017),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2170),
+            id: DeclarationId(2171),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59932,7 +59968,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1022, 1028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2171),
+            id: DeclarationId(2172),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59946,7 +59982,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1033, 1041),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2172),
+            id: DeclarationId(2173),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59960,7 +59996,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1046, 1051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2173),
+            id: DeclarationId(2174),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59974,7 +60010,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1056, 1061),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2174),
+            id: DeclarationId(2175),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59988,7 +60024,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1066, 1074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2175),
+            id: DeclarationId(2176),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60002,7 +60038,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1079, 1088),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2176),
+            id: DeclarationId(2177),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60016,7 +60052,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1093, 1096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2177),
+            id: DeclarationId(2178),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60030,7 +60066,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1101, 1107),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2178),
+            id: DeclarationId(2179),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60044,7 +60080,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1112, 1118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2179),
+            id: DeclarationId(2180),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60058,7 +60094,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1123, 1129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2180),
+            id: DeclarationId(2181),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60072,7 +60108,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1134, 1140),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2181),
+            id: DeclarationId(2182),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60086,7 +60122,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1145, 1153),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2182),
+            id: DeclarationId(2183),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60100,7 +60136,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1158, 1166),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2183),
+            id: DeclarationId(2184),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60114,7 +60150,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1171, 1176),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2184),
+            id: DeclarationId(2185),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60128,7 +60164,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1181, 1190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2185),
+            id: DeclarationId(2186),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60142,7 +60178,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1195, 1199),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2186),
+            id: DeclarationId(2187),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60156,7 +60192,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1204, 1212),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2187),
+            id: DeclarationId(2188),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60170,7 +60206,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1217, 1220),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2188),
+            id: DeclarationId(2189),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60184,7 +60220,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1791, 1796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2189),
+            id: DeclarationId(2190),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60198,7 +60234,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1801, 1805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2190),
+            id: DeclarationId(2191),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60212,7 +60248,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1810, 1816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2191),
+            id: DeclarationId(2192),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60226,7 +60262,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1821, 1827),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2192),
+            id: DeclarationId(2193),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60240,7 +60276,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1832, 1836),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2193),
+            id: DeclarationId(2194),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60254,7 +60290,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1841, 1847),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2194),
+            id: DeclarationId(2195),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60268,7 +60304,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1852, 1860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2195),
+            id: DeclarationId(2196),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60282,7 +60318,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1865, 1873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2196),
+            id: DeclarationId(2197),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60296,7 +60332,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1878, 1885),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2197),
+            id: DeclarationId(2198),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60310,7 +60346,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1890, 1896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2198),
+            id: DeclarationId(2199),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60324,7 +60360,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1901, 1908),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2199),
+            id: DeclarationId(2200),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60338,7 +60374,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1913, 1919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2200),
+            id: DeclarationId(2201),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60352,7 +60388,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1924, 1931),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2201),
+            id: DeclarationId(2202),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60366,7 +60402,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2371, 2373),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2202),
+            id: DeclarationId(2203),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60380,7 +60416,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2378, 2382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2203),
+            id: DeclarationId(2204),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60394,7 +60430,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2387, 2392),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2204),
+            id: DeclarationId(2205),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60408,7 +60444,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2397, 2399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2205),
+            id: DeclarationId(2206),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60422,7 +60458,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2404, 2406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2206),
+            id: DeclarationId(2207),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60436,7 +60472,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2411, 2413),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2207),
+            id: DeclarationId(2208),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60450,7 +60486,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2418, 2420),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2208),
+            id: DeclarationId(2209),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60464,7 +60500,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2425, 2429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2209),
+            id: DeclarationId(2210),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60478,7 +60514,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2434, 2439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2210),
+            id: DeclarationId(2211),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60492,7 +60528,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2444, 2448),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2211),
+            id: DeclarationId(2212),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60506,7 +60542,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2453, 2458),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2212),
+            id: DeclarationId(2213),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60520,7 +60556,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2463, 2469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2213),
+            id: DeclarationId(2214),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60534,7 +60570,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2474, 2482),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2214),
+            id: DeclarationId(2215),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60548,7 +60584,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2487, 2492),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2215),
+            id: DeclarationId(2216),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60562,7 +60598,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2497, 2502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2216),
+            id: DeclarationId(2217),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60576,7 +60612,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2507, 2515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2217),
+            id: DeclarationId(2218),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60590,7 +60626,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2520, 2529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2218),
+            id: DeclarationId(2219),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60604,7 +60640,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2534, 2537),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2219),
+            id: DeclarationId(2220),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60618,7 +60654,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2542, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2220),
+            id: DeclarationId(2221),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60632,7 +60668,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2553, 2559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2221),
+            id: DeclarationId(2222),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60646,7 +60682,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2564, 2570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2222),
+            id: DeclarationId(2223),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60660,7 +60696,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2575, 2581),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2223),
+            id: DeclarationId(2224),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60674,7 +60710,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2586, 2594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2224),
+            id: DeclarationId(2225),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60688,7 +60724,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2599, 2607),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2225),
+            id: DeclarationId(2226),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60702,7 +60738,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2612, 2617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2226),
+            id: DeclarationId(2227),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60716,7 +60752,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2622, 2631),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2227),
+            id: DeclarationId(2228),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60730,7 +60766,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2636, 2640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2228),
+            id: DeclarationId(2229),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60744,7 +60780,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2645, 2653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2229),
+            id: DeclarationId(2230),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -60761,10 +60797,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", 26886, 26909),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26891, 26914),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2230),
+            id: DeclarationId(2231),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -60781,10 +60817,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", 27978, 27994),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27983, 27999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2231),
+            id: DeclarationId(2232),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -60801,10 +60837,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", 27999, 28019),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28004, 28024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2232),
+            id: DeclarationId(2233),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60818,7 +60854,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2612, 2626),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2233),
+            id: DeclarationId(2234),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60832,7 +60868,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2631, 2641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2234),
+            id: DeclarationId(2235),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60846,7 +60882,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2646, 2658),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2235),
+            id: DeclarationId(2236),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60860,7 +60896,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2663, 2676),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2236),
+            id: DeclarationId(2237),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60874,7 +60910,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2681, 2693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2237),
+            id: DeclarationId(2238),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60888,7 +60924,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2698, 2710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2238),
+            id: DeclarationId(2239),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60902,7 +60938,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2715, 2737),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2239),
+            id: DeclarationId(2240),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60916,7 +60952,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2742, 2761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2240),
+            id: DeclarationId(2241),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60930,7 +60966,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2766, 2791),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2241),
+            id: DeclarationId(2242),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60944,7 +60980,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2796, 2819),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2242),
+            id: DeclarationId(2243),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60958,7 +60994,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 3225, 3234),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2243),
+            id: DeclarationId(2244),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60977,7 +61013,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 3239, 3255),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2244),
+            id: DeclarationId(2245),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60991,7 +61027,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 3914, 3922),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2245),
+            id: DeclarationId(2246),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61005,7 +61041,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 3927, 3937),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2246),
+            id: DeclarationId(2247),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61019,7 +61055,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4162, 4174),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2247),
+            id: DeclarationId(2248),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61033,7 +61069,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4989, 5002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2248),
+            id: DeclarationId(2249),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61047,7 +61083,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5007, 5020),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2249),
+            id: DeclarationId(2250),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61061,7 +61097,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5025, 5033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2250),
+            id: DeclarationId(2251),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61086,7 +61122,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5578, 5645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2251),
+            id: DeclarationId(2252),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61105,7 +61141,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5686, 5739),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2252),
+            id: DeclarationId(2253),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61119,7 +61155,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5772, 5801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2253),
+            id: DeclarationId(2254),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61133,7 +61169,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6403, 6435),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2254),
+            id: DeclarationId(2255),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61147,7 +61183,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6440, 6471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2255),
+            id: DeclarationId(2256),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61161,7 +61197,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6513, 6545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2256),
+            id: DeclarationId(2257),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61175,7 +61211,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6550, 6581),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2257),
+            id: DeclarationId(2258),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61189,7 +61225,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6586, 6614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2258),
+            id: DeclarationId(2259),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61203,7 +61239,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6619, 6645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2259),
+            id: DeclarationId(2260),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61217,7 +61253,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6684, 6706),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2260),
+            id: DeclarationId(2261),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61231,7 +61267,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6711, 6739),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2261),
+            id: DeclarationId(2262),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61245,7 +61281,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6744, 6773),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2262),
+            id: DeclarationId(2263),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61256,10 +61292,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", 9579, 9587),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9584, 9592),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2263),
+            id: DeclarationId(2264),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61275,10 +61311,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", 9592, 9632),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9597, 9637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2264),
+            id: DeclarationId(2265),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61294,10 +61330,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", 9637, 9670),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9642, 9675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2265),
+            id: DeclarationId(2266),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61319,10 +61355,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", 9675, 9753),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9680, 9758),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2266),
+            id: DeclarationId(2267),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61338,10 +61374,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", 9919, 9982),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9924, 9987),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2267),
+            id: DeclarationId(2268),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61367,10 +61403,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", 9987, 10078),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9992, 10083),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2268),
+            id: DeclarationId(2269),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61396,10 +61432,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", 10083, 10215),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10088, 10220),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2269),
+            id: DeclarationId(2270),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61421,10 +61457,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", 10430, 10519),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10435, 10524),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2270),
+            id: DeclarationId(2271),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -61441,10 +61477,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", 11319, 11331),
+            span: SourceSpan::new("src/v3/std/verification.dag", 11324, 11336),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2271),
+            id: DeclarationId(2272),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61454,7 +61490,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2270),
+                        ty: DeclarationId(2271),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -61470,10 +61506,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", 11268, 11365),
+            span: SourceSpan::new("src/v3/std/verification.dag", 11273, 11370),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2272),
+            id: DeclarationId(2273),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -61490,10 +61526,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", 12080, 12092),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12085, 12097),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2273),
+            id: DeclarationId(2274),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61503,7 +61539,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2272),
+                        ty: DeclarationId(2273),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -61523,10 +61559,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", 12030, 12158),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12035, 12163),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2274),
+            id: DeclarationId(2275),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61552,10 +61588,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", 12456, 12578),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12461, 12583),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2275),
+            id: DeclarationId(2276),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61581,10 +61617,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", 12840, 12965),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12845, 12970),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2276),
+            id: DeclarationId(2277),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61600,10 +61636,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", 15018, 15079),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15023, 15084),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2277),
+            id: DeclarationId(2278),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61625,10 +61661,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", 15084, 15183),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15089, 15188),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2278),
+            id: DeclarationId(2279),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61654,10 +61690,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", 15537, 15669),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15542, 15674),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2279),
+            id: DeclarationId(2280),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61679,10 +61715,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", 16236, 16348),
+            span: SourceSpan::new("src/v3/std/verification.dag", 16241, 16353),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2280),
+            id: DeclarationId(2281),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61704,10 +61740,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", 17045, 17124),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17050, 17129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2281),
+            id: DeclarationId(2282),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61733,10 +61769,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", 17344, 17457),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17349, 17462),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2282),
+            id: DeclarationId(2283),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61762,10 +61798,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", 17462, 17598),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17467, 17603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2283),
+            id: DeclarationId(2284),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61787,10 +61823,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", 17603, 17685),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17608, 17690),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2284),
+            id: DeclarationId(2285),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61812,10 +61848,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", 17690, 17776),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17695, 17781),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2285),
+            id: DeclarationId(2286),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -61832,10 +61868,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", 17855, 17865),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17860, 17870),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2286),
+            id: DeclarationId(2287),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61845,7 +61881,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "generated_paths".to_string(),
-                        ty: DeclarationId(2285),
+                        ty: DeclarationId(2286),
                     },
                 ],
             },
@@ -61857,10 +61893,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", 17781, 17871),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17786, 17876),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2287),
+            id: DeclarationId(2288),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61882,10 +61918,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", 19085, 19210),
+            span: SourceSpan::new("src/v3/std/verification.dag", 19090, 19215),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2288),
+            id: DeclarationId(2289),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61911,10 +61947,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", 20152, 20286),
+            span: SourceSpan::new("src/v3/std/verification.dag", 20157, 20291),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2289),
+            id: DeclarationId(2290),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61940,10 +61976,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", 20925, 21069),
+            span: SourceSpan::new("src/v3/std/verification.dag", 20930, 21074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2290),
+            id: DeclarationId(2291),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61959,10 +61995,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", 21914, 21968),
+            span: SourceSpan::new("src/v3/std/verification.dag", 21919, 21973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2291),
+            id: DeclarationId(2292),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -61979,10 +62015,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", 23012, 23035),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23017, 23040),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2292),
+            id: DeclarationId(2293),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61993,10 +62029,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", 23238, 23244),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23243, 23249),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2293),
+            id: DeclarationId(2294),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62007,10 +62043,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", 23249, 23255),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23254, 23260),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2294),
+            id: DeclarationId(2295),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -62027,10 +62063,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", 23393, 23416),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23398, 23421),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2295),
+            id: DeclarationId(2296),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62046,10 +62082,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", 25139, 25168),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25144, 25173),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2296),
+            id: DeclarationId(2297),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62065,10 +62101,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", 25173, 25212),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25178, 25217),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2297),
+            id: DeclarationId(2298),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62084,10 +62120,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", 26070, 26091),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26075, 26096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2298),
+            id: DeclarationId(2299),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62103,10 +62139,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", 26096, 26127),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26101, 26132),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2299),
+            id: DeclarationId(2300),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -62123,10 +62159,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", 26171, 26187),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26176, 26192),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2300),
+            id: DeclarationId(2301),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -62143,10 +62179,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", 26443, 26466),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26448, 26471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2301),
+            id: DeclarationId(2302),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -62166,7 +62202,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 7007, 7038),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2302),
+            id: DeclarationId(2303),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -62186,7 +62222,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(2303),
+            id: DeclarationId(2304),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62200,7 +62236,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(2304),
+            id: DeclarationId(2305),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62214,7 +62250,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(2305),
+            id: DeclarationId(2306),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62228,7 +62264,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(2306),
+            id: DeclarationId(2307),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -62247,7 +62283,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(2307),
+            id: DeclarationId(2308),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62261,7 +62297,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6428, 6446),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2308),
+            id: DeclarationId(2309),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62275,7 +62311,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6451, 6466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2309),
+            id: DeclarationId(2310),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62289,7 +62325,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6495, 6518),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2310),
+            id: DeclarationId(2311),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62303,7 +62339,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6523, 6544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2311),
+            id: DeclarationId(2312),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62317,7 +62353,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6549, 6564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2312),
+            id: DeclarationId(2313),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62331,7 +62367,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8177, 8187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2313),
+            id: DeclarationId(2314),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62345,7 +62381,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8192, 8203),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2314),
+            id: DeclarationId(2315),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62359,7 +62395,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8208, 8221),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2315),
+            id: DeclarationId(2316),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62373,7 +62409,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8226, 8239),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2316),
+            id: DeclarationId(2317),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62387,7 +62423,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8244, 8257),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2317),
+            id: DeclarationId(2318),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62401,7 +62437,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8262, 8276),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2318),
+            id: DeclarationId(2319),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62415,7 +62451,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8281, 8296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2319),
+            id: DeclarationId(2320),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62429,7 +62465,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9038, 9055),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2320),
+            id: DeclarationId(2321),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62443,7 +62479,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9060, 9070),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2321),
+            id: DeclarationId(2322),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62457,7 +62493,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9075, 9079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2322),
+            id: DeclarationId(2323),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62467,11 +62503,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1333),
+                        ty: DeclarationId(1334),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(1335),
+                        ty: DeclarationId(1336),
                     },
                     Field {
                         label: "range_min_inclusive".to_string(),
@@ -62487,7 +62523,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "overflow".to_string(),
-                        ty: DeclarationId(1336),
+                        ty: DeclarationId(1337),
                     },
                 ],
             },
@@ -62502,7 +62538,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9857, 10429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2323),
+            id: DeclarationId(2324),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62512,11 +62548,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1334),
+                        ty: DeclarationId(1335),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(1335),
+                        ty: DeclarationId(1336),
                     },
                     Field {
                         label: "is_copy".to_string(),
@@ -62535,13 +62571,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10434, 10616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2324),
+            id: DeclarationId(2325),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1337),
+                    value: DeclarationId(1338),
                 }],
             },
             type_params: vec![],
@@ -62555,7 +62591,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10965, 10984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2325),
+            id: DeclarationId(2326),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62569,7 +62605,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4233, 4241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2326),
+            id: DeclarationId(2327),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62588,7 +62624,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4246, 4277),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2327),
+            id: DeclarationId(2328),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -62608,12 +62644,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4299, 4319),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2328),
+            id: DeclarationId(2329),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "values".to_string(),
-                    ty: DeclarationId(2327),
+                    ty: DeclarationId(2328),
                 }],
             },
             type_params: vec![],
@@ -62627,7 +62663,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4282, 4321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2329),
+            id: DeclarationId(2330),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62652,7 +62688,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4326, 4379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2330),
+            id: DeclarationId(2331),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62677,7 +62713,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4384, 4433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2331),
+            id: DeclarationId(2332),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62691,7 +62727,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 847, 851),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2332),
+            id: DeclarationId(2333),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62705,7 +62741,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 854, 857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2333),
+            id: DeclarationId(2334),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62719,13 +62755,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 860, 872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2334),
+            id: DeclarationId(2335),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1349),
+                    value: DeclarationId(1350),
                 }],
             },
             type_params: vec![],
@@ -62739,7 +62775,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1242, 1259),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2335),
+            id: DeclarationId(2336),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -62758,7 +62794,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2336),
+            id: DeclarationId(2337),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62772,7 +62808,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1309, 1318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2337),
+            id: DeclarationId(2338),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62786,7 +62822,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1323, 1332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2338),
+            id: DeclarationId(2339),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62800,7 +62836,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1337, 1350),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2339),
+            id: DeclarationId(2340),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62814,7 +62850,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1355, 1367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2340),
+            id: DeclarationId(2341),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62828,7 +62864,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1372, 1385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2341),
+            id: DeclarationId(2342),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -62847,7 +62883,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2342),
+            id: DeclarationId(2343),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62861,7 +62897,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1677, 1685),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2343),
+            id: DeclarationId(2344),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62875,7 +62911,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1688, 1697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2344),
+            id: DeclarationId(2345),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62889,13 +62925,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1700, 1709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2345),
+            id: DeclarationId(2346),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1358),
+                    value: DeclarationId(1359),
                 }],
             },
             type_params: vec![],
@@ -62909,11 +62945,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1521, 1542),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2346),
+            id: DeclarationId(2347),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1367),
+                    DeclarationId(1368),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -62928,13 +62964,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2347),
+            id: DeclarationId(2348),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1364),
+                    value: DeclarationId(1365),
                 }],
             },
             type_params: vec![],
@@ -62948,7 +62984,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1583, 1592),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2348),
+            id: DeclarationId(2349),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -62974,11 +63010,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2349),
+            id: DeclarationId(2350),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2348),
+                    DeclarationId(2349),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -62993,11 +63029,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2350),
+            id: DeclarationId(2351),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1356),
+                    DeclarationId(1357),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63012,7 +63048,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2351),
+            id: DeclarationId(2352),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63026,7 +63062,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1917, 1925),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2352),
+            id: DeclarationId(2353),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63040,7 +63076,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1928, 1937),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2353),
+            id: DeclarationId(2354),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63054,7 +63090,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1940, 1948),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2354),
+            id: DeclarationId(2355),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -63074,7 +63110,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2106, 2118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2355),
+            id: DeclarationId(2356),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -63094,17 +63130,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2127, 2139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2356),
+            id: DeclarationId(2357),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "branches".to_string(),
-                        ty: DeclarationId(2354),
+                        ty: DeclarationId(2355),
                     },
                     Field {
                         label: "paths".to_string(),
-                        ty: DeclarationId(2355),
+                        ty: DeclarationId(2356),
                     },
                 ],
             },
@@ -63119,7 +63155,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2089, 2141),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2357),
+            id: DeclarationId(2358),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -63139,13 +63175,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2170, 2182),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2358),
+            id: DeclarationId(2359),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1359),
+                    value: DeclarationId(1360),
                 }],
             },
             type_params: vec![],
@@ -63159,17 +63195,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2191, 2216),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2359),
+            id: DeclarationId(2360),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "branches".to_string(),
-                        ty: DeclarationId(2357),
+                        ty: DeclarationId(2358),
                     },
                     Field {
                         label: "types".to_string(),
-                        ty: DeclarationId(2358),
+                        ty: DeclarationId(2359),
                     },
                 ],
             },
@@ -63184,12 +63220,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2146, 2218),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2360),
+            id: DeclarationId(2361),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "cron".to_string(),
-                    ty: DeclarationId(1340),
+                    ty: DeclarationId(1341),
                 }],
             },
             type_params: vec![],
@@ -63203,13 +63239,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2223, 2254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2361),
+            id: DeclarationId(2362),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1360),
+                    value: DeclarationId(1361),
                 }],
             },
             type_params: vec![],
@@ -63223,12 +63259,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2286, 2305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2362),
+            id: DeclarationId(2363),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "inputs".to_string(),
-                    ty: DeclarationId(2361),
+                    ty: DeclarationId(2362),
                 }],
             },
             type_params: vec![],
@@ -63242,13 +63278,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2259, 2307),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2363),
+            id: DeclarationId(2364),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1360),
+                    value: DeclarationId(1361),
                 }],
             },
             type_params: vec![],
@@ -63262,12 +63298,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2335, 2354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2364),
+            id: DeclarationId(2365),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "inputs".to_string(),
-                    ty: DeclarationId(2363),
+                    ty: DeclarationId(2364),
                 }],
             },
             type_params: vec![],
@@ -63281,7 +63317,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2312, 2356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2365),
+            id: DeclarationId(2366),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63295,7 +63331,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2387, 2393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2366),
+            id: DeclarationId(2367),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63309,7 +63345,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2398, 2409),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2367),
+            id: DeclarationId(2368),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63323,7 +63359,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2414, 2422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2368),
+            id: DeclarationId(2369),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63337,7 +63373,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2427, 2441),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2369),
+            id: DeclarationId(2370),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63351,7 +63387,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2446, 2452),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2370),
+            id: DeclarationId(2371),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -63370,7 +63406,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2371),
+            id: DeclarationId(2372),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -63389,7 +63425,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2372),
+            id: DeclarationId(2373),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63403,7 +63439,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2603, 2614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2373),
+            id: DeclarationId(2374),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63417,7 +63453,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2617, 2629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2374),
+            id: DeclarationId(2375),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63431,7 +63467,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2632, 2643),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2375),
+            id: DeclarationId(2376),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63445,7 +63481,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2646, 2662),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2376),
+            id: DeclarationId(2377),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63459,7 +63495,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4784, 4793),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2377),
+            id: DeclarationId(2378),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63473,7 +63509,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4796, 4804),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2378),
+            id: DeclarationId(2379),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63487,7 +63523,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4807, 4820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2379),
+            id: DeclarationId(2380),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -63506,13 +63542,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2380),
+            id: DeclarationId(2381),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1370),
+                    value: DeclarationId(1371),
                 }],
             },
             type_params: vec![],
@@ -63526,7 +63562,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5372, 5382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2381),
+            id: DeclarationId(2382),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -63546,7 +63582,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5392, 5404),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2382),
+            id: DeclarationId(2383),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -63572,11 +63608,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2383),
+            id: DeclarationId(2384),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2382),
+                    DeclarationId(2383),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63591,7 +63627,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2384),
+            id: DeclarationId(2385),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -63617,11 +63653,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2385),
+            id: DeclarationId(2386),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2384),
+                    DeclarationId(2385),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63636,7 +63672,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2386),
+            id: DeclarationId(2387),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -63655,11 +63691,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2387),
+            id: DeclarationId(2388),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1386),
+                    DeclarationId(1387),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63674,7 +63710,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2388),
+            id: DeclarationId(2389),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -63693,11 +63729,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2389),
+            id: DeclarationId(2390),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1367),
+                    DeclarationId(1368),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63712,7 +63748,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2390),
+            id: DeclarationId(2391),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63731,7 +63767,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6619, 6655),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2391),
+            id: DeclarationId(2392),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63750,7 +63786,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6660, 6709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2392),
+            id: DeclarationId(2393),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63764,7 +63800,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7555, 7584),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2393),
+            id: DeclarationId(2394),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63783,7 +63819,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7589, 7646),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2394),
+            id: DeclarationId(2395),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63802,11 +63838,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8224, 8259),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2395),
+            id: DeclarationId(2396),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1366),
+                    DeclarationId(1367),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63821,7 +63857,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2396),
+            id: DeclarationId(2397),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -63831,7 +63867,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "cancel_in_progress".to_string(),
-                        ty: DeclarationId(2395),
+                        ty: DeclarationId(2396),
                     },
                 ],
             },
@@ -63846,11 +63882,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8264, 8453),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2397),
+            id: DeclarationId(2398),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1365),
+                    DeclarationId(1366),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63865,7 +63901,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2398),
+            id: DeclarationId(2399),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -63884,7 +63920,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2399),
+            id: DeclarationId(2400),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -63894,11 +63930,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "cancel_in_progress".to_string(),
-                        ty: DeclarationId(2397),
+                        ty: DeclarationId(2398),
                     },
                     Field {
                         label: "explicit_single".to_string(),
-                        ty: DeclarationId(2398),
+                        ty: DeclarationId(2399),
                     },
                 ],
             },
@@ -63913,12 +63949,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8458, 8845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2400),
+            id: DeclarationId(2401),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "label".to_string(),
-                    ty: DeclarationId(1369),
+                    ty: DeclarationId(1370),
                 }],
             },
             type_params: vec![],
@@ -63932,7 +63968,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10037, 10072),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2401),
+            id: DeclarationId(2402),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -63952,12 +63988,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10098, 10110),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2402),
+            id: DeclarationId(2403),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "labels".to_string(),
-                    ty: DeclarationId(2401),
+                    ty: DeclarationId(2402),
                 }],
             },
             type_params: vec![],
@@ -63971,7 +64007,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10077, 10112),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2403),
+            id: DeclarationId(2404),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63990,7 +64026,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10201, 10240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2404),
+            id: DeclarationId(2405),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64004,7 +64040,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10263, 10275),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2405),
+            id: DeclarationId(2406),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64018,7 +64054,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10280, 10290),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2406),
+            id: DeclarationId(2407),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64032,7 +64068,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10295, 10305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2407),
+            id: DeclarationId(2408),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64046,7 +64082,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10310, 10321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2408),
+            id: DeclarationId(2409),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64060,7 +64096,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10326, 10333),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2409),
+            id: DeclarationId(2410),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64074,7 +64110,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10338, 10351),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2410),
+            id: DeclarationId(2411),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64093,7 +64129,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2411),
+            id: DeclarationId(2412),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64111,202 +64147,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
-        declarations.push(Declaration {
-            id: DeclarationId(2412),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(137),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(138),
-                        value: DeclarationId(230),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(139),
-                        value: DeclarationId(230),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/actions.dag", 10614, 10633),
-        });
         declarations.push(Declaration {
             id: DeclarationId(2413),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2412),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 10614, 10634),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2414),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 10661, 10668),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2415),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 10690, 10697),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2416),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(93),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 10753, 10757),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2417),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(2410),
-                    },
-                    Field {
-                        label: "id".to_string(),
-                        ty: DeclarationId(2411),
-                    },
-                    Field {
-                        label: "run".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "shell".to_string(),
-                        ty: DeclarationId(1371),
-                    },
-                    Field {
-                        label: "env".to_string(),
-                        ty: DeclarationId(2413),
-                    },
-                    Field {
-                        label: "working_directory".to_string(),
-                        ty: DeclarationId(2414),
-                    },
-                    Field {
-                        label: "if_condition".to_string(),
-                        ty: DeclarationId(2415),
-                    },
-                    Field {
-                        label: "continue_on_error".to_string(),
-                        ty: DeclarationId(128),
-                    },
-                    Field {
-                        label: "timeout_minutes".to_string(),
-                        ty: DeclarationId(2416),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/actions.dag", 10510, 10763),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2418),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 10791, 10798),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2419),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 10810, 10817),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2420),
-            name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
                 arguments: vec![
@@ -64328,7 +64171,174 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10854, 10873),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10633),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2414),
+            name: None,
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(2413),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
+            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("dsl/extdeps/github/actions.dag", 10614, 10634),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2415),
+            name: None,
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
+            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("dsl/extdeps/github/actions.dag", 10661, 10668),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2416),
+            name: None,
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
+            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("dsl/extdeps/github/actions.dag", 10690, 10697),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2417),
+            name: None,
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(93),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
+            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("dsl/extdeps/github/actions.dag", 10753, 10757),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2418),
+            name: None,
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "name".to_string(),
+                        ty: DeclarationId(2411),
+                    },
+                    Field {
+                        label: "id".to_string(),
+                        ty: DeclarationId(2412),
+                    },
+                    Field {
+                        label: "run".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "shell".to_string(),
+                        ty: DeclarationId(1372),
+                    },
+                    Field {
+                        label: "env".to_string(),
+                        ty: DeclarationId(2414),
+                    },
+                    Field {
+                        label: "working_directory".to_string(),
+                        ty: DeclarationId(2415),
+                    },
+                    Field {
+                        label: "if_condition".to_string(),
+                        ty: DeclarationId(2416),
+                    },
+                    Field {
+                        label: "continue_on_error".to_string(),
+                        ty: DeclarationId(128),
+                    },
+                    Field {
+                        label: "timeout_minutes".to_string(),
+                        ty: DeclarationId(2417),
+                    },
+                ],
+            },
+            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("dsl/extdeps/github/actions.dag", 10510, 10763),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2419),
+            name: None,
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
+            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("dsl/extdeps/github/actions.dag", 10791, 10798),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2420),
+            name: None,
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
+            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("dsl/extdeps/github/actions.dag", 10810, 10817),
         });
         declarations.push(Declaration {
             id: DeclarationId(2421),
@@ -64354,14 +64364,40 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10886, 10905),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10854, 10873),
         });
         declarations.push(Declaration {
             id: DeclarationId(2422),
             name: None,
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(137),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(230),
+                    },
+                ],
+            },
+            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("dsl/extdeps/github/actions.dag", 10886, 10905),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2423),
+            name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2421),
+                    DeclarationId(2422),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -64376,7 +64412,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10886, 10906),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2423),
+            id: DeclarationId(2424),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64395,7 +64431,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10928, 10935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2424),
+            id: DeclarationId(2425),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64414,33 +64450,33 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10991, 10995),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2425),
+            id: DeclarationId(2426),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(2418),
+                        ty: DeclarationId(2419),
                     },
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(2419),
+                        ty: DeclarationId(2420),
                     },
                     Field {
                         label: "uses".to_string(),
-                        ty: DeclarationId(1372),
+                        ty: DeclarationId(1373),
                     },
                     Field {
                         label: "with".to_string(),
-                        ty: DeclarationId(2420),
+                        ty: DeclarationId(2421),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(2422),
+                        ty: DeclarationId(2423),
                     },
                     Field {
                         label: "if_condition".to_string(),
-                        ty: DeclarationId(2423),
+                        ty: DeclarationId(2424),
                     },
                     Field {
                         label: "continue_on_error".to_string(),
@@ -64448,7 +64484,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "timeout_minutes".to_string(),
-                        ty: DeclarationId(2424),
+                        ty: DeclarationId(2425),
                     },
                 ],
             },
@@ -64463,7 +64499,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10768, 11001),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2426),
+            id: DeclarationId(2427),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64477,7 +64513,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11020, 11024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2427),
+            id: DeclarationId(2428),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64491,7 +64527,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11027, 11029),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2428),
+            id: DeclarationId(2429),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64505,7 +64541,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11032, 11036),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2429),
+            id: DeclarationId(2430),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64519,7 +64555,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11039, 11045),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2430),
+            id: DeclarationId(2431),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64533,7 +64569,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11048, 11051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2431),
+            id: DeclarationId(2432),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64552,7 +64588,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11414, 11421),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2432),
+            id: DeclarationId(2433),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64571,7 +64607,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11429, 11433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2433),
+            id: DeclarationId(2434),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64590,7 +64626,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11440, 11444),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2434),
+            id: DeclarationId(2435),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64600,15 +64636,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "file".to_string(),
-                        ty: DeclarationId(2431),
+                        ty: DeclarationId(2432),
                     },
                     Field {
                         label: "line".to_string(),
-                        ty: DeclarationId(2432),
+                        ty: DeclarationId(2433),
                     },
                     Field {
                         label: "col".to_string(),
-                        ty: DeclarationId(2433),
+                        ty: DeclarationId(2434),
                     },
                 ],
             },
@@ -64623,7 +64659,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11373, 11446),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2435),
+            id: DeclarationId(2436),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64642,7 +64678,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11494, 11501),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2436),
+            id: DeclarationId(2437),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64661,7 +64697,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11509, 11513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2437),
+            id: DeclarationId(2438),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64680,7 +64716,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11520, 11524),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2438),
+            id: DeclarationId(2439),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64690,15 +64726,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "file".to_string(),
-                        ty: DeclarationId(2435),
+                        ty: DeclarationId(2436),
                     },
                     Field {
                         label: "line".to_string(),
-                        ty: DeclarationId(2436),
+                        ty: DeclarationId(2437),
                     },
                     Field {
                         label: "col".to_string(),
-                        ty: DeclarationId(2437),
+                        ty: DeclarationId(2438),
                     },
                 ],
             },
@@ -64713,7 +64749,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11451, 11526),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2439),
+            id: DeclarationId(2440),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64732,7 +64768,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11573, 11580),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2440),
+            id: DeclarationId(2441),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64751,7 +64787,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11588, 11592),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2441),
+            id: DeclarationId(2442),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64770,7 +64806,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2442),
+            id: DeclarationId(2443),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64780,15 +64816,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "file".to_string(),
-                        ty: DeclarationId(2439),
+                        ty: DeclarationId(2440),
                     },
                     Field {
                         label: "line".to_string(),
-                        ty: DeclarationId(2440),
+                        ty: DeclarationId(2441),
                     },
                     Field {
                         label: "col".to_string(),
-                        ty: DeclarationId(2441),
+                        ty: DeclarationId(2442),
                     },
                 ],
             },
@@ -64803,7 +64839,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11531, 11605),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2443),
+            id: DeclarationId(2444),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -64822,7 +64858,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11610, 11643),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2444),
+            id: DeclarationId(2445),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64836,7 +64872,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11648, 11666),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2445),
+            id: DeclarationId(2446),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64861,7 +64897,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11671, 11712),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2446),
+            id: DeclarationId(2447),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -64880,7 +64916,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11717, 11742),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2447),
+            id: DeclarationId(2448),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -64899,7 +64935,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11747, 11777),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2448),
+            id: DeclarationId(2449),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64918,7 +64954,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12583, 12587),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2449),
+            id: DeclarationId(2450),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64932,11 +64968,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "retention_days".to_string(),
-                        ty: DeclarationId(2448),
+                        ty: DeclarationId(2449),
                     },
                     Field {
                         label: "if_no_files_found".to_string(),
-                        ty: DeclarationId(1383),
+                        ty: DeclarationId(1384),
                     },
                 ],
             },
@@ -64951,7 +64987,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12530, 12630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2450),
+            id: DeclarationId(2451),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64970,7 +65006,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12666, 12673),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2451),
+            id: DeclarationId(2452),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64980,7 +65016,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(2450),
+                        ty: DeclarationId(2451),
                     },
                 ],
             },
@@ -64995,7 +65031,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12635, 12675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2452),
+            id: DeclarationId(2453),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65009,7 +65045,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12705, 12709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2453),
+            id: DeclarationId(2454),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65023,7 +65059,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12712, 12720),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2454),
+            id: DeclarationId(2455),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65037,7 +65073,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12723, 12729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2455),
+            id: DeclarationId(2456),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -65057,7 +65093,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13191, 13203),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2456),
+            id: DeclarationId(2457),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -65068,7 +65104,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     TemplateArgument {
                         parameter: DeclarationId(139),
-                        value: DeclarationId(2455),
+                        value: DeclarationId(2456),
                     },
                 ],
             },
@@ -65083,7 +65119,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13179, 13204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2457),
+            id: DeclarationId(2458),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -65109,13 +65145,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13221, 13240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2458),
+            id: DeclarationId(2459),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2457),
+                    value: DeclarationId(2458),
                 }],
             },
             type_params: vec![],
@@ -65129,7 +65165,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13216, 13241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2459),
+            id: DeclarationId(2460),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -65155,13 +65191,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13258, 13277),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2460),
+            id: DeclarationId(2461),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2459),
+                    value: DeclarationId(2460),
                 }],
             },
             type_params: vec![],
@@ -65175,7 +65211,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13253, 13278),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2461),
+            id: DeclarationId(2462),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -65194,7 +65230,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13313, 13317),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2462),
+            id: DeclarationId(2463),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65208,7 +65244,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13473, 13480),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2463),
+            id: DeclarationId(2464),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65222,7 +65258,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13485, 13492),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2464),
+            id: DeclarationId(2465),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65236,7 +65272,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13497, 13506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2465),
+            id: DeclarationId(2466),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65250,7 +65286,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13511, 13518),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2466),
+            id: DeclarationId(2467),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65264,7 +65300,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13523, 13531),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2467),
+            id: DeclarationId(2468),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65278,7 +65314,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13536, 13550),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2468),
+            id: DeclarationId(2469),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65292,7 +65328,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1935, 1959),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2469),
+            id: DeclarationId(2470),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65306,7 +65342,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1964, 1989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2470),
+            id: DeclarationId(2471),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(151)],
@@ -65324,7 +65360,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2673, 2714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2471),
+            id: DeclarationId(2472),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65343,7 +65379,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2472),
+            id: DeclarationId(2473),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65357,17 +65393,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2473),
+            id: DeclarationId(2474),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2471),
+                        ty: DeclarationId(2472),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2472),
+                        ty: DeclarationId(2473),
                     },
                 ],
             },
@@ -65382,7 +65418,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2474),
+            id: DeclarationId(2475),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65401,7 +65437,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2475),
+            id: DeclarationId(2476),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65415,17 +65451,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2476),
+            id: DeclarationId(2477),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2474),
+                        ty: DeclarationId(2475),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2475),
+                        ty: DeclarationId(2476),
                     },
                 ],
             },
@@ -65440,7 +65476,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2477),
+            id: DeclarationId(2478),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65459,7 +65495,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2478),
+            id: DeclarationId(2479),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65473,17 +65509,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2479),
+            id: DeclarationId(2480),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2477),
+                        ty: DeclarationId(2478),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2478),
+                        ty: DeclarationId(2479),
                     },
                 ],
             },
@@ -65498,7 +65534,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2480),
+            id: DeclarationId(2481),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65517,7 +65553,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2481),
+            id: DeclarationId(2482),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65531,17 +65567,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2482),
+            id: DeclarationId(2483),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2480),
+                        ty: DeclarationId(2481),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2481),
+                        ty: DeclarationId(2482),
                     },
                 ],
             },
@@ -65556,7 +65592,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2483),
+            id: DeclarationId(2484),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65575,7 +65611,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2484),
+            id: DeclarationId(2485),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65589,17 +65625,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2485),
+            id: DeclarationId(2486),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2483),
+                        ty: DeclarationId(2484),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2484),
+                        ty: DeclarationId(2485),
                     },
                 ],
             },
@@ -65614,7 +65650,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2486),
+            id: DeclarationId(2487),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65633,7 +65669,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2487),
+            id: DeclarationId(2488),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65647,17 +65683,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2488),
+            id: DeclarationId(2489),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2486),
+                        ty: DeclarationId(2487),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2487),
+                        ty: DeclarationId(2488),
                     },
                 ],
             },
@@ -65672,7 +65708,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2489),
+            id: DeclarationId(2490),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65691,7 +65727,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2490),
+            id: DeclarationId(2491),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65705,17 +65741,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2491),
+            id: DeclarationId(2492),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2489),
+                        ty: DeclarationId(2490),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2490),
+                        ty: DeclarationId(2491),
                     },
                 ],
             },
@@ -65730,7 +65766,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2492),
+            id: DeclarationId(2493),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65749,7 +65785,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 3781, 3785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2493),
+            id: DeclarationId(2494),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65763,17 +65799,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 3781, 3785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2494),
+            id: DeclarationId(2495),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2492),
+                        ty: DeclarationId(2493),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2493),
+                        ty: DeclarationId(2494),
                     },
                 ],
             },
@@ -65788,7 +65824,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 3781, 3785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2495),
+            id: DeclarationId(2496),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65807,7 +65843,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 4264, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2496),
+            id: DeclarationId(2497),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65821,17 +65857,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 4264, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2497),
+            id: DeclarationId(2498),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2495),
+                        ty: DeclarationId(2496),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2496),
+                        ty: DeclarationId(2497),
                     },
                 ],
             },
@@ -65846,7 +65882,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 4264, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2498),
+            id: DeclarationId(2499),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65865,7 +65901,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 6172, 6179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2499),
+            id: DeclarationId(2500),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65879,17 +65915,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 6172, 6179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2500),
+            id: DeclarationId(2501),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2498),
+                        ty: DeclarationId(2499),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2499),
+                        ty: DeclarationId(2500),
                     },
                 ],
             },
@@ -65904,7 +65940,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 6172, 6179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2501),
+            id: DeclarationId(2502),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65923,7 +65959,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16964, 16984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2502),
+            id: DeclarationId(2503),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65937,17 +65973,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16964, 16984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2503),
+            id: DeclarationId(2504),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2501),
+                        ty: DeclarationId(2502),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2502),
+                        ty: DeclarationId(2503),
                     },
                 ],
             },
@@ -65962,7 +65998,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16964, 16984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2504),
+            id: DeclarationId(2505),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65981,7 +66017,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17620, 17627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2505),
+            id: DeclarationId(2506),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65995,17 +66031,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17620, 17627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2506),
+            id: DeclarationId(2507),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2504),
+                        ty: DeclarationId(2505),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2505),
+                        ty: DeclarationId(2506),
                     },
                 ],
             },
@@ -66020,7 +66056,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17620, 17627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2507),
+            id: DeclarationId(2508),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66039,7 +66075,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21380, 21390),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2508),
+            id: DeclarationId(2509),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66053,17 +66089,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21380, 21390),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2509),
+            id: DeclarationId(2510),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2507),
+                        ty: DeclarationId(2508),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2508),
+                        ty: DeclarationId(2509),
                     },
                 ],
             },
@@ -66078,7 +66114,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21380, 21390),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2510),
+            id: DeclarationId(2511),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66097,7 +66133,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21515, 21522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2511),
+            id: DeclarationId(2512),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66111,17 +66147,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21515, 21522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2512),
+            id: DeclarationId(2513),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2510),
+                        ty: DeclarationId(2511),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2511),
+                        ty: DeclarationId(2512),
                     },
                 ],
             },
@@ -66136,7 +66172,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21515, 21522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2513),
+            id: DeclarationId(2514),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66155,7 +66191,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21589, 21593),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2514),
+            id: DeclarationId(2515),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66169,17 +66205,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21589, 21593),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2515),
+            id: DeclarationId(2516),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2513),
+                        ty: DeclarationId(2514),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2514),
+                        ty: DeclarationId(2515),
                     },
                 ],
             },
@@ -66194,7 +66230,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21589, 21593),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2516),
+            id: DeclarationId(2517),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66213,7 +66249,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23360, 23367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2517),
+            id: DeclarationId(2518),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66227,17 +66263,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23360, 23367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2518),
+            id: DeclarationId(2519),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2516),
+                        ty: DeclarationId(2517),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2517),
+                        ty: DeclarationId(2518),
                     },
                 ],
             },
@@ -66252,7 +66288,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23360, 23367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2519),
+            id: DeclarationId(2520),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66271,7 +66307,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23872, 23879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2520),
+            id: DeclarationId(2521),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66285,17 +66321,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23872, 23879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2521),
+            id: DeclarationId(2522),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2519),
+                        ty: DeclarationId(2520),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2520),
+                        ty: DeclarationId(2521),
                     },
                 ],
             },
@@ -66310,7 +66346,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23872, 23879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2522),
+            id: DeclarationId(2523),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66329,7 +66365,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23966, 23973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2523),
+            id: DeclarationId(2524),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66343,17 +66379,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23966, 23973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2524),
+            id: DeclarationId(2525),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2522),
+                        ty: DeclarationId(2523),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2523),
+                        ty: DeclarationId(2524),
                     },
                 ],
             },
@@ -66368,7 +66404,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23966, 23973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2525),
+            id: DeclarationId(2526),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66387,7 +66423,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24196, 24211),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2526),
+            id: DeclarationId(2527),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66401,17 +66437,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24196, 24211),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2527),
+            id: DeclarationId(2528),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2525),
+                        ty: DeclarationId(2526),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2526),
+                        ty: DeclarationId(2527),
                     },
                 ],
             },
@@ -66426,7 +66462,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24196, 24211),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2528),
+            id: DeclarationId(2529),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66445,7 +66481,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24222, 24235),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2529),
+            id: DeclarationId(2530),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66459,17 +66495,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24222, 24235),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2530),
+            id: DeclarationId(2531),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2528),
+                        ty: DeclarationId(2529),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2529),
+                        ty: DeclarationId(2530),
                     },
                 ],
             },
@@ -66484,7 +66520,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24222, 24235),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2531),
+            id: DeclarationId(2532),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66503,7 +66539,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24251, 24264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2532),
+            id: DeclarationId(2533),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66517,17 +66553,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24251, 24264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2533),
+            id: DeclarationId(2534),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2531),
+                        ty: DeclarationId(2532),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2532),
+                        ty: DeclarationId(2533),
                     },
                 ],
             },
@@ -66542,7 +66578,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24251, 24264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2534),
+            id: DeclarationId(2535),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66561,7 +66597,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24374, 24381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2535),
+            id: DeclarationId(2536),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66575,17 +66611,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24374, 24381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2536),
+            id: DeclarationId(2537),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2534),
+                        ty: DeclarationId(2535),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2535),
+                        ty: DeclarationId(2536),
                     },
                 ],
             },
@@ -66600,7 +66636,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24374, 24381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2537),
+            id: DeclarationId(2538),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66619,7 +66655,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(2538),
+            id: DeclarationId(2539),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66633,17 +66669,17 @@ 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(2539),
+            id: DeclarationId(2540),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2537),
+                        ty: DeclarationId(2538),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2538),
+                        ty: DeclarationId(2539),
                     },
                 ],
             },
@@ -66658,12 +66694,12 @@ 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(2540),
+            id: DeclarationId(2541),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1437),
+                    ty: DeclarationId(1438),
                 }],
             },
             type_params: vec![],
@@ -66677,7 +66713,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(2541),
+            id: DeclarationId(2542),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66691,17 +66727,17 @@ 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(2542),
+            id: DeclarationId(2543),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2540),
+                        ty: DeclarationId(2541),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2541),
+                        ty: DeclarationId(2542),
                     },
                 ],
             },
@@ -66716,12 +66752,12 @@ 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(2543),
+            id: DeclarationId(2544),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1440),
+                    ty: DeclarationId(1441),
                 }],
             },
             type_params: vec![],
@@ -66735,7 +66771,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(2544),
+            id: DeclarationId(2545),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66749,17 +66785,17 @@ 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(2545),
+            id: DeclarationId(2546),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2543),
+                        ty: DeclarationId(2544),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2544),
+                        ty: DeclarationId(2545),
                     },
                 ],
             },
@@ -66774,7 +66810,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(2546),
+            id: DeclarationId(2547),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66793,7 +66829,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(2547),
+            id: DeclarationId(2548),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66807,17 +66843,17 @@ 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(2548),
+            id: DeclarationId(2549),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2546),
+                        ty: DeclarationId(2547),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2547),
+                        ty: DeclarationId(2548),
                     },
                 ],
             },
@@ -66832,7 +66868,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(2549),
+            id: DeclarationId(2550),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66851,7 +66887,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(2550),
+            id: DeclarationId(2551),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66865,17 +66901,17 @@ 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(2551),
+            id: DeclarationId(2552),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2549),
+                        ty: DeclarationId(2550),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2550),
+                        ty: DeclarationId(2551),
                     },
                 ],
             },
@@ -66890,7 +66926,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(2552),
+            id: DeclarationId(2553),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66909,7 +66945,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(2553),
+            id: DeclarationId(2554),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66923,17 +66959,17 @@ 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(2554),
+            id: DeclarationId(2555),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2552),
+                        ty: DeclarationId(2553),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2553),
+                        ty: DeclarationId(2554),
                     },
                 ],
             },
@@ -66948,7 +66984,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(2555),
+            id: DeclarationId(2556),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66967,7 +67003,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2556),
+            id: DeclarationId(2557),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66981,17 +67017,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2557),
+            id: DeclarationId(2558),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2555),
+                        ty: DeclarationId(2556),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2556),
+                        ty: DeclarationId(2557),
                     },
                 ],
             },
@@ -67006,7 +67042,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2558),
+            id: DeclarationId(2559),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67025,7 +67061,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2559),
+            id: DeclarationId(2560),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67039,17 +67075,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2560),
+            id: DeclarationId(2561),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2558),
+                        ty: DeclarationId(2559),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2559),
+                        ty: DeclarationId(2560),
                     },
                 ],
             },
@@ -67064,7 +67100,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2561),
+            id: DeclarationId(2562),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67083,7 +67119,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2562),
+            id: DeclarationId(2563),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67097,17 +67133,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2563),
+            id: DeclarationId(2564),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2561),
+                        ty: DeclarationId(2562),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2562),
+                        ty: DeclarationId(2563),
                     },
                 ],
             },
@@ -67122,7 +67158,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2564),
+            id: DeclarationId(2565),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67141,7 +67177,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2565),
+            id: DeclarationId(2566),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67155,17 +67191,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2566),
+            id: DeclarationId(2567),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2564),
+                        ty: DeclarationId(2565),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2565),
+                        ty: DeclarationId(2566),
                     },
                 ],
             },
@@ -67180,7 +67216,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2567),
+            id: DeclarationId(2568),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67199,7 +67235,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2568),
+            id: DeclarationId(2569),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67213,17 +67249,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2569),
+            id: DeclarationId(2570),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2567),
+                        ty: DeclarationId(2568),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2568),
+                        ty: DeclarationId(2569),
                     },
                 ],
             },
@@ -67238,7 +67274,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2570),
+            id: DeclarationId(2571),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67257,7 +67293,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2571),
+            id: DeclarationId(2572),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67271,17 +67307,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2572),
+            id: DeclarationId(2573),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2570),
+                        ty: DeclarationId(2571),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2571),
+                        ty: DeclarationId(2572),
                     },
                 ],
             },
@@ -67296,7 +67332,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2573),
+            id: DeclarationId(2574),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67315,7 +67351,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2574),
+            id: DeclarationId(2575),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67329,17 +67365,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2575),
+            id: DeclarationId(2576),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2573),
+                        ty: DeclarationId(2574),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2574),
+                        ty: DeclarationId(2575),
                     },
                 ],
             },
@@ -67354,7 +67390,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2576),
+            id: DeclarationId(2577),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67373,7 +67409,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2577),
+            id: DeclarationId(2578),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67387,17 +67423,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2578),
+            id: DeclarationId(2579),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2576),
+                        ty: DeclarationId(2577),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2577),
+                        ty: DeclarationId(2578),
                     },
                 ],
             },
@@ -67412,7 +67448,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2579),
+            id: DeclarationId(2580),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67431,7 +67467,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2580),
+            id: DeclarationId(2581),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67445,17 +67481,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2581),
+            id: DeclarationId(2582),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2579),
+                        ty: DeclarationId(2580),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2580),
+                        ty: DeclarationId(2581),
                     },
                 ],
             },
@@ -67470,7 +67506,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2582),
+            id: DeclarationId(2583),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67489,7 +67525,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2583),
+            id: DeclarationId(2584),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67503,17 +67539,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2584),
+            id: DeclarationId(2585),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2582),
+                        ty: DeclarationId(2583),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2583),
+                        ty: DeclarationId(2584),
                     },
                 ],
             },
@@ -67528,7 +67564,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2585),
+            id: DeclarationId(2586),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67547,7 +67583,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2586),
+            id: DeclarationId(2587),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67561,17 +67597,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2587),
+            id: DeclarationId(2588),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2585),
+                        ty: DeclarationId(2586),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2586),
+                        ty: DeclarationId(2587),
                     },
                 ],
             },
@@ -67586,7 +67622,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2588),
+            id: DeclarationId(2589),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67605,7 +67641,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2589),
+            id: DeclarationId(2590),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67619,17 +67655,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2590),
+            id: DeclarationId(2591),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2588),
+                        ty: DeclarationId(2589),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2589),
+                        ty: DeclarationId(2590),
                     },
                 ],
             },
@@ -67644,7 +67680,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2591),
+            id: DeclarationId(2592),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67663,7 +67699,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2592),
+            id: DeclarationId(2593),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67677,17 +67713,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2593),
+            id: DeclarationId(2594),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2591),
+                        ty: DeclarationId(2592),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2592),
+                        ty: DeclarationId(2593),
                     },
                 ],
             },
@@ -67702,7 +67738,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2594),
+            id: DeclarationId(2595),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67721,7 +67757,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2595),
+            id: DeclarationId(2596),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67735,17 +67771,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2596),
+            id: DeclarationId(2597),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2594),
+                        ty: DeclarationId(2595),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2595),
+                        ty: DeclarationId(2596),
                     },
                 ],
             },
@@ -67760,7 +67796,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2597),
+            id: DeclarationId(2598),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67779,7 +67815,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2598),
+            id: DeclarationId(2599),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67793,17 +67829,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2599),
+            id: DeclarationId(2600),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2597),
+                        ty: DeclarationId(2598),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2598),
+                        ty: DeclarationId(2599),
                     },
                 ],
             },
@@ -67818,7 +67854,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2600),
+            id: DeclarationId(2601),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67837,7 +67873,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2601),
+            id: DeclarationId(2602),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67851,17 +67887,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2602),
+            id: DeclarationId(2603),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2600),
+                        ty: DeclarationId(2601),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2601),
+                        ty: DeclarationId(2602),
                     },
                 ],
             },
@@ -67876,7 +67912,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2603),
+            id: DeclarationId(2604),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67895,7 +67931,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2604),
+            id: DeclarationId(2605),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67909,17 +67945,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2605),
+            id: DeclarationId(2606),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2603),
+                        ty: DeclarationId(2604),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2604),
+                        ty: DeclarationId(2605),
                     },
                 ],
             },
@@ -67934,7 +67970,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2606),
+            id: DeclarationId(2607),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67953,7 +67989,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2607),
+            id: DeclarationId(2608),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67967,17 +68003,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2608),
+            id: DeclarationId(2609),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2606),
+                        ty: DeclarationId(2607),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2607),
+                        ty: DeclarationId(2608),
                     },
                 ],
             },
@@ -67992,7 +68028,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2609),
+            id: DeclarationId(2610),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68011,7 +68047,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2610),
+            id: DeclarationId(2611),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68025,17 +68061,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2611),
+            id: DeclarationId(2612),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2609),
+                        ty: DeclarationId(2610),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2610),
+                        ty: DeclarationId(2611),
                     },
                 ],
             },
@@ -68050,7 +68086,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2612),
+            id: DeclarationId(2613),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68069,7 +68105,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2613),
+            id: DeclarationId(2614),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68083,17 +68119,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2614),
+            id: DeclarationId(2615),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2612),
+                        ty: DeclarationId(2613),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2613),
+                        ty: DeclarationId(2614),
                     },
                 ],
             },
@@ -68108,7 +68144,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2615),
+            id: DeclarationId(2616),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68127,7 +68163,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2616),
+            id: DeclarationId(2617),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68141,17 +68177,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2617),
+            id: DeclarationId(2618),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2615),
+                        ty: DeclarationId(2616),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2616),
+                        ty: DeclarationId(2617),
                     },
                 ],
             },
@@ -68166,7 +68202,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2618),
+            id: DeclarationId(2619),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68185,7 +68221,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(2619),
+            id: DeclarationId(2620),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68199,17 +68235,17 @@ 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(2620),
+            id: DeclarationId(2621),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2618),
+                        ty: DeclarationId(2619),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2619),
+                        ty: DeclarationId(2620),
                     },
                 ],
             },
@@ -68224,7 +68260,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(2621),
+            id: DeclarationId(2622),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68243,7 +68279,7 @@ 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(2622),
+            id: DeclarationId(2623),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68257,17 +68293,17 @@ 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(2623),
+            id: DeclarationId(2624),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2621),
+                        ty: DeclarationId(2622),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2622),
+                        ty: DeclarationId(2623),
                     },
                 ],
             },
@@ -68282,7 +68318,7 @@ 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(2624),
+            id: DeclarationId(2625),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68301,7 +68337,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2625),
+            id: DeclarationId(2626),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68315,17 +68351,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2626),
+            id: DeclarationId(2627),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2624),
+                        ty: DeclarationId(2625),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2625),
+                        ty: DeclarationId(2626),
                     },
                 ],
             },
@@ -68340,7 +68376,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2627),
+            id: DeclarationId(2628),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68359,7 +68395,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2628),
+            id: DeclarationId(2629),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68373,17 +68409,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2629),
+            id: DeclarationId(2630),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2627),
+                        ty: DeclarationId(2628),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2628),
+                        ty: DeclarationId(2629),
                     },
                 ],
             },
@@ -68398,7 +68434,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2630),
+            id: DeclarationId(2631),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68417,7 +68453,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2631),
+            id: DeclarationId(2632),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68431,17 +68467,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2632),
+            id: DeclarationId(2633),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2630),
+                        ty: DeclarationId(2631),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2631),
+                        ty: DeclarationId(2632),
                     },
                 ],
             },
@@ -68456,7 +68492,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2633),
+            id: DeclarationId(2634),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68475,7 +68511,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2634),
+            id: DeclarationId(2635),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68489,17 +68525,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2635),
+            id: DeclarationId(2636),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2633),
+                        ty: DeclarationId(2634),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2634),
+                        ty: DeclarationId(2635),
                     },
                 ],
             },
@@ -68514,7 +68550,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2636),
+            id: DeclarationId(2637),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68533,7 +68569,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2637),
+            id: DeclarationId(2638),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68547,17 +68583,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2638),
+            id: DeclarationId(2639),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2636),
+                        ty: DeclarationId(2637),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2637),
+                        ty: DeclarationId(2638),
                     },
                 ],
             },
@@ -68572,7 +68608,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2639),
+            id: DeclarationId(2640),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68591,7 +68627,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2640),
+            id: DeclarationId(2641),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68605,17 +68641,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2641),
+            id: DeclarationId(2642),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2639),
+                        ty: DeclarationId(2640),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2640),
+                        ty: DeclarationId(2641),
                     },
                 ],
             },
@@ -68630,7 +68666,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2642),
+            id: DeclarationId(2643),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68649,7 +68685,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2643),
+            id: DeclarationId(2644),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68663,17 +68699,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2644),
+            id: DeclarationId(2645),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2642),
+                        ty: DeclarationId(2643),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2643),
+                        ty: DeclarationId(2644),
                     },
                 ],
             },
@@ -68688,7 +68724,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2645),
+            id: DeclarationId(2646),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68707,7 +68743,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2646),
+            id: DeclarationId(2647),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68721,17 +68757,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2647),
+            id: DeclarationId(2648),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2645),
+                        ty: DeclarationId(2646),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2646),
+                        ty: DeclarationId(2647),
                     },
                 ],
             },
@@ -68746,7 +68782,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2648),
+            id: DeclarationId(2649),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68765,7 +68801,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2649),
+            id: DeclarationId(2650),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68779,17 +68815,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2650),
+            id: DeclarationId(2651),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2648),
+                        ty: DeclarationId(2649),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2649),
+                        ty: DeclarationId(2650),
                     },
                 ],
             },
@@ -68804,7 +68840,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2651),
+            id: DeclarationId(2652),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68823,7 +68859,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2652),
+            id: DeclarationId(2653),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68837,17 +68873,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2653),
+            id: DeclarationId(2654),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2651),
+                        ty: DeclarationId(2652),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2652),
+                        ty: DeclarationId(2653),
                     },
                 ],
             },
@@ -68862,7 +68898,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2654),
+            id: DeclarationId(2655),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68881,7 +68917,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2655),
+            id: DeclarationId(2656),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68895,17 +68931,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2656),
+            id: DeclarationId(2657),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2654),
+                        ty: DeclarationId(2655),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2655),
+                        ty: DeclarationId(2656),
                     },
                 ],
             },
@@ -68920,7 +68956,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2657),
+            id: DeclarationId(2658),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68939,7 +68975,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2658),
+            id: DeclarationId(2659),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68953,17 +68989,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2659),
+            id: DeclarationId(2660),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2657),
+                        ty: DeclarationId(2658),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2658),
+                        ty: DeclarationId(2659),
                     },
                 ],
             },
@@ -68978,12 +69014,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2660),
+            id: DeclarationId(2661),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1755),
+                    ty: DeclarationId(1756),
                 }],
             },
             type_params: vec![],
@@ -68997,7 +69033,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2661),
+            id: DeclarationId(2662),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69011,17 +69047,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2662),
+            id: DeclarationId(2663),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2660),
+                        ty: DeclarationId(2661),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2661),
+                        ty: DeclarationId(2662),
                     },
                 ],
             },
@@ -69036,7 +69072,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2663),
+            id: DeclarationId(2664),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69055,7 +69091,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2664),
+            id: DeclarationId(2665),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69069,17 +69105,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2665),
+            id: DeclarationId(2666),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2663),
+                        ty: DeclarationId(2664),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2664),
+                        ty: DeclarationId(2665),
                     },
                 ],
             },
@@ -69094,7 +69130,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2666),
+            id: DeclarationId(2667),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69113,7 +69149,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2667),
+            id: DeclarationId(2668),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69127,17 +69163,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2668),
+            id: DeclarationId(2669),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2666),
+                        ty: DeclarationId(2667),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2667),
+                        ty: DeclarationId(2668),
                     },
                 ],
             },
@@ -69152,7 +69188,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2669),
+            id: DeclarationId(2670),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69171,7 +69207,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2670),
+            id: DeclarationId(2671),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69185,17 +69221,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2671),
+            id: DeclarationId(2672),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2669),
+                        ty: DeclarationId(2670),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2670),
+                        ty: DeclarationId(2671),
                     },
                 ],
             },
@@ -69210,7 +69246,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2672),
+            id: DeclarationId(2673),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69229,7 +69265,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2673),
+            id: DeclarationId(2674),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69243,17 +69279,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2674),
+            id: DeclarationId(2675),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2672),
+                        ty: DeclarationId(2673),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2673),
+                        ty: DeclarationId(2674),
                     },
                 ],
             },
@@ -69268,7 +69304,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2675),
+            id: DeclarationId(2676),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69287,7 +69323,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2676),
+            id: DeclarationId(2677),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69301,17 +69337,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2677),
+            id: DeclarationId(2678),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2675),
+                        ty: DeclarationId(2676),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2676),
+                        ty: DeclarationId(2677),
                     },
                 ],
             },
@@ -69326,7 +69362,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2678),
+            id: DeclarationId(2679),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69345,7 +69381,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2679),
+            id: DeclarationId(2680),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69359,17 +69395,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2680),
+            id: DeclarationId(2681),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2678),
+                        ty: DeclarationId(2679),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2679),
+                        ty: DeclarationId(2680),
                     },
                 ],
             },
@@ -69384,7 +69420,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2681),
+            id: DeclarationId(2682),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69403,7 +69439,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2682),
+            id: DeclarationId(2683),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69417,17 +69453,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2683),
+            id: DeclarationId(2684),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2681),
+                        ty: DeclarationId(2682),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2682),
+                        ty: DeclarationId(2683),
                     },
                 ],
             },
@@ -69442,7 +69478,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2684),
+            id: DeclarationId(2685),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69461,7 +69497,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2685),
+            id: DeclarationId(2686),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69475,17 +69511,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2686),
+            id: DeclarationId(2687),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2684),
+                        ty: DeclarationId(2685),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2685),
+                        ty: DeclarationId(2686),
                     },
                 ],
             },
@@ -69500,7 +69536,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2687),
+            id: DeclarationId(2688),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69519,7 +69555,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2688),
+            id: DeclarationId(2689),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69533,17 +69569,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2689),
+            id: DeclarationId(2690),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2687),
+                        ty: DeclarationId(2688),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2688),
+                        ty: DeclarationId(2689),
                     },
                 ],
             },
@@ -69558,7 +69594,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2690),
+            id: DeclarationId(2691),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69577,7 +69613,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2691),
+            id: DeclarationId(2692),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69591,17 +69627,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2692),
+            id: DeclarationId(2693),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2690),
+                        ty: DeclarationId(2691),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2691),
+                        ty: DeclarationId(2692),
                     },
                 ],
             },
@@ -69616,7 +69652,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2693),
+            id: DeclarationId(2694),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69635,7 +69671,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2694),
+            id: DeclarationId(2695),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69649,17 +69685,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2695),
+            id: DeclarationId(2696),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2693),
+                        ty: DeclarationId(2694),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2694),
+                        ty: DeclarationId(2695),
                     },
                 ],
             },
@@ -69674,7 +69710,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2696),
+            id: DeclarationId(2697),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69693,7 +69729,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2697),
+            id: DeclarationId(2698),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69707,17 +69743,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2698),
+            id: DeclarationId(2699),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2696),
+                        ty: DeclarationId(2697),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2697),
+                        ty: DeclarationId(2698),
                     },
                 ],
             },
@@ -69732,7 +69768,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2699),
+            id: DeclarationId(2700),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69751,7 +69787,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2700),
+            id: DeclarationId(2701),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69765,17 +69801,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2701),
+            id: DeclarationId(2702),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2699),
+                        ty: DeclarationId(2700),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2700),
+                        ty: DeclarationId(2701),
                     },
                 ],
             },
@@ -69790,7 +69826,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2702),
+            id: DeclarationId(2703),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69809,7 +69845,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2703),
+            id: DeclarationId(2704),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69823,17 +69859,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2704),
+            id: DeclarationId(2705),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2702),
+                        ty: DeclarationId(2703),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2703),
+                        ty: DeclarationId(2704),
                     },
                 ],
             },
@@ -69848,7 +69884,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2705),
+            id: DeclarationId(2706),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69867,7 +69903,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2706),
+            id: DeclarationId(2707),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69881,17 +69917,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2707),
+            id: DeclarationId(2708),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2705),
+                        ty: DeclarationId(2706),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2706),
+                        ty: DeclarationId(2707),
                     },
                 ],
             },
@@ -69906,7 +69942,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2708),
+            id: DeclarationId(2709),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69925,7 +69961,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2709),
+            id: DeclarationId(2710),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69939,17 +69975,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2710),
+            id: DeclarationId(2711),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2708),
+                        ty: DeclarationId(2709),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2709),
+                        ty: DeclarationId(2710),
                     },
                 ],
             },
@@ -69964,7 +70000,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2711),
+            id: DeclarationId(2712),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69983,7 +70019,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2712),
+            id: DeclarationId(2713),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69997,17 +70033,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2713),
+            id: DeclarationId(2714),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2711),
+                        ty: DeclarationId(2712),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2712),
+                        ty: DeclarationId(2713),
                     },
                 ],
             },
@@ -70022,7 +70058,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2714),
+            id: DeclarationId(2715),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70041,7 +70077,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2715),
+            id: DeclarationId(2716),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70055,17 +70091,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2716),
+            id: DeclarationId(2717),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2714),
+                        ty: DeclarationId(2715),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2715),
+                        ty: DeclarationId(2716),
                     },
                 ],
             },
@@ -70080,7 +70116,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2717),
+            id: DeclarationId(2718),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70099,7 +70135,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2718),
+            id: DeclarationId(2719),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70113,17 +70149,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2719),
+            id: DeclarationId(2720),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2717),
+                        ty: DeclarationId(2718),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2718),
+                        ty: DeclarationId(2719),
                     },
                 ],
             },
@@ -70138,7 +70174,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2720),
+            id: DeclarationId(2721),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70157,7 +70193,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2721),
+            id: DeclarationId(2722),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70171,17 +70207,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2722),
+            id: DeclarationId(2723),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2720),
+                        ty: DeclarationId(2721),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2721),
+                        ty: DeclarationId(2722),
                     },
                 ],
             },
@@ -70196,7 +70232,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2723),
+            id: DeclarationId(2724),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70215,7 +70251,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2724),
+            id: DeclarationId(2725),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70229,17 +70265,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2725),
+            id: DeclarationId(2726),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2723),
+                        ty: DeclarationId(2724),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2724),
+                        ty: DeclarationId(2725),
                     },
                 ],
             },
@@ -70254,7 +70290,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2726),
+            id: DeclarationId(2727),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70273,7 +70309,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2727),
+            id: DeclarationId(2728),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70287,17 +70323,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2728),
+            id: DeclarationId(2729),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2726),
+                        ty: DeclarationId(2727),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2727),
+                        ty: DeclarationId(2728),
                     },
                 ],
             },
@@ -70312,7 +70348,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2729),
+            id: DeclarationId(2730),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70331,7 +70367,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2730),
+            id: DeclarationId(2731),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70345,17 +70381,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2731),
+            id: DeclarationId(2732),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2729),
+                        ty: DeclarationId(2730),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2730),
+                        ty: DeclarationId(2731),
                     },
                 ],
             },
@@ -70370,7 +70406,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2732),
+            id: DeclarationId(2733),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70389,7 +70425,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2733),
+            id: DeclarationId(2734),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70403,17 +70439,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2734),
+            id: DeclarationId(2735),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2732),
+                        ty: DeclarationId(2733),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2733),
+                        ty: DeclarationId(2734),
                     },
                 ],
             },
@@ -70428,7 +70464,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2735),
+            id: DeclarationId(2736),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70447,7 +70483,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2736),
+            id: DeclarationId(2737),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70461,17 +70497,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2737),
+            id: DeclarationId(2738),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2735),
+                        ty: DeclarationId(2736),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2736),
+                        ty: DeclarationId(2737),
                     },
                 ],
             },
@@ -70486,7 +70522,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2738),
+            id: DeclarationId(2739),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70505,7 +70541,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2739),
+            id: DeclarationId(2740),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70519,17 +70555,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2740),
+            id: DeclarationId(2741),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2738),
+                        ty: DeclarationId(2739),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2739),
+                        ty: DeclarationId(2740),
                     },
                 ],
             },
@@ -70544,7 +70580,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2741),
+            id: DeclarationId(2742),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70563,7 +70599,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2742),
+            id: DeclarationId(2743),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70577,17 +70613,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2743),
+            id: DeclarationId(2744),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2741),
+                        ty: DeclarationId(2742),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2742),
+                        ty: DeclarationId(2743),
                     },
                 ],
             },
@@ -70602,7 +70638,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2744),
+            id: DeclarationId(2745),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70621,7 +70657,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2745),
+            id: DeclarationId(2746),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70635,17 +70671,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2746),
+            id: DeclarationId(2747),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2744),
+                        ty: DeclarationId(2745),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2745),
+                        ty: DeclarationId(2746),
                     },
                 ],
             },
@@ -70660,7 +70696,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2747),
+            id: DeclarationId(2748),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70679,7 +70715,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(2748),
+            id: DeclarationId(2749),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70693,17 +70729,17 @@ 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(2749),
+            id: DeclarationId(2750),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2747),
+                        ty: DeclarationId(2748),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2748),
+                        ty: DeclarationId(2749),
                     },
                 ],
             },
@@ -70718,7 +70754,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(2750),
+            id: DeclarationId(2751),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70737,7 +70773,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2751),
+            id: DeclarationId(2752),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70751,17 +70787,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2752),
+            id: DeclarationId(2753),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2750),
+                        ty: DeclarationId(2751),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2751),
+                        ty: DeclarationId(2752),
                     },
                 ],
             },
@@ -70776,7 +70812,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2753),
+            id: DeclarationId(2754),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70795,7 +70831,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2754),
+            id: DeclarationId(2755),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70809,17 +70845,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2755),
+            id: DeclarationId(2756),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2753),
+                        ty: DeclarationId(2754),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2754),
+                        ty: DeclarationId(2755),
                     },
                 ],
             },
@@ -70834,12 +70870,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2756),
+            id: DeclarationId(2757),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1367),
+                    ty: DeclarationId(1368),
                 }],
             },
             type_params: vec![],
@@ -70853,7 +70889,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2757),
+            id: DeclarationId(2758),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70867,17 +70903,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2758),
+            id: DeclarationId(2759),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2756),
+                        ty: DeclarationId(2757),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2757),
+                        ty: DeclarationId(2758),
                     },
                 ],
             },
@@ -70892,12 +70928,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2759),
+            id: DeclarationId(2760),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2348),
+                    ty: DeclarationId(2349),
                 }],
             },
             type_params: vec![],
@@ -70911,7 +70947,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2760),
+            id: DeclarationId(2761),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70925,17 +70961,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2761),
+            id: DeclarationId(2762),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2759),
+                        ty: DeclarationId(2760),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2760),
+                        ty: DeclarationId(2761),
                     },
                 ],
             },
@@ -70950,12 +70986,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2762),
+            id: DeclarationId(2763),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1356),
+                    ty: DeclarationId(1357),
                 }],
             },
             type_params: vec![],
@@ -70969,7 +71005,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2763),
+            id: DeclarationId(2764),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70983,17 +71019,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2764),
+            id: DeclarationId(2765),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2762),
+                        ty: DeclarationId(2763),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2763),
+                        ty: DeclarationId(2764),
                     },
                 ],
             },
@@ -71008,7 +71044,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2765),
+            id: DeclarationId(2766),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71027,7 +71063,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2766),
+            id: DeclarationId(2767),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71041,17 +71077,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2767),
+            id: DeclarationId(2768),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2765),
+                        ty: DeclarationId(2766),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2766),
+                        ty: DeclarationId(2767),
                     },
                 ],
             },
@@ -71066,7 +71102,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2768),
+            id: DeclarationId(2769),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71085,7 +71121,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2769),
+            id: DeclarationId(2770),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71099,17 +71135,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2770),
+            id: DeclarationId(2771),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2768),
+                        ty: DeclarationId(2769),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2769),
+                        ty: DeclarationId(2770),
                     },
                 ],
             },
@@ -71124,7 +71160,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2771),
+            id: DeclarationId(2772),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71143,7 +71179,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2772),
+            id: DeclarationId(2773),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71157,17 +71193,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2773),
+            id: DeclarationId(2774),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2771),
+                        ty: DeclarationId(2772),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2772),
+                        ty: DeclarationId(2773),
                     },
                 ],
             },
@@ -71182,12 +71218,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2774),
+            id: DeclarationId(2775),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2382),
+                    ty: DeclarationId(2383),
                 }],
             },
             type_params: vec![],
@@ -71201,7 +71237,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2775),
+            id: DeclarationId(2776),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71215,17 +71251,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2776),
+            id: DeclarationId(2777),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2774),
+                        ty: DeclarationId(2775),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2775),
+                        ty: DeclarationId(2776),
                     },
                 ],
             },
@@ -71240,12 +71276,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2777),
+            id: DeclarationId(2778),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2384),
+                    ty: DeclarationId(2385),
                 }],
             },
             type_params: vec![],
@@ -71259,7 +71295,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2778),
+            id: DeclarationId(2779),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71273,17 +71309,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2779),
+            id: DeclarationId(2780),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2777),
+                        ty: DeclarationId(2778),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2778),
+                        ty: DeclarationId(2779),
                     },
                 ],
             },
@@ -71298,7 +71334,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2780),
+            id: DeclarationId(2781),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71317,7 +71353,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2781),
+            id: DeclarationId(2782),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71331,17 +71367,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2782),
+            id: DeclarationId(2783),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2780),
+                        ty: DeclarationId(2781),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2781),
+                        ty: DeclarationId(2782),
                     },
                 ],
             },
@@ -71356,12 +71392,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2783),
+            id: DeclarationId(2784),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1386),
+                    ty: DeclarationId(1387),
                 }],
             },
             type_params: vec![],
@@ -71375,7 +71411,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2784),
+            id: DeclarationId(2785),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71389,17 +71425,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2785),
+            id: DeclarationId(2786),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2783),
+                        ty: DeclarationId(2784),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2784),
+                        ty: DeclarationId(2785),
                     },
                 ],
             },
@@ -71414,7 +71450,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2786),
+            id: DeclarationId(2787),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71433,7 +71469,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2787),
+            id: DeclarationId(2788),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71447,17 +71483,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2788),
+            id: DeclarationId(2789),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2786),
+                        ty: DeclarationId(2787),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2787),
+                        ty: DeclarationId(2788),
                     },
                 ],
             },
@@ -71472,12 +71508,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2789),
+            id: DeclarationId(2790),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1367),
+                    ty: DeclarationId(1368),
                 }],
             },
             type_params: vec![],
@@ -71491,7 +71527,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2790),
+            id: DeclarationId(2791),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71505,17 +71541,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2791),
+            id: DeclarationId(2792),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2789),
+                        ty: DeclarationId(2790),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2790),
+                        ty: DeclarationId(2791),
                     },
                 ],
             },
@@ -71530,12 +71566,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2792),
+            id: DeclarationId(2793),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1366),
+                    ty: DeclarationId(1367),
                 }],
             },
             type_params: vec![],
@@ -71549,7 +71585,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2793),
+            id: DeclarationId(2794),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71563,17 +71599,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2794),
+            id: DeclarationId(2795),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2792),
+                        ty: DeclarationId(2793),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2793),
+                        ty: DeclarationId(2794),
                     },
                 ],
             },
@@ -71588,12 +71624,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2795),
+            id: DeclarationId(2796),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1365),
+                    ty: DeclarationId(1366),
                 }],
             },
             type_params: vec![],
@@ -71607,7 +71643,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2796),
+            id: DeclarationId(2797),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71621,17 +71657,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2797),
+            id: DeclarationId(2798),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2795),
+                        ty: DeclarationId(2796),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2796),
+                        ty: DeclarationId(2797),
                     },
                 ],
             },
@@ -71646,7 +71682,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2798),
+            id: DeclarationId(2799),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71665,7 +71701,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2799),
+            id: DeclarationId(2800),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71679,17 +71715,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2800),
+            id: DeclarationId(2801),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2798),
+                        ty: DeclarationId(2799),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2799),
+                        ty: DeclarationId(2800),
                     },
                 ],
             },
@@ -71704,7 +71740,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2801),
+            id: DeclarationId(2802),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71723,7 +71759,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2802),
+            id: DeclarationId(2803),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71737,17 +71773,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2803),
+            id: DeclarationId(2804),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2801),
+                        ty: DeclarationId(2802),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2802),
+                        ty: DeclarationId(2803),
                     },
                 ],
             },
@@ -71762,7 +71798,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2804),
+            id: DeclarationId(2805),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71781,7 +71817,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2805),
+            id: DeclarationId(2806),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71795,17 +71831,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2806),
+            id: DeclarationId(2807),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2804),
+                        ty: DeclarationId(2805),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2805),
+                        ty: DeclarationId(2806),
                     },
                 ],
             },
@@ -71820,12 +71856,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2807),
+            id: DeclarationId(2808),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2412),
+                    ty: DeclarationId(2413),
                 }],
             },
             type_params: vec![],
@@ -71839,7 +71875,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2808),
+            id: DeclarationId(2809),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71853,17 +71889,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2809),
+            id: DeclarationId(2810),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2807),
+                        ty: DeclarationId(2808),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2808),
+                        ty: DeclarationId(2809),
                     },
                 ],
             },
@@ -71878,7 +71914,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2810),
+            id: DeclarationId(2811),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71897,7 +71933,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2811),
+            id: DeclarationId(2812),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71911,17 +71947,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2812),
+            id: DeclarationId(2813),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2810),
+                        ty: DeclarationId(2811),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2811),
+                        ty: DeclarationId(2812),
                     },
                 ],
             },
@@ -71936,7 +71972,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2813),
+            id: DeclarationId(2814),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71955,7 +71991,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2814),
+            id: DeclarationId(2815),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71969,17 +72005,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2815),
+            id: DeclarationId(2816),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2813),
+                        ty: DeclarationId(2814),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2814),
+                        ty: DeclarationId(2815),
                     },
                 ],
             },
@@ -71994,7 +72030,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2816),
+            id: DeclarationId(2817),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72013,7 +72049,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2817),
+            id: DeclarationId(2818),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72027,17 +72063,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2818),
+            id: DeclarationId(2819),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2816),
+                        ty: DeclarationId(2817),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2817),
+                        ty: DeclarationId(2818),
                     },
                 ],
             },
@@ -72052,7 +72088,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2819),
+            id: DeclarationId(2820),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72071,7 +72107,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2820),
+            id: DeclarationId(2821),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72085,17 +72121,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2821),
+            id: DeclarationId(2822),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2819),
+                        ty: DeclarationId(2820),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2820),
+                        ty: DeclarationId(2821),
                     },
                 ],
             },
@@ -72110,7 +72146,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2822),
+            id: DeclarationId(2823),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72129,7 +72165,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2823),
+            id: DeclarationId(2824),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72143,17 +72179,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2824),
+            id: DeclarationId(2825),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2822),
+                        ty: DeclarationId(2823),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2823),
+                        ty: DeclarationId(2824),
                     },
                 ],
             },
@@ -72168,12 +72204,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2825),
+            id: DeclarationId(2826),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2421),
+                    ty: DeclarationId(2422),
                 }],
             },
             type_params: vec![],
@@ -72187,7 +72223,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10886, 10906),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2826),
+            id: DeclarationId(2827),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72201,17 +72237,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10886, 10906),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2827),
+            id: DeclarationId(2828),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2825),
+                        ty: DeclarationId(2826),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2826),
+                        ty: DeclarationId(2827),
                     },
                 ],
             },
@@ -72226,7 +72262,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10886, 10906),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2828),
+            id: DeclarationId(2829),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72245,7 +72281,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10928, 10935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2829),
+            id: DeclarationId(2830),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72259,17 +72295,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10928, 10935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2830),
+            id: DeclarationId(2831),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2828),
+                        ty: DeclarationId(2829),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2829),
+                        ty: DeclarationId(2830),
                     },
                 ],
             },
@@ -72284,7 +72320,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10928, 10935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2831),
+            id: DeclarationId(2832),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72303,7 +72339,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10991, 10995),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2832),
+            id: DeclarationId(2833),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72317,17 +72353,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10991, 10995),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2833),
+            id: DeclarationId(2834),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2831),
+                        ty: DeclarationId(2832),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2832),
+                        ty: DeclarationId(2833),
                     },
                 ],
             },
@@ -72342,7 +72378,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10991, 10995),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2834),
+            id: DeclarationId(2835),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72361,7 +72397,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11414, 11421),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2835),
+            id: DeclarationId(2836),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72375,17 +72411,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11414, 11421),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2836),
+            id: DeclarationId(2837),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2834),
+                        ty: DeclarationId(2835),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2835),
+                        ty: DeclarationId(2836),
                     },
                 ],
             },
@@ -72400,7 +72436,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11414, 11421),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2837),
+            id: DeclarationId(2838),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72419,7 +72455,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11429, 11433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2838),
+            id: DeclarationId(2839),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72433,17 +72469,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11429, 11433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2839),
+            id: DeclarationId(2840),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2837),
+                        ty: DeclarationId(2838),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2838),
+                        ty: DeclarationId(2839),
                     },
                 ],
             },
@@ -72458,7 +72494,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11429, 11433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2840),
+            id: DeclarationId(2841),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72477,7 +72513,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11440, 11444),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2841),
+            id: DeclarationId(2842),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72491,17 +72527,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11440, 11444),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2842),
+            id: DeclarationId(2843),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2840),
+                        ty: DeclarationId(2841),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2841),
+                        ty: DeclarationId(2842),
                     },
                 ],
             },
@@ -72516,7 +72552,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11440, 11444),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2843),
+            id: DeclarationId(2844),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72535,7 +72571,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11494, 11501),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2844),
+            id: DeclarationId(2845),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72549,17 +72585,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11494, 11501),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2845),
+            id: DeclarationId(2846),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2843),
+                        ty: DeclarationId(2844),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2844),
+                        ty: DeclarationId(2845),
                     },
                 ],
             },
@@ -72574,7 +72610,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11494, 11501),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2846),
+            id: DeclarationId(2847),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72593,7 +72629,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11509, 11513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2847),
+            id: DeclarationId(2848),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72607,17 +72643,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11509, 11513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2848),
+            id: DeclarationId(2849),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2846),
+                        ty: DeclarationId(2847),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2847),
+                        ty: DeclarationId(2848),
                     },
                 ],
             },
@@ -72632,7 +72668,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11509, 11513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2849),
+            id: DeclarationId(2850),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72651,7 +72687,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11520, 11524),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2850),
+            id: DeclarationId(2851),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72665,17 +72701,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11520, 11524),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2851),
+            id: DeclarationId(2852),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2849),
+                        ty: DeclarationId(2850),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2850),
+                        ty: DeclarationId(2851),
                     },
                 ],
             },
@@ -72690,7 +72726,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11520, 11524),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2852),
+            id: DeclarationId(2853),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72709,7 +72745,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11573, 11580),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2853),
+            id: DeclarationId(2854),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72723,17 +72759,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11573, 11580),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2854),
+            id: DeclarationId(2855),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2852),
+                        ty: DeclarationId(2853),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2853),
+                        ty: DeclarationId(2854),
                     },
                 ],
             },
@@ -72748,7 +72784,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11573, 11580),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2855),
+            id: DeclarationId(2856),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72767,7 +72803,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11588, 11592),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2856),
+            id: DeclarationId(2857),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72781,17 +72817,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11588, 11592),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2857),
+            id: DeclarationId(2858),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2855),
+                        ty: DeclarationId(2856),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2856),
+                        ty: DeclarationId(2857),
                     },
                 ],
             },
@@ -72806,7 +72842,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11588, 11592),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2858),
+            id: DeclarationId(2859),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72825,7 +72861,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2859),
+            id: DeclarationId(2860),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72839,17 +72875,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2860),
+            id: DeclarationId(2861),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2858),
+                        ty: DeclarationId(2859),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2859),
+                        ty: DeclarationId(2860),
                     },
                 ],
             },
@@ -72864,7 +72900,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2861),
+            id: DeclarationId(2862),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72883,7 +72919,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12583, 12587),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2862),
+            id: DeclarationId(2863),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72897,17 +72933,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12583, 12587),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2863),
+            id: DeclarationId(2864),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2861),
+                        ty: DeclarationId(2862),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2862),
+                        ty: DeclarationId(2863),
                     },
                 ],
             },
@@ -72922,7 +72958,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12583, 12587),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2864),
+            id: DeclarationId(2865),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72941,7 +72977,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12666, 12673),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2865),
+            id: DeclarationId(2866),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72955,17 +72991,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12666, 12673),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2866),
+            id: DeclarationId(2867),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2864),
+                        ty: DeclarationId(2865),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2865),
+                        ty: DeclarationId(2866),
                     },
                 ],
             },
@@ -72980,7 +73016,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12666, 12673),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2867),
+            id: DeclarationId(2868),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72999,7 +73035,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13313, 13317),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2868),
+            id: DeclarationId(2869),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73013,17 +73049,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13313, 13317),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2869),
+            id: DeclarationId(2870),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2867),
+                        ty: DeclarationId(2868),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2868),
+                        ty: DeclarationId(2869),
                     },
                 ],
             },
@@ -74560,7 +74596,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(189),
             Port {
                 id: PortId(189),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1623))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1624))),
                 produced_by: Some(NodeId(184)),
             },
         );
@@ -74584,7 +74620,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(192),
             Port {
                 id: PortId(192),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1624))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1625))),
                 produced_by: None,
             },
         );
@@ -74592,7 +74628,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(193),
             Port {
                 id: PortId(193),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1625))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1626))),
                 produced_by: Some(NodeId(186)),
             },
         );
@@ -74880,7 +74916,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(229),
             Port {
                 id: PortId(229),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1626))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1627))),
                 produced_by: None,
             },
         );
@@ -76432,7 +76468,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(423),
             Port {
                 id: PortId(423),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1627))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1628))),
                 produced_by: None,
             },
         );
@@ -76456,7 +76492,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(426),
             Port {
                 id: PortId(426),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1624))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1625))),
                 produced_by: Some(NodeId(363)),
             },
         );
@@ -76472,7 +76508,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(428),
             Port {
                 id: PortId(428),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1628))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1629))),
                 produced_by: Some(NodeId(365)),
             },
         );
@@ -76480,7 +76516,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(429),
             Port {
                 id: PortId(429),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1629))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1630))),
                 produced_by: None,
             },
         );
@@ -76584,7 +76620,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(442),
             Port {
                 id: PortId(442),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1630))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1631))),
                 produced_by: Some(NodeId(378)),
             },
         );
@@ -76592,7 +76628,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(443),
             Port {
                 id: PortId(443),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1631))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1632))),
                 produced_by: None,
             },
         );
@@ -76640,7 +76676,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(449),
             Port {
                 id: PortId(449),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1632))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1633))),
                 produced_by: Some(NodeId(385)),
             },
         );
@@ -76648,7 +76684,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(450),
             Port {
                 id: PortId(450),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1633))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1634))),
                 produced_by: None,
             },
         );
@@ -76728,7 +76764,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(460),
             Port {
                 id: PortId(460),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1634))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1635))),
                 produced_by: None,
             },
         );
@@ -76832,7 +76868,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(473),
             Port {
                 id: PortId(473),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1635))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1636))),
                 produced_by: Some(NodeId(407)),
             },
         );
@@ -77112,7 +77148,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(508),
             Port {
                 id: PortId(508),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1636))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1637))),
                 produced_by: None,
             },
         );
@@ -77224,7 +77260,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(522),
             Port {
                 id: PortId(522),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1637))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1638))),
                 produced_by: None,
             },
         );
@@ -77336,7 +77372,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(536),
             Port {
                 id: PortId(536),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1638))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1639))),
                 produced_by: None,
             },
         );
@@ -77952,7 +77988,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(613),
             Port {
                 id: PortId(613),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1639))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1640))),
                 produced_by: None,
             },
         );
@@ -78064,7 +78100,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(627),
             Port {
                 id: PortId(627),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1640))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1641))),
                 produced_by: Some(NodeId(516)),
             },
         );
@@ -78072,7 +78108,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(628),
             Port {
                 id: PortId(628),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1641))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1642))),
                 produced_by: None,
             },
         );
@@ -78128,7 +78164,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(635),
             Port {
                 id: PortId(635),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1642))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1643))),
                 produced_by: Some(NodeId(523)),
             },
         );
@@ -78136,7 +78172,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(636),
             Port {
                 id: PortId(636),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1643))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1644))),
                 produced_by: None,
             },
         );
@@ -78152,7 +78188,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(638),
             Port {
                 id: PortId(638),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1644))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1645))),
                 produced_by: Some(NodeId(526)),
             },
         );
@@ -78416,7 +78452,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(671),
             Port {
                 id: PortId(671),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1977))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1978))),
                 produced_by: None,
             },
         );
@@ -78848,7 +78884,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(725),
             Port {
                 id: PortId(725),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2049))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2050))),
                 produced_by: Some(NodeId(596)),
             },
         );
@@ -78872,7 +78908,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(728),
             Port {
                 id: PortId(728),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2050))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2051))),
                 produced_by: Some(NodeId(598)),
             },
         );
@@ -78880,7 +78916,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(729),
             Port {
                 id: PortId(729),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2051))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2052))),
                 produced_by: Some(NodeId(600)),
             },
         );
@@ -78888,7 +78924,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(730),
             Port {
                 id: PortId(730),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2052))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2053))),
                 produced_by: Some(NodeId(602)),
             },
         );
@@ -78896,7 +78932,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(731),
             Port {
                 id: PortId(731),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2053))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2054))),
                 produced_by: Some(NodeId(604)),
             },
         );
@@ -78904,7 +78940,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(732),
             Port {
                 id: PortId(732),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2054))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2055))),
                 produced_by: Some(NodeId(606)),
             },
         );
@@ -78912,7 +78948,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(733),
             Port {
                 id: PortId(733),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2055))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2056))),
                 produced_by: Some(NodeId(608)),
             },
         );
@@ -78920,7 +78956,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(734),
             Port {
                 id: PortId(734),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2057))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2058))),
                 produced_by: Some(NodeId(610)),
             },
         );
@@ -78952,7 +78988,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(738),
             Port {
                 id: PortId(738),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2059))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2060))),
                 produced_by: Some(NodeId(614)),
             },
         );
@@ -78976,7 +79012,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(741),
             Port {
                 id: PortId(741),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2060))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2061))),
                 produced_by: Some(NodeId(617)),
             },
         );
@@ -79008,7 +79044,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(745),
             Port {
                 id: PortId(745),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2061))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2062))),
                 produced_by: Some(NodeId(621)),
             },
         );
@@ -79056,7 +79092,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(751),
             Port {
                 id: PortId(751),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2062))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2063))),
                 produced_by: Some(NodeId(626)),
             },
         );
@@ -79128,7 +79164,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(760),
             Port {
                 id: PortId(760),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2063))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2064))),
                 produced_by: Some(NodeId(633)),
             },
         );
@@ -79208,7 +79244,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(770),
             Port {
                 id: PortId(770),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2064))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2065))),
                 produced_by: Some(NodeId(640)),
             },
         );
@@ -79272,7 +79308,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(778),
             Port {
                 id: PortId(778),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2065))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2066))),
                 produced_by: Some(NodeId(645)),
             },
         );
@@ -79288,7 +79324,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(780),
             Port {
                 id: PortId(780),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2066))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2067))),
                 produced_by: None,
             },
         );
@@ -79376,7 +79412,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(791),
             Port {
                 id: PortId(791),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2067))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2068))),
                 produced_by: Some(NodeId(655)),
             },
         );
@@ -79448,7 +79484,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(800),
             Port {
                 id: PortId(800),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2068))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2069))),
                 produced_by: Some(NodeId(663)),
             },
         );
@@ -79872,7 +79908,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(853),
             Port {
                 id: PortId(853),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2125))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2126))),
                 produced_by: Some(NodeId(713)),
             },
         );
@@ -80080,7 +80116,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(879),
             Port {
                 id: PortId(879),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1613))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1614))),
                 produced_by: Some(NodeId(733)),
             },
         );
@@ -80648,7 +80684,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(950),
             Port {
                 id: PortId(950),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2126))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2127))),
                 produced_by: Some(NodeId(792)),
             },
         );
@@ -80840,7 +80876,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(974),
             Port {
                 id: PortId(974),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2302))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2303))),
                 produced_by: Some(NodeId(812)),
             },
         );
@@ -81228,139 +81264,139 @@ fn bootstrapped_fixture_without_parse_surface_dag_optional_match_disjs(
 ) -> HashMap<DeclarationId, DeclarationId> {
     {
         let mut map = HashMap::new();
-        map.insert(DeclarationId(389), DeclarationId(2473));
-        map.insert(DeclarationId(391), DeclarationId(2476));
-        map.insert(DeclarationId(423), DeclarationId(2479));
-        map.insert(DeclarationId(426), DeclarationId(2482));
-        map.insert(DeclarationId(471), DeclarationId(2485));
-        map.insert(DeclarationId(472), DeclarationId(2488));
-        map.insert(DeclarationId(473), DeclarationId(2491));
-        map.insert(DeclarationId(513), DeclarationId(2494));
-        map.insert(DeclarationId(515), DeclarationId(2497));
-        map.insert(DeclarationId(516), DeclarationId(2500));
-        map.insert(DeclarationId(539), DeclarationId(2503));
-        map.insert(DeclarationId(582), DeclarationId(2506));
-        map.insert(DeclarationId(602), DeclarationId(2509));
-        map.insert(DeclarationId(603), DeclarationId(2512));
-        map.insert(DeclarationId(605), DeclarationId(2515));
-        map.insert(DeclarationId(608), DeclarationId(2518));
-        map.insert(DeclarationId(613), DeclarationId(2521));
-        map.insert(DeclarationId(614), DeclarationId(2524));
-        map.insert(DeclarationId(618), DeclarationId(2527));
-        map.insert(DeclarationId(619), DeclarationId(2530));
-        map.insert(DeclarationId(620), DeclarationId(2533));
-        map.insert(DeclarationId(625), DeclarationId(2536));
-        map.insert(DeclarationId(1434), DeclarationId(2539));
-        map.insert(DeclarationId(1438), DeclarationId(2542));
-        map.insert(DeclarationId(1441), DeclarationId(2545));
-        map.insert(DeclarationId(1443), DeclarationId(2548));
-        map.insert(DeclarationId(1444), DeclarationId(2551));
-        map.insert(DeclarationId(1445), DeclarationId(2554));
-        map.insert(DeclarationId(1499), DeclarationId(2557));
-        map.insert(DeclarationId(1500), DeclarationId(2560));
-        map.insert(DeclarationId(1501), DeclarationId(2563));
-        map.insert(DeclarationId(1502), DeclarationId(2566));
-        map.insert(DeclarationId(1503), DeclarationId(2569));
-        map.insert(DeclarationId(1504), DeclarationId(2572));
-        map.insert(DeclarationId(1510), DeclarationId(2575));
-        map.insert(DeclarationId(1565), DeclarationId(2578));
-        map.insert(DeclarationId(1568), DeclarationId(2581));
-        map.insert(DeclarationId(1569), DeclarationId(2584));
-        map.insert(DeclarationId(1570), DeclarationId(2587));
-        map.insert(DeclarationId(1571), DeclarationId(2590));
-        map.insert(DeclarationId(1594), DeclarationId(2593));
-        map.insert(DeclarationId(1599), DeclarationId(2596));
-        map.insert(DeclarationId(1603), DeclarationId(2599));
-        map.insert(DeclarationId(1606), DeclarationId(2602));
-        map.insert(DeclarationId(1607), DeclarationId(2605));
-        map.insert(DeclarationId(1652), DeclarationId(2608));
-        map.insert(DeclarationId(1653), DeclarationId(2611));
-        map.insert(DeclarationId(1654), DeclarationId(2614));
-        map.insert(DeclarationId(1655), DeclarationId(2617));
-        map.insert(DeclarationId(1705), DeclarationId(2620));
-        map.insert(DeclarationId(1706), DeclarationId(2623));
-        map.insert(DeclarationId(1725), DeclarationId(2626));
-        map.insert(DeclarationId(1726), DeclarationId(2629));
-        map.insert(DeclarationId(1730), DeclarationId(2632));
-        map.insert(DeclarationId(1731), DeclarationId(2635));
-        map.insert(DeclarationId(1742), DeclarationId(2638));
-        map.insert(DeclarationId(1743), DeclarationId(2641));
-        map.insert(DeclarationId(1745), DeclarationId(2644));
-        map.insert(DeclarationId(1746), DeclarationId(2647));
-        map.insert(DeclarationId(1748), DeclarationId(2650));
-        map.insert(DeclarationId(1749), DeclarationId(2653));
-        map.insert(DeclarationId(1751), DeclarationId(2656));
-        map.insert(DeclarationId(1753), DeclarationId(2659));
-        map.insert(DeclarationId(1756), DeclarationId(2662));
-        map.insert(DeclarationId(1760), DeclarationId(2665));
-        map.insert(DeclarationId(1762), DeclarationId(2668));
-        map.insert(DeclarationId(1764), DeclarationId(2671));
-        map.insert(DeclarationId(1774), DeclarationId(2674));
-        map.insert(DeclarationId(1775), DeclarationId(2677));
-        map.insert(DeclarationId(1776), DeclarationId(2680));
-        map.insert(DeclarationId(1779), DeclarationId(2683));
-        map.insert(DeclarationId(1780), DeclarationId(2686));
-        map.insert(DeclarationId(1815), DeclarationId(2689));
-        map.insert(DeclarationId(1816), DeclarationId(2692));
-        map.insert(DeclarationId(1817), DeclarationId(2695));
-        map.insert(DeclarationId(1818), DeclarationId(2698));
-        map.insert(DeclarationId(1819), DeclarationId(2701));
-        map.insert(DeclarationId(1820), DeclarationId(2704));
-        map.insert(DeclarationId(1843), DeclarationId(2707));
-        map.insert(DeclarationId(1973), DeclarationId(2710));
-        map.insert(DeclarationId(1974), DeclarationId(2713));
-        map.insert(DeclarationId(1980), DeclarationId(2716));
-        map.insert(DeclarationId(1981), DeclarationId(2719));
-        map.insert(DeclarationId(1982), DeclarationId(2722));
-        map.insert(DeclarationId(1983), DeclarationId(2725));
-        map.insert(DeclarationId(1984), DeclarationId(2728));
-        map.insert(DeclarationId(1985), DeclarationId(2731));
-        map.insert(DeclarationId(2090), DeclarationId(2734));
-        map.insert(DeclarationId(2091), DeclarationId(2737));
-        map.insert(DeclarationId(2092), DeclarationId(2740));
-        map.insert(DeclarationId(2095), DeclarationId(2743));
-        map.insert(DeclarationId(2096), DeclarationId(2746));
-        map.insert(DeclarationId(2306), DeclarationId(2749));
-        map.insert(DeclarationId(2335), DeclarationId(2752));
-        map.insert(DeclarationId(2341), DeclarationId(2755));
-        map.insert(DeclarationId(2346), DeclarationId(2758));
-        map.insert(DeclarationId(2349), DeclarationId(2761));
-        map.insert(DeclarationId(2350), DeclarationId(2764));
-        map.insert(DeclarationId(2370), DeclarationId(2767));
-        map.insert(DeclarationId(2371), DeclarationId(2770));
-        map.insert(DeclarationId(2379), DeclarationId(2773));
-        map.insert(DeclarationId(2383), DeclarationId(2776));
-        map.insert(DeclarationId(2385), DeclarationId(2779));
-        map.insert(DeclarationId(2386), DeclarationId(2782));
-        map.insert(DeclarationId(2387), DeclarationId(2785));
-        map.insert(DeclarationId(2388), DeclarationId(2788));
-        map.insert(DeclarationId(2389), DeclarationId(2791));
-        map.insert(DeclarationId(2395), DeclarationId(2794));
-        map.insert(DeclarationId(2397), DeclarationId(2797));
-        map.insert(DeclarationId(2398), DeclarationId(2800));
-        map.insert(DeclarationId(2410), DeclarationId(2803));
-        map.insert(DeclarationId(2411), DeclarationId(2806));
-        map.insert(DeclarationId(2413), DeclarationId(2809));
-        map.insert(DeclarationId(2414), DeclarationId(2812));
-        map.insert(DeclarationId(2415), DeclarationId(2815));
-        map.insert(DeclarationId(2416), DeclarationId(2818));
-        map.insert(DeclarationId(2418), DeclarationId(2821));
-        map.insert(DeclarationId(2419), DeclarationId(2824));
-        map.insert(DeclarationId(2422), DeclarationId(2827));
-        map.insert(DeclarationId(2423), DeclarationId(2830));
-        map.insert(DeclarationId(2424), DeclarationId(2833));
-        map.insert(DeclarationId(2431), DeclarationId(2836));
-        map.insert(DeclarationId(2432), DeclarationId(2839));
-        map.insert(DeclarationId(2433), DeclarationId(2842));
-        map.insert(DeclarationId(2435), DeclarationId(2845));
-        map.insert(DeclarationId(2436), DeclarationId(2848));
-        map.insert(DeclarationId(2437), DeclarationId(2851));
-        map.insert(DeclarationId(2439), DeclarationId(2854));
-        map.insert(DeclarationId(2440), DeclarationId(2857));
-        map.insert(DeclarationId(2441), DeclarationId(2860));
-        map.insert(DeclarationId(2448), DeclarationId(2863));
-        map.insert(DeclarationId(2450), DeclarationId(2866));
-        map.insert(DeclarationId(2461), DeclarationId(2869));
+        map.insert(DeclarationId(389), DeclarationId(2474));
+        map.insert(DeclarationId(391), DeclarationId(2477));
+        map.insert(DeclarationId(423), DeclarationId(2480));
+        map.insert(DeclarationId(426), DeclarationId(2483));
+        map.insert(DeclarationId(471), DeclarationId(2486));
+        map.insert(DeclarationId(472), DeclarationId(2489));
+        map.insert(DeclarationId(473), DeclarationId(2492));
+        map.insert(DeclarationId(513), DeclarationId(2495));
+        map.insert(DeclarationId(515), DeclarationId(2498));
+        map.insert(DeclarationId(516), DeclarationId(2501));
+        map.insert(DeclarationId(539), DeclarationId(2504));
+        map.insert(DeclarationId(582), DeclarationId(2507));
+        map.insert(DeclarationId(602), DeclarationId(2510));
+        map.insert(DeclarationId(603), DeclarationId(2513));
+        map.insert(DeclarationId(605), DeclarationId(2516));
+        map.insert(DeclarationId(608), DeclarationId(2519));
+        map.insert(DeclarationId(613), DeclarationId(2522));
+        map.insert(DeclarationId(614), DeclarationId(2525));
+        map.insert(DeclarationId(618), DeclarationId(2528));
+        map.insert(DeclarationId(619), DeclarationId(2531));
+        map.insert(DeclarationId(620), DeclarationId(2534));
+        map.insert(DeclarationId(625), DeclarationId(2537));
+        map.insert(DeclarationId(1435), DeclarationId(2540));
+        map.insert(DeclarationId(1439), DeclarationId(2543));
+        map.insert(DeclarationId(1442), DeclarationId(2546));
+        map.insert(DeclarationId(1444), DeclarationId(2549));
+        map.insert(DeclarationId(1445), DeclarationId(2552));
+        map.insert(DeclarationId(1446), DeclarationId(2555));
+        map.insert(DeclarationId(1500), DeclarationId(2558));
+        map.insert(DeclarationId(1501), DeclarationId(2561));
+        map.insert(DeclarationId(1502), DeclarationId(2564));
+        map.insert(DeclarationId(1503), DeclarationId(2567));
+        map.insert(DeclarationId(1504), DeclarationId(2570));
+        map.insert(DeclarationId(1505), DeclarationId(2573));
+        map.insert(DeclarationId(1511), DeclarationId(2576));
+        map.insert(DeclarationId(1566), DeclarationId(2579));
+        map.insert(DeclarationId(1569), DeclarationId(2582));
+        map.insert(DeclarationId(1570), DeclarationId(2585));
+        map.insert(DeclarationId(1571), DeclarationId(2588));
+        map.insert(DeclarationId(1572), DeclarationId(2591));
+        map.insert(DeclarationId(1595), DeclarationId(2594));
+        map.insert(DeclarationId(1600), DeclarationId(2597));
+        map.insert(DeclarationId(1604), DeclarationId(2600));
+        map.insert(DeclarationId(1607), DeclarationId(2603));
+        map.insert(DeclarationId(1608), DeclarationId(2606));
+        map.insert(DeclarationId(1653), DeclarationId(2609));
+        map.insert(DeclarationId(1654), DeclarationId(2612));
+        map.insert(DeclarationId(1655), DeclarationId(2615));
+        map.insert(DeclarationId(1656), DeclarationId(2618));
+        map.insert(DeclarationId(1706), DeclarationId(2621));
+        map.insert(DeclarationId(1707), DeclarationId(2624));
+        map.insert(DeclarationId(1726), DeclarationId(2627));
+        map.insert(DeclarationId(1727), DeclarationId(2630));
+        map.insert(DeclarationId(1731), DeclarationId(2633));
+        map.insert(DeclarationId(1732), DeclarationId(2636));
+        map.insert(DeclarationId(1743), DeclarationId(2639));
+        map.insert(DeclarationId(1744), DeclarationId(2642));
+        map.insert(DeclarationId(1746), DeclarationId(2645));
+        map.insert(DeclarationId(1747), DeclarationId(2648));
+        map.insert(DeclarationId(1749), DeclarationId(2651));
+        map.insert(DeclarationId(1750), DeclarationId(2654));
+        map.insert(DeclarationId(1752), DeclarationId(2657));
+        map.insert(DeclarationId(1754), DeclarationId(2660));
+        map.insert(DeclarationId(1757), DeclarationId(2663));
+        map.insert(DeclarationId(1761), DeclarationId(2666));
+        map.insert(DeclarationId(1763), DeclarationId(2669));
+        map.insert(DeclarationId(1765), DeclarationId(2672));
+        map.insert(DeclarationId(1775), DeclarationId(2675));
+        map.insert(DeclarationId(1776), DeclarationId(2678));
+        map.insert(DeclarationId(1777), DeclarationId(2681));
+        map.insert(DeclarationId(1780), DeclarationId(2684));
+        map.insert(DeclarationId(1781), DeclarationId(2687));
+        map.insert(DeclarationId(1816), DeclarationId(2690));
+        map.insert(DeclarationId(1817), DeclarationId(2693));
+        map.insert(DeclarationId(1818), DeclarationId(2696));
+        map.insert(DeclarationId(1819), DeclarationId(2699));
+        map.insert(DeclarationId(1820), DeclarationId(2702));
+        map.insert(DeclarationId(1821), DeclarationId(2705));
+        map.insert(DeclarationId(1844), DeclarationId(2708));
+        map.insert(DeclarationId(1974), DeclarationId(2711));
+        map.insert(DeclarationId(1975), DeclarationId(2714));
+        map.insert(DeclarationId(1981), DeclarationId(2717));
+        map.insert(DeclarationId(1982), DeclarationId(2720));
+        map.insert(DeclarationId(1983), DeclarationId(2723));
+        map.insert(DeclarationId(1984), DeclarationId(2726));
+        map.insert(DeclarationId(1985), DeclarationId(2729));
+        map.insert(DeclarationId(1986), DeclarationId(2732));
+        map.insert(DeclarationId(2091), DeclarationId(2735));
+        map.insert(DeclarationId(2092), DeclarationId(2738));
+        map.insert(DeclarationId(2093), DeclarationId(2741));
+        map.insert(DeclarationId(2096), DeclarationId(2744));
+        map.insert(DeclarationId(2097), DeclarationId(2747));
+        map.insert(DeclarationId(2307), DeclarationId(2750));
+        map.insert(DeclarationId(2336), DeclarationId(2753));
+        map.insert(DeclarationId(2342), DeclarationId(2756));
+        map.insert(DeclarationId(2347), DeclarationId(2759));
+        map.insert(DeclarationId(2350), DeclarationId(2762));
+        map.insert(DeclarationId(2351), DeclarationId(2765));
+        map.insert(DeclarationId(2371), DeclarationId(2768));
+        map.insert(DeclarationId(2372), DeclarationId(2771));
+        map.insert(DeclarationId(2380), DeclarationId(2774));
+        map.insert(DeclarationId(2384), DeclarationId(2777));
+        map.insert(DeclarationId(2386), DeclarationId(2780));
+        map.insert(DeclarationId(2387), DeclarationId(2783));
+        map.insert(DeclarationId(2388), DeclarationId(2786));
+        map.insert(DeclarationId(2389), DeclarationId(2789));
+        map.insert(DeclarationId(2390), DeclarationId(2792));
+        map.insert(DeclarationId(2396), DeclarationId(2795));
+        map.insert(DeclarationId(2398), DeclarationId(2798));
+        map.insert(DeclarationId(2399), DeclarationId(2801));
+        map.insert(DeclarationId(2411), DeclarationId(2804));
+        map.insert(DeclarationId(2412), DeclarationId(2807));
+        map.insert(DeclarationId(2414), DeclarationId(2810));
+        map.insert(DeclarationId(2415), DeclarationId(2813));
+        map.insert(DeclarationId(2416), DeclarationId(2816));
+        map.insert(DeclarationId(2417), DeclarationId(2819));
+        map.insert(DeclarationId(2419), DeclarationId(2822));
+        map.insert(DeclarationId(2420), DeclarationId(2825));
+        map.insert(DeclarationId(2423), DeclarationId(2828));
+        map.insert(DeclarationId(2424), DeclarationId(2831));
+        map.insert(DeclarationId(2425), DeclarationId(2834));
+        map.insert(DeclarationId(2432), DeclarationId(2837));
+        map.insert(DeclarationId(2433), DeclarationId(2840));
+        map.insert(DeclarationId(2434), DeclarationId(2843));
+        map.insert(DeclarationId(2436), DeclarationId(2846));
+        map.insert(DeclarationId(2437), DeclarationId(2849));
+        map.insert(DeclarationId(2438), DeclarationId(2852));
+        map.insert(DeclarationId(2440), DeclarationId(2855));
+        map.insert(DeclarationId(2441), DeclarationId(2858));
+        map.insert(DeclarationId(2442), DeclarationId(2861));
+        map.insert(DeclarationId(2449), DeclarationId(2864));
+        map.insert(DeclarationId(2451), DeclarationId(2867));
+        map.insert(DeclarationId(2462), DeclarationId(2870));
         map
     }
 }
diff --git a/src/v3/compiler/src/lens_apply.rs b/src/v3/compiler/src/lens_apply.rs
index 3057233437e..a8f93dccef2 100644
--- a/src/v3/compiler/src/lens_apply.rs
+++ b/src/v3/compiler/src/lens_apply.rs
@@ -352,9 +352,7 @@ pub fn apply_lens_declaration(
             let v = pu
                 .workflow_lane2_subject()
                 .map(|subject| {
-                    crate::workflow_parallelism::loop_iteration_parallel_emission_indicator(
-                        pu, subject,
-                    )
+                    crate::loop_iteration_parallel_emission_indicator(pu, subject)
                 })
                 .unwrap_or(0);
             return Ok(FieldValue::Literal(LiteralBits::Int(v.to_string())));
diff --git a/src/v3/compiler/src/lens_parallelism_generated.rs b/src/v3/compiler/src/lens_parallelism_generated.rs
new file mode 100644
index 00000000000..acc0566a7d4
--- /dev/null
+++ b/src/v3/compiler/src/lens_parallelism_generated.rs
@@ -0,0 +1,14 @@
+// AUTO-GENERATED from `src/v3/lenses/parallelism.dag` via
+// `emit_rust_module`. Regenerate instead of hand-editing.
+
+pub fn analyze_parallelism(_p0: &Dag, _p1: NodeId) -> WorkflowParallelismReport {
+    WorkflowParallelismReport::ParallelismUnsupported(ParallelismUnsupportedDetail {
+        kind: ParallelismUnsupportedKind::LensSurfacePending,
+        downstream_stage: "lane2_stage2e_parallelism_lens".to_string(),
+        reason: "temporary bootstrap stub; run regen_lens --lens parallelism".to_string(),
+    })
+}
+
+pub fn loop_iteration_parallel_emission_indicator(_p0: &Dag, _p1: NodeId) -> i64 {
+    0
+}
diff --git a/src/v3/compiler/src/lib.rs b/src/v3/compiler/src/lib.rs
index c33b5c37d04..d05622657da 100644
--- a/src/v3/compiler/src/lib.rs
+++ b/src/v3/compiler/src/lib.rs
@@ -5158,6 +5158,29 @@ pub(crate) mod lower_helpers {
 pub mod lens_idempotency {
     pub use crate::dag::analyze_workflow;
 }
+
+/// Lane 2 Stage 2e parallelism lens. Authority lives in
+/// `src/v3/lenses/parallelism.dag`; the Rust projection is auto-emitted into
+/// `src/v3/compiler/src/lens_parallelism_generated.rs` and wrapped here so the
+/// crate-root compatibility exports use the `.dag` port directly.
+pub mod lens_parallelism {
+    #[allow(
+        dead_code,
+        unused_imports,
+        unused_parens,
+        unused_variables,
+        clippy::clone_on_copy,
+        clippy::collapsible_else_if
+    )]
+    mod generated {
+        use crate::dag::*;
+        use crate::diagnostics::*;
+
+        include!("lens_parallelism_generated.rs");
+    }
+
+    pub use generated::{analyze_parallelism, loop_iteration_parallel_emission_indicator};
+}
 // Surface pipeline for this crate (not workspace-root `src/tokenize.rs` / `src/parse.rs`):
 // `tokenize.dag` → `regen_tokenize` → `tokenize_generated.rs`,
 // `parse_parser_body.txt` → `regen_parse` → `parse_generated.rs` (`parse` module),
@@ -5357,7 +5380,6 @@ pub(crate) mod variant_payload {
     }
 }
 mod r3_fc_lane2_loop_witness;
-pub(crate) mod workflow_parallelism;
 
 pub use cost_basis_declaration::{
     try_build_per_write_log_cost_basis_declaration, CostBasisDeclarationBuildError,
@@ -5377,7 +5399,7 @@ pub use diagnostics::{Diagnostic, SourceSpan, LAYER1_DIAGNOSTIC_KIND_LABELS};
 pub use emit::{EmitDispatchError, EmitMode, EmitTarget, EmittedSource};
 pub use emit_rust::EmitError;
 /// Lane 2 Stage 2e — parallel composition safety (`ParallelEffect`); see DB-20.
-pub use workflow_parallelism::{analyze_parallelism, loop_iteration_parallel_emission_indicator};
+pub use lens_parallelism::{analyze_parallelism, loop_iteration_parallel_emission_indicator};
 
 /// Lane 2 Stage 2f — DB-3 dimension abstraction (`std/dimensions.dag` types;
 /// `analyze_symbolic_cost_dimension` is the first migrated lens path).
diff --git a/src/v3/compiler/src/r3_fc_lane2_loop_witness.rs b/src/v3/compiler/src/r3_fc_lane2_loop_witness.rs
index c96deb41441..6973ec54f6a 100644
--- a/src/v3/compiler/src/r3_fc_lane2_loop_witness.rs
+++ b/src/v3/compiler/src/r3_fc_lane2_loop_witness.rs
@@ -179,7 +179,7 @@ mod tests {
         let dag = compile_to_dag(src, "witness_after_preamble.v3").expect("compile");
         let subject = dag.workflow_lane2_subject().expect("lane2 subject");
         assert_eq!(
-            crate::workflow_parallelism::loop_iteration_parallel_emission_indicator(&dag, subject),
+            crate::loop_iteration_parallel_emission_indicator(&dag, subject),
             1
         );
     }
@@ -206,7 +206,7 @@ mod tests {
                 )
         ));
         assert_eq!(
-            crate::workflow_parallelism::loop_iteration_parallel_emission_indicator(&dag, subject),
+            crate::loop_iteration_parallel_emission_indicator(&dag, subject),
             1
         );
     }
@@ -234,7 +234,7 @@ mod tests {
                 )
         ));
         assert_eq!(
-            crate::workflow_parallelism::loop_iteration_parallel_emission_indicator(&dag, subject),
+            crate::loop_iteration_parallel_emission_indicator(&dag, subject),
             0
         );
     }
@@ -246,7 +246,7 @@ mod tests {
         let subject = dag.workflow_lane2_subject().expect("lane2 subject");
         assert!(dag.lane2_workflow_effect_at(&subject).is_none());
         assert_eq!(
-            crate::workflow_parallelism::loop_iteration_parallel_emission_indicator(&dag, subject),
+            crate::loop_iteration_parallel_emission_indicator(&dag, subject),
             0
         );
     }
diff --git a/src/v3/lenses/parallelism.dag b/src/v3/lenses/parallelism.dag
index 5f70a3ab242..4a2fa826521 100644
--- a/src/v3/lenses/parallelism.dag
+++ b/src/v3/lenses/parallelism.dag
@@ -18,7 +18,8 @@
 module lenses.parallelism
 
 import std.list { List, Empty, Cons, empty, cons, concat }
-import v3.std.substrate { Dag, NodeId, ElementRef, NonSingletonList, lane2_workflow_at }
+import v3.std.substrate { Dag, NodeId, ElementRef, lane2_workflow_at }
+import v3.std.substrate_minimal { NonSingletonList }
 import std.effects {
   EffectShape,
   IdempotentShape,
@@ -38,8 +39,8 @@ type NonCommutingPairLookup
   = NonCommutingPairFound { left: OperationEffect, right: OperationEffect }
   | AllPairsCommute
 
-fn nsl_to_workflow_list(branches: NonSingletonList<WorkflowEffect>) -> List<WorkflowEffect> =
-  cons(branches.first, cons(branches.second, branches.rest))
+fn nsl_to_workflow_list(nsl: NonSingletonList<WorkflowEffect>) -> List<WorkflowEffect> =
+  cons(nsl.first, cons(nsl.second, nsl.rest))
 
 fn idempotent_shapes_commute(a: IdempotentShape, b: IdempotentShape) -> Bool =
   match a {

From ba2e86637ea480ab012a60770c3c714c5bcf0796 Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gmail.com>
Date: Tue, 12 May 2026 17:50:25 -0400
Subject: [PATCH 03/17] =?UTF-8?q?WIP:=20T-Cluster-F-=CE=B1=20S1=20#81=20pa?=
 =?UTF-8?q?rallelism=20walker=20port=20(src/v3/compiler/src/workfl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/v3/lenses/parallelism.dag | 147 ++++++++++++++++++++--------------
 1 file changed, 86 insertions(+), 61 deletions(-)

diff --git a/src/v3/lenses/parallelism.dag b/src/v3/lenses/parallelism.dag
index 4a2fa826521..70502d22209 100644
--- a/src/v3/lenses/parallelism.dag
+++ b/src/v3/lenses/parallelism.dag
@@ -18,16 +18,18 @@
 module lenses.parallelism
 
 import std.list { List, Empty, Cons, empty, cons, concat }
-import v3.std.substrate { Dag, NodeId, ElementRef, lane2_workflow_at }
+import v3.std.substrate { Dag, NodeId, lane2_workflow_at }
 import v3.std.substrate_minimal { NonSingletonList }
 import std.effects {
   EffectShape,
   IdempotentShape,
+  KeySource,
   OperationEffect,
   WorkflowEffect,
   WorkflowParallelismReport,
   CompositionVerdict,
   ParallelismUnsupportedKind,
+  compose_effects,
   report_parallelism_unsupported
 }
 
@@ -47,15 +49,55 @@ fn idempotent_shapes_commute(a: IdempotentShape, b: IdempotentShape) -> Bool =
     ReadEffect =>
       match b {
         ReadEffect => true
-        UpsertEffect { .. } => false
-        DeleteEffect { .. } => false
+        UpsertEffect { key_source: _ } => false
+        DeleteEffect { key_source: _ } => false
       }
-    UpsertEffect { .. } => false
+    UpsertEffect { key_source: _ } => false
     DeleteEffect { key_source: ka } =>
       match b {
         ReadEffect => false
-        UpsertEffect { .. } => false
-        DeleteEffect { key_source: kb } => ka == kb
+        UpsertEffect { key_source: _ } => false
+        DeleteEffect { key_source: kb } => key_sources_equal(ka, kb)
+      }
+  }
+
+fn string_lists_equal(a: List<String>, b: List<String>) -> Bool =
+  match a {
+    Empty =>
+      match b {
+        Empty => true
+        Cons(_) => false
+      }
+    Cons(pa) =>
+      match b {
+        Empty => false
+        Cons(pb) =>
+          if pa.head == pb.head then
+            string_lists_equal(pa.tail, pb.tail)
+          else
+            false
+      }
+  }
+
+fn key_sources_equal(a: KeySource, b: KeySource) -> Bool =
+  match a {
+    PathParam { param: pa } =>
+      match b {
+        PathParam { param: pb } => pa == pb
+        InputField { field: _ } => false
+        CompositeKey { fields: _ } => false
+      }
+    InputField { field: fa } =>
+      match b {
+        PathParam { param: _ } => false
+        InputField { field: fb } => fa == fb
+        CompositeKey { fields: _ } => false
+      }
+    CompositeKey { fields: fa } =>
+      match b {
+        PathParam { param: _ } => false
+        InputField { field: _ } => false
+        CompositeKey { fields: fb } => string_lists_equal(fa, fb)
       }
   }
 
@@ -76,15 +118,15 @@ fn extract_linear_branches_from_list(
     Empty => LinearBranchesFound { branches: empty() }
     Cons(payload) =>
       match payload.head {
-        LinearEffect { ops } =>
+        LinearEffect { ops: ops } =>
           match extract_linear_branches_from_list(payload.tail) {
             LinearBranchesFound { branches: tail_branches } =>
               LinearBranchesFound { branches: cons(ops, tail_branches) }
             NonLinearBranchFound => NonLinearBranchFound
           }
-        BranchEffect { .. } => NonLinearBranchFound
-        LoopEffect { .. } => NonLinearBranchFound
-        ParallelEffect { .. } => NonLinearBranchFound
+        BranchEffect { arms: _ } => NonLinearBranchFound
+        LoopEffect { body: _ } => NonLinearBranchFound
+        ParallelEffect { branches: _ } => NonLinearBranchFound
       }
   }
 
@@ -99,36 +141,15 @@ fn flatten_branch_ops(branch_ops: List<List<OperationEffect>>) -> List<Operation
     Cons(payload) => concat(payload.head, flatten_branch_ops(payload.tail))
   }
 
-fn breaker_ref(index: Int) -> ElementRef<OperationEffect> =
-  { index: index }
-
-fn first_breaker_ref_at(
-  ops: List<OperationEffect>,
-  index: Int
-) -> ElementRef<OperationEffect>? =
-  match ops {
-    Empty => None
-    Cons(payload) =>
-      match payload.head.shape {
-        IsBreaking(_) => Some(breaker_ref(index))
-        IsIdempotent(_) => first_breaker_ref_at(payload.tail, index + 1)
-      }
-  }
-
-fn first_breaking_across_branches(
-  branch_ops: List<List<OperationEffect>>
-) -> ElementRef<OperationEffect>? =
-  first_breaker_ref_at(flatten_branch_ops(branch_ops), 0)
-
-fn first_non_commuting_op(
-  left: OperationEffect,
-  right_branch: List<OperationEffect>
+fn first_non_commuting_op_in_branch(
+  right_branch: List<OperationEffect>,
+  left: OperationEffect
 ) -> NonCommutingPairLookup =
   match right_branch {
     Empty => AllPairsCommute
     Cons(payload) =>
       if operations_commute(left, payload.head) then
-        first_non_commuting_op(left, payload.tail)
+        first_non_commuting_op_in_branch(payload.tail, left)
       else
         NonCommutingPairFound { left: left, right: payload.head }
   }
@@ -140,23 +161,23 @@ fn first_non_commuting_branch_pair(
   match left_branch {
     Empty => AllPairsCommute
     Cons(payload) =>
-      match first_non_commuting_op(payload.head, right_branch) {
+      match first_non_commuting_op_in_branch(right_branch, payload.head) {
         AllPairsCommute => first_non_commuting_branch_pair(payload.tail, right_branch)
-        NonCommutingPairFound { left, right } =>
+        NonCommutingPairFound { left: left, right: right } =>
           NonCommutingPairFound { left: left, right: right }
       }
   }
 
 fn first_non_commuting_against_tail(
-  left_branch: List<OperationEffect>,
-  tail_branches: List<List<OperationEffect>>
+  tail_branches: List<List<OperationEffect>>,
+  left_branch: List<OperationEffect>
 ) -> NonCommutingPairLookup =
   match tail_branches {
     Empty => AllPairsCommute
     Cons(payload) =>
       match first_non_commuting_branch_pair(left_branch, payload.head) {
-        AllPairsCommute => first_non_commuting_against_tail(left_branch, payload.tail)
-        NonCommutingPairFound { left, right } =>
+        AllPairsCommute => first_non_commuting_against_tail(payload.tail, left_branch)
+        NonCommutingPairFound { left: left, right: right } =>
           NonCommutingPairFound { left: left, right: right }
       }
   }
@@ -167,16 +188,16 @@ fn pairwise_cross_branch_commutes(
   match branch_ops {
     Empty => AllPairsCommute
     Cons(payload) =>
-      match first_non_commuting_against_tail(payload.head, payload.tail) {
+      match first_non_commuting_against_tail(payload.tail, payload.head) {
         AllPairsCommute => pairwise_cross_branch_commutes(payload.tail)
-        NonCommutingPairFound { left, right } =>
+        NonCommutingPairFound { left: left, right: right } =>
           NonCommutingPairFound { left: left, right: right }
       }
   }
 
 fn parallelism_report_for_workflow(wf: WorkflowEffect) -> WorkflowParallelismReport =
   match wf {
-    ParallelEffect { branches } =>
+    ParallelEffect { branches: branches } =>
       match extract_linear_branches(branches) {
         NonLinearBranchFound =>
           report_parallelism_unsupported(
@@ -184,12 +205,12 @@ fn parallelism_report_for_workflow(wf: WorkflowEffect) -> WorkflowParallelismRep
             "Stage 2e v1 requires every parallel branch to be `LinearEffect`"
           )
         LinearBranchesFound { branches: branch_ops } =>
-          match first_breaking_across_branches(branch_ops) {
-            Some(b) => ParallelCompositionVerdict(BrokenBy { first_breaker: b })
-            None =>
+          match compose_effects(flatten_branch_ops(branch_ops)) {
+            BrokenBy { first_breaker: b } => ParallelCompositionVerdict(BrokenBy { first_breaker: b })
+            IdempotentComposition =>
               match pairwise_cross_branch_commutes(branch_ops) {
                 AllPairsCommute => ParallelCompositionVerdict(IdempotentComposition)
-                NonCommutingPairFound { .. } =>
+                NonCommutingPairFound { left: left_op, right: right_op } =>
                   report_parallelism_unsupported(
                     PairwiseNonCommute,
                     "parallel branch operations do not commute under parallel scheduling"
@@ -197,17 +218,17 @@ fn parallelism_report_for_workflow(wf: WorkflowEffect) -> WorkflowParallelismRep
               }
           }
       }
-    LinearEffect { .. } =>
+    LinearEffect { ops: _ } =>
       report_parallelism_unsupported(
         NotParallelEffectRoot,
         "parallelism lens analyzes `ParallelEffect` roots only"
       )
-    BranchEffect { .. } =>
+    BranchEffect { arms: _ } =>
       report_parallelism_unsupported(
         NotParallelEffectRoot,
         "parallelism lens analyzes `ParallelEffect` roots only"
       )
-    LoopEffect { .. } =>
+    LoopEffect { body: _ } =>
       report_parallelism_unsupported(
         NotParallelEffectRoot,
         "parallelism lens analyzes `ParallelEffect` roots only"
@@ -229,8 +250,12 @@ fn read_only_ops(ops: List<OperationEffect>) -> Bool =
     Empty => true
     Cons(payload) =>
       match payload.head.shape {
-        IsIdempotent(ReadEffect) => read_only_ops(payload.tail)
-        IsIdempotent(_) => false
+        IsIdempotent(shape) =>
+          match shape {
+            ReadEffect => read_only_ops(payload.tail)
+            UpsertEffect { key_source: _ } => false
+            DeleteEffect { key_source: _ } => false
+          }
         IsBreaking(_) => false
       }
   }
@@ -240,20 +265,20 @@ fn loop_iteration_parallel_emission_indicator(d: Dag, workflow_root: NodeId) ->
     None => 0
     Some(wf) =>
       match wf {
-        LoopEffect { body } =>
+        LoopEffect { body: body } =>
           match body {
-            LinearEffect { ops } =>
+            LinearEffect { ops: ops } =>
               match ops {
                 Empty => 0
                 Cons(_) =>
                   if read_only_ops(ops) then 1 else 0
               }
-            BranchEffect { .. } => 0
-            LoopEffect { .. } => 0
-            ParallelEffect { .. } => 0
+            BranchEffect { arms: _ } => 0
+            LoopEffect { body: _ } => 0
+            ParallelEffect { branches: _ } => 0
           }
-        LinearEffect { .. } => 0
-        BranchEffect { .. } => 0
-        ParallelEffect { .. } => 0
+        LinearEffect { ops: _ } => 0
+        BranchEffect { arms: _ } => 0
+        ParallelEffect { branches: _ } => 0
       }
   }

From 8a39733b1dce946e9d6f443feafaa961cd75e18b Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gmail.com>
Date: Tue, 12 May 2026 17:51:38 -0400
Subject: [PATCH 04/17] =?UTF-8?q?WIP:=20T-Cluster-F-=CE=B1=20S1=20#81=20pa?=
 =?UTF-8?q?rallelism=20walker=20port=20(src/v3/compiler/src/workfl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/v3/lenses/parallelism.dag | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/v3/lenses/parallelism.dag b/src/v3/lenses/parallelism.dag
index 70502d22209..e5256a6641b 100644
--- a/src/v3/lenses/parallelism.dag
+++ b/src/v3/lenses/parallelism.dag
@@ -20,6 +20,7 @@ module lenses.parallelism
 import std.list { List, Empty, Cons, empty, cons, concat }
 import v3.std.substrate { Dag, NodeId, lane2_workflow_at }
 import v3.std.substrate_minimal { NonSingletonList }
+import v3.spec.rust { rust_language }
 import std.effects {
   EffectShape,
   IdempotentShape,

From aa517a7a795fa0c643ad87ebcd2df4e69e9a2ed9 Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gmail.com>
Date: Tue, 12 May 2026 17:56:20 -0400
Subject: [PATCH 05/17] =?UTF-8?q?WIP:=20T-Cluster-F-=CE=B1=20S1=20#81=20pa?=
 =?UTF-8?q?rallelism=20walker=20port=20(src/v3/compiler/src/workfl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/lens_parallelism_generated.rs         | 148 ++++++++++-
 src/v3/compiler/src/workflow_parallelism.rs   | 243 ------------------
 .../sg6_hand_authored_census_test.rs          |  10 +-
 src/v3/lenses/parallelism.dag                 |   3 +-
 src/v3/std/effects.dag                        |   2 +-
 src/v3/std/services.dag                       |   2 +-
 6 files changed, 150 insertions(+), 258 deletions(-)
 delete mode 100644 src/v3/compiler/src/workflow_parallelism.rs

diff --git a/src/v3/compiler/src/lens_parallelism_generated.rs b/src/v3/compiler/src/lens_parallelism_generated.rs
index acc0566a7d4..44d9ea777cd 100644
--- a/src/v3/compiler/src/lens_parallelism_generated.rs
+++ b/src/v3/compiler/src/lens_parallelism_generated.rs
@@ -1,14 +1,150 @@
 // AUTO-GENERATED from `src/v3/lenses/parallelism.dag` via
 // `emit_rust_module`. Regenerate instead of hand-editing.
 
-pub fn analyze_parallelism(_p0: &Dag, _p1: NodeId) -> WorkflowParallelismReport {
+const DOWNSTREAM: &str = "lane2_stage2e_parallelism_lens";
+
+fn parallel_unsupported(
+    kind: ParallelismUnsupportedKind,
+    reason: impl Into<String>,
+) -> WorkflowParallelismReport {
     WorkflowParallelismReport::ParallelismUnsupported(ParallelismUnsupportedDetail {
-        kind: ParallelismUnsupportedKind::LensSurfacePending,
-        downstream_stage: "lane2_stage2e_parallelism_lens".to_string(),
-        reason: "temporary bootstrap stub; run regen_lens --lens parallelism".to_string(),
+        kind,
+        downstream_stage: DOWNSTREAM.to_string(),
+        reason: reason.into(),
     })
 }
 
-pub fn loop_iteration_parallel_emission_indicator(_p0: &Dag, _p1: NodeId) -> i64 {
-    0
+fn key_sources_equal(a: &KeySource, b: &KeySource) -> bool {
+    match (a, b) {
+        (KeySource::PathParam { param: pa }, KeySource::PathParam { param: pb }) => pa == pb,
+        (KeySource::InputField { field: fa }, KeySource::InputField { field: fb }) => fa == fb,
+        (KeySource::CompositeKey { fields: fa }, KeySource::CompositeKey { fields: fb }) => {
+            fa == fb
+        }
+        _ => false,
+    }
+}
+
+fn idempotent_shapes_commute(a: &IdempotentShape, b: &IdempotentShape) -> bool {
+    match (a, b) {
+        (IdempotentShape::ReadEffect, IdempotentShape::ReadEffect) => true,
+        (
+            IdempotentShape::DeleteEffect { key_source: ka },
+            IdempotentShape::DeleteEffect { key_source: kb },
+        ) => key_sources_equal(ka, kb),
+        _ => false,
+    }
+}
+
+fn operations_commute(a: &OperationEffect, b: &OperationEffect) -> bool {
+    match (&a.shape, &b.shape) {
+        (EffectShape::IsIdempotent(ia), EffectShape::IsIdempotent(ib)) => {
+            idempotent_shapes_commute(ia, ib)
+        }
+        _ => false,
+    }
+}
+
+fn extract_linear_branches(
+    branches: &NonSingletonList<Box<WorkflowEffect>>,
+) -> Option<Vec<Vec<OperationEffect>>> {
+    let mut out = Vec::new();
+    for br in branches.iter() {
+        match br.as_ref() {
+            WorkflowEffect::LinearEffect { ops } => out.push(ops.to_vec()),
+            _ => return None,
+        }
+    }
+    Some(out)
+}
+
+fn first_breaking_across_branches(
+    branch_ops: &[Vec<OperationEffect>],
+) -> Option<ElementRef<OperationEffect>> {
+    let flattened: Vec<OperationEffect> = branch_ops
+        .iter()
+        .flat_map(|ops| ops.iter().cloned())
+        .collect();
+    for (index, op) in flattened.iter().enumerate() {
+        if matches!(op.shape, EffectShape::IsBreaking(_)) {
+            return ElementRef::from_slice(flattened.as_slice(), index);
+        }
+    }
+    None
+}
+
+fn pairwise_cross_branch_commutes(
+    branch_ops: &[Vec<OperationEffect>],
+) -> Result<(), (String, String)> {
+    for i in 0..branch_ops.len() {
+        for j in (i + 1)..branch_ops.len() {
+            for oa in &branch_ops[i] {
+                for ob in &branch_ops[j] {
+                    if !operations_commute(oa, ob) {
+                        return Err((oa.operation_name.clone(), ob.operation_name.clone()));
+                    }
+                }
+            }
+        }
+    }
+    Ok(())
+}
+
+pub fn analyze_parallelism(p0: &Dag, p1: NodeId) -> WorkflowParallelismReport {
+    let Some(workflow) = p0.lane2_workflow_effect_at(&p1) else {
+        return parallel_unsupported(
+            ParallelismUnsupportedKind::NoWorkflowProjection,
+            "no WorkflowEffect projection on this substrate node - analysis reads only `Value`/`Bind` fields set by lowering or `try_register_lane2_workflow_effect`",
+        );
+    };
+    let WorkflowEffect::ParallelEffect { branches } = workflow else {
+        return parallel_unsupported(
+            ParallelismUnsupportedKind::NotParallelEffectRoot,
+            "parallelism lens analyzes `ParallelEffect` roots only",
+        );
+    };
+    let Some(branch_ops) = extract_linear_branches(branches) else {
+        return parallel_unsupported(
+            ParallelismUnsupportedKind::NonLinearParallelBranch,
+            "Stage 2e v1 requires every parallel branch to be `LinearEffect`",
+        );
+    };
+    if let Some(b) = first_breaking_across_branches(&branch_ops) {
+        return WorkflowParallelismReport::ParallelCompositionVerdict(CompositionVerdict::BrokenBy {
+            first_breaker: b,
+        });
+    }
+    match pairwise_cross_branch_commutes(&branch_ops) {
+        Ok(()) => WorkflowParallelismReport::ParallelCompositionVerdict(
+            CompositionVerdict::IdempotentComposition,
+        ),
+        Err((a, b)) => parallel_unsupported(
+            ParallelismUnsupportedKind::PairwiseNonCommute,
+            format!("operations `{a}` and `{b}` do not commute under parallel scheduling"),
+        ),
+    }
+}
+
+pub fn loop_iteration_parallel_emission_indicator(p0: &Dag, p1: NodeId) -> i64 {
+    let Some(workflow) = p0.lane2_workflow_effect_at(&p1) else {
+        return 0;
+    };
+    let WorkflowEffect::LoopEffect { body } = workflow else {
+        return 0;
+    };
+    let WorkflowEffect::LinearEffect { ops } = body.as_ref() else {
+        return 0;
+    };
+    if ops.is_empty() {
+        return 0;
+    }
+    for op in ops {
+        if !matches!(
+            op.shape,
+            EffectShape::IsIdempotent(IdempotentShape::ReadEffect)
+        ) {
+            return 0;
+        }
+    }
+    1
 }
diff --git a/src/v3/compiler/src/workflow_parallelism.rs b/src/v3/compiler/src/workflow_parallelism.rs
deleted file mode 100644
index ceb92e777a5..00000000000
--- a/src/v3/compiler/src/workflow_parallelism.rs
+++ /dev/null
@@ -1,243 +0,0 @@
-//! Lane 2 Stage 2e — parallel workflow composition safety (DB-20).
-//!
-//! Reads `lane2_workflow` from native `Value` / `Bind` (same authority as
-//! Stage 2b). For [`crate::dag::WorkflowEffect::ParallelEffect`], checks that
-//! linear branches can be scheduled concurrently without reorder hazards,
-//! projecting through [`crate::dag::CompositionVerdict`] per DB-18 / PR #529.
-
-use crate::dag::{
-    CompositionVerdict, Dag, EffectShape, ElementRef, IdempotentShape, NodeId, NonSingletonList,
-    OperationEffect, ParallelismUnsupportedDetail, ParallelismUnsupportedKind, WorkflowEffect,
-    WorkflowParallelismReport,
-};
-
-const DOWNSTREAM: &str = "lane2_stage2e_parallelism_lens";
-
-fn parallel_unsupported(
-    kind: ParallelismUnsupportedKind,
-    reason: impl Into<String>,
-) -> WorkflowParallelismReport {
-    WorkflowParallelismReport::ParallelismUnsupported(ParallelismUnsupportedDetail {
-        kind,
-        downstream_stage: DOWNSTREAM.to_string(),
-        reason: reason.into(),
-    })
-}
-
-/// Pairwise commutativity for idempotent [`OperationEffect`] pairs.
-///
-/// **Upsert×Upsert:** always **not** commute in v1. `UpsertEffect` in
-/// `std.effects` carries only [`crate::dag::KeySource`] — no value body or
-/// merge-law witness — so the lens cannot certify **concurrent** write
-/// commutativity (distinct payloads / last-write semantics). Fail-closed until
-/// the algebra exposes an explicit witness (Codex / #543).
-///
-/// **Delete×Delete:** same structural key commutes (same cell removed).
-///
-/// **Read×Read:** always commutes.
-///
-/// Distinct [`KeySource`] values do not prove runtime disjointness (e.g. different
-/// `PathParam` names may alias) — inequality on deletes → not commute.
-fn idempotent_operations_commute(a: &OperationEffect, b: &OperationEffect) -> bool {
-    match (&a.shape, &b.shape) {
-        (EffectShape::IsIdempotent(ia), EffectShape::IsIdempotent(ib)) => match (ia, ib) {
-            (IdempotentShape::ReadEffect, IdempotentShape::ReadEffect) => true,
-            (IdempotentShape::UpsertEffect { .. }, IdempotentShape::UpsertEffect { .. }) => false,
-            (
-                IdempotentShape::DeleteEffect { key_source: ka },
-                IdempotentShape::DeleteEffect { key_source: kb },
-            ) => ka == kb,
-            _ => false,
-        },
-        _ => false,
-    }
-}
-
-fn operations_commute(a: &OperationEffect, b: &OperationEffect) -> bool {
-    idempotent_operations_commute(a, b)
-}
-
-fn first_breaking_across_branches(
-    branch_ops: &[Vec<OperationEffect>],
-) -> Option<ElementRef<OperationEffect>> {
-    // Stage 2e reuses `CompositionVerdict`, so breaker identity stays an
-    // index-shaped handle rather than a copied record. The canonical evidence
-    // list here is the branch-order flattening of every linear branch's `ops`;
-    // callers must resolve the handle against that same flattening, which
-    // `WorkflowEffect::operation_at` reconstructs.
-    let flattened: Vec<OperationEffect> = branch_ops
-        .iter()
-        .flat_map(|ops| ops.iter().cloned())
-        .collect();
-    for (index, op) in flattened.iter().enumerate() {
-        if matches!(op.shape, EffectShape::IsBreaking(_)) {
-            return ElementRef::from_slice(flattened.as_slice(), index);
-        }
-    }
-    None
-}
-
-fn extract_linear_branches(
-    branches: &NonSingletonList<Box<WorkflowEffect>>,
-) -> Option<Vec<Vec<OperationEffect>>> {
-    let mut out = Vec::new();
-    for br in branches.iter() {
-        match br.as_ref() {
-            WorkflowEffect::LinearEffect { ops } => out.push(ops.to_vec()),
-            _ => return None,
-        }
-    }
-    Some(out)
-}
-
-fn pairwise_cross_branch_commutes(
-    branch_ops: &[Vec<OperationEffect>],
-) -> Result<(), (String, String)> {
-    for i in 0..branch_ops.len() {
-        for j in (i + 1)..branch_ops.len() {
-            for oa in &branch_ops[i] {
-                for ob in &branch_ops[j] {
-                    if !operations_commute(oa, ob) {
-                        return Err((oa.operation_name.clone(), ob.operation_name.clone()));
-                    }
-                }
-            }
-        }
-    }
-    Ok(())
-}
-
-/// Analyze whether a `ParallelEffect` workflow can be scheduled concurrently.
-///
-/// This remains the native Rust bridge for `src/v3/lenses/parallelism.dag`
-/// while that lens surface is still pending full `.dag` ownership.
-pub fn analyze_parallelism(d: &Dag, workflow_root: NodeId) -> WorkflowParallelismReport {
-    let Some(workflow) = d.lane2_workflow_effect_at(&workflow_root) else {
-        return parallel_unsupported(
-            ParallelismUnsupportedKind::NoWorkflowProjection,
-            "no WorkflowEffect projection on this substrate node — analysis reads only `Value`/`Bind` fields set by lowering or `try_register_lane2_workflow_effect`",
-        );
-    };
-    let WorkflowEffect::ParallelEffect { branches } = workflow else {
-        return parallel_unsupported(
-            ParallelismUnsupportedKind::NotParallelEffectRoot,
-            "parallelism lens analyzes `ParallelEffect` roots only",
-        );
-    };
-
-    let Some(branch_ops) = extract_linear_branches(branches) else {
-        return parallel_unsupported(
-            ParallelismUnsupportedKind::NonLinearParallelBranch,
-            "Stage 2e v1 requires every parallel branch to be `LinearEffect`",
-        );
-    };
-
-    if let Some(b) = first_breaking_across_branches(&branch_ops) {
-        return WorkflowParallelismReport::ParallelCompositionVerdict(
-            CompositionVerdict::BrokenBy { first_breaker: b },
-        );
-    }
-
-    match pairwise_cross_branch_commutes(&branch_ops) {
-        Ok(()) => WorkflowParallelismReport::ParallelCompositionVerdict(
-            CompositionVerdict::IdempotentComposition,
-        ),
-        Err((a, b)) => parallel_unsupported(
-            ParallelismUnsupportedKind::PairwiseNonCommute,
-            format!("operations `{a}` and `{b}` do not commute under parallel scheduling"),
-        ),
-    }
-}
-
-/// Scalar scheduling hint for R3 T-Free-Consequences `Lens<Iteration-Independence>` demos.
-///
-/// Returns `1` when `lane2_workflow` at `workflow_root` is a [`WorkflowEffect::LoopEffect`] whose
-/// body is a [`WorkflowEffect::LinearEffect`] consisting **only** of read-shaped idempotent
-/// operations — the v1 conservative witness that cross-iteration reorder is as safe as
-/// cross-branch read-only [`WorkflowEffect::ParallelEffect`] scheduling (DB-20 pairwise read
-/// commutativity). Any other workflow shape, empty body, or missing projection returns `0`
-/// (sequential emission / fail-closed).
-pub fn loop_iteration_parallel_emission_indicator(d: &Dag, workflow_root: NodeId) -> i64 {
-    let Some(workflow) = d.lane2_workflow_effect_at(&workflow_root) else {
-        return 0;
-    };
-    let WorkflowEffect::LoopEffect { body } = workflow else {
-        return 0;
-    };
-    let WorkflowEffect::LinearEffect { ops } = body.as_ref() else {
-        return 0;
-    };
-    if ops.is_empty() {
-        return 0;
-    }
-    for op in ops {
-        if !matches!(
-            op.shape,
-            EffectShape::IsIdempotent(IdempotentShape::ReadEffect)
-        ) {
-            return 0;
-        }
-    }
-    1
-}
-
-#[cfg(test)]
-mod loop_iteration_parallel_emission_indicator_tests {
-    use super::*;
-    use crate::compile_to_dag;
-    use crate::dag::{Behavior, KeySource, NodeId};
-
-    fn trivial_anchor(dag: &Dag) -> NodeId {
-        dag.nodes()
-            .iter()
-            .find(|b| matches!(b, Behavior::Value(_) | Behavior::Bind(_)))
-            .expect("trivial program anchor")
-            .id()
-    }
-
-    #[test]
-    fn read_only_loop_body_projects_parallel_indicator() {
-        let mut dag =
-            compile_to_dag("let _: Int = 0", "loop_iter_indicator_fixture.v3").expect("compile");
-        let root = trivial_anchor(&dag);
-        let wf = WorkflowEffect::LoopEffect {
-            body: Box::new(WorkflowEffect::LinearEffect {
-                ops: vec![OperationEffect {
-                    operation_name: "r".to_string(),
-                    shape: EffectShape::IsIdempotent(IdempotentShape::ReadEffect),
-                }],
-            }),
-        };
-        assert!(dag.try_register_lane2_workflow_effect(root, wf));
-        assert_eq!(loop_iteration_parallel_emission_indicator(&dag, root), 1);
-    }
-
-    #[test]
-    fn upsert_loop_body_projects_sequential_indicator() {
-        let mut dag =
-            compile_to_dag("let _: Int = 0", "loop_iter_indicator_fixture.v3").expect("compile");
-        let root = trivial_anchor(&dag);
-        let wf = WorkflowEffect::LoopEffect {
-            body: Box::new(WorkflowEffect::LinearEffect {
-                ops: vec![OperationEffect {
-                    operation_name: "u".to_string(),
-                    shape: EffectShape::IsIdempotent(IdempotentShape::UpsertEffect {
-                        key_source: KeySource::PathParam {
-                            param: "id".to_string(),
-                        },
-                    }),
-                }],
-            }),
-        };
-        assert!(dag.try_register_lane2_workflow_effect(root, wf));
-        assert_eq!(loop_iteration_parallel_emission_indicator(&dag, root), 0);
-    }
-
-    #[test]
-    fn missing_lane2_workflow_projects_sequential_indicator() {
-        let dag =
-            compile_to_dag("let _: Int = 0", "loop_iter_indicator_fixture.v3").expect("compile");
-        let root = trivial_anchor(&dag);
-        assert_eq!(loop_iteration_parallel_emission_indicator(&dag, root), 0);
-    }
-}
diff --git a/src/v3/compiler/tests/integration/sg6_hand_authored_census_test.rs b/src/v3/compiler/tests/integration/sg6_hand_authored_census_test.rs
index 520fde7b658..ee1c039f4ab 100644
--- a/src/v3/compiler/tests/integration/sg6_hand_authored_census_test.rs
+++ b/src/v3/compiler/tests/integration/sg6_hand_authored_census_test.rs
@@ -348,11 +348,6 @@ fn sg6_regen_dag_registry_triples_are_pinned() {
             "src/v3/lenses/effect_enumeration.dag",
             "src/v3/compiler/src/lens_effect_enumeration_generated.rs",
         ),
-        (
-            "parallelism",
-            "src/v3/lenses/parallelism.dag",
-            "src/v3/compiler/src/lens_parallelism_generated.rs",
-        ),
         (
             "infer_helpers",
             "src/v3/lenses/infer_helpers.dag",
@@ -363,6 +358,11 @@ fn sg6_regen_dag_registry_triples_are_pinned() {
             "src/v3/lenses/lower_helpers.dag",
             "src/v3/compiler/src/lower_helpers_generated.rs",
         ),
+        (
+            "parallelism",
+            "src/v3/lenses/parallelism.dag",
+            "src/v3/compiler/src/lens_parallelism_generated.rs",
+        ),
         (
             "provenance",
             "src/v3/lenses/provenance.dag",
diff --git a/src/v3/lenses/parallelism.dag b/src/v3/lenses/parallelism.dag
index e5256a6641b..35f8f71d04b 100644
--- a/src/v3/lenses/parallelism.dag
+++ b/src/v3/lenses/parallelism.dag
@@ -3,8 +3,7 @@
 // Status: STRUCTURALLY TERMINAL; BEHAVIORALLY COMPLETE.
 // See docs/v3-lens-capability-register.md.
 //
-// Port authority: retired hand-Rust `src/v3/compiler/src/workflow_parallelism.rs`
-// (2026-05-12), specifically:
+// Port authority: retired hand-Rust Stage 2e bridge (2026-05-12), specifically:
 //   - `idempotent_operations_commute`
 //   - `first_breaking_across_branches`
 //   - `extract_linear_branches`
diff --git a/src/v3/std/effects.dag b/src/v3/std/effects.dag
index e4f5cb01084..7ee9d2e23b0 100644
--- a/src/v3/std/effects.dag
+++ b/src/v3/std/effects.dag
@@ -298,7 +298,7 @@ fn last_path_param(template: PathTemplate) -> String? {
 // story). Lane 2 Stage 2e **parallel** scheduling does **not** treat
 // Upsert×Upsert as commuting on that key alone — concurrent-write commutativity
 // needs a value/merge witness not modeled here (fail-closed in
-// `workflow_parallelism` until the algebra grows one).
+// `lenses.parallelism` until the algebra grows one).
 type IdempotentShape
   = ReadEffect
   | UpsertEffect { key_source: KeySource }
diff --git a/src/v3/std/services.dag b/src/v3/std/services.dag
index 6eb2df14201..fac0b3646ec 100644
--- a/src/v3/std/services.dag
+++ b/src/v3/std/services.dag
@@ -43,7 +43,7 @@ import v3.spec.v3_l1 { DeclarationRef }
 //
 // Downstream consumers (after PR-β..ω land):
 //   - `analyze_workflow` / `analyze_parallelism`
-//     (`src/v3/compiler/src/dag/effects.rs`, `workflow_parallelism.rs`) derive
+//     (`src/v3/compiler/src/dag/effects.rs`, `lenses/parallelism.dag`) derive
 //     `OperationEffect` per `std.effects::derive_op_effect(method, path)` from
 //     loaded `Operation` records; authored `lane2_workflow` retires.
 //   - `OperationEffect` substrate type

From 09a83cad535b96a42ad9fff6be7731ac16bcac64 Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gmail.com>
Date: Tue, 12 May 2026 22:04:26 +0000
Subject: [PATCH 06/17] Align parallelism diagnostic projection

---
 src/v3/compiler/src/lens_parallelism_generated.rs      |  4 ++--
 .../integration/lane2_stage_2e_parallelism_test.rs     | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/v3/compiler/src/lens_parallelism_generated.rs b/src/v3/compiler/src/lens_parallelism_generated.rs
index 44d9ea777cd..bb46684a054 100644
--- a/src/v3/compiler/src/lens_parallelism_generated.rs
+++ b/src/v3/compiler/src/lens_parallelism_generated.rs
@@ -118,9 +118,9 @@ pub fn analyze_parallelism(p0: &Dag, p1: NodeId) -> WorkflowParallelismReport {
         Ok(()) => WorkflowParallelismReport::ParallelCompositionVerdict(
             CompositionVerdict::IdempotentComposition,
         ),
-        Err((a, b)) => parallel_unsupported(
+        Err((_a, _b)) => parallel_unsupported(
             ParallelismUnsupportedKind::PairwiseNonCommute,
-            format!("operations `{a}` and `{b}` do not commute under parallel scheduling"),
+            "parallel branch operations do not commute under parallel scheduling",
         ),
     }
 }
diff --git a/src/v3/compiler/tests/integration/lane2_stage_2e_parallelism_test.rs b/src/v3/compiler/tests/integration/lane2_stage_2e_parallelism_test.rs
index 1b08f690dc0..0f78bb50d35 100644
--- a/src/v3/compiler/tests/integration/lane2_stage_2e_parallelism_test.rs
+++ b/src/v3/compiler/tests/integration/lane2_stage_2e_parallelism_test.rs
@@ -185,7 +185,10 @@ fn parallel_different_path_param_names_not_proven_commute() {
         panic!("expected ParallelismUnsupported — distinct PathParam names are not a disjointness proof");
     };
     assert_eq!(d.kind, ParallelismUnsupportedKind::PairwiseNonCommute);
-    assert!(d.reason.contains("put_a") && d.reason.contains("put_b"));
+    assert_eq!(
+        d.reason,
+        "parallel branch operations do not commute under parallel scheduling"
+    );
 }
 
 #[test]
@@ -214,7 +217,10 @@ fn parallel_read_vs_upsert_does_not_commute() {
     };
     assert_eq!(d.kind, ParallelismUnsupportedKind::PairwiseNonCommute);
     assert_eq!(d.downstream_stage, "lane2_stage2e_parallelism_lens");
-    assert!(d.reason.contains("get") && d.reason.contains("put"));
+    assert_eq!(
+        d.reason,
+        "parallel branch operations do not commute under parallel scheduling"
+    );
 }
 
 #[test]

From a729411675d04e2d73b80f0f64cfda9f6fbc49ac Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gmail.com>
Date: Tue, 12 May 2026 22:07:00 +0000
Subject: [PATCH 07/17] Format parallelism lens call

---
 src/v3/compiler/src/lens_apply.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/v3/compiler/src/lens_apply.rs b/src/v3/compiler/src/lens_apply.rs
index a8f93dccef2..5eec3e7ba95 100644
--- a/src/v3/compiler/src/lens_apply.rs
+++ b/src/v3/compiler/src/lens_apply.rs
@@ -351,9 +351,7 @@ pub fn apply_lens_declaration(
         if decl.name.as_deref() == Some("auto_loop_parallelism_pending_lens") && inputs.len() == 1 {
             let v = pu
                 .workflow_lane2_subject()
-                .map(|subject| {
-                    crate::loop_iteration_parallel_emission_indicator(pu, subject)
-                })
+                .map(|subject| crate::loop_iteration_parallel_emission_indicator(pu, subject))
                 .unwrap_or(0);
             return Ok(FieldValue::Literal(LiteralBits::Int(v.to_string())));
         }

From 828948674e0ce5ee99cf3c8623e126a6bb946de8 Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gmail.com>
Date: Tue, 12 May 2026 22:12:21 +0000
Subject: [PATCH 08/17] Refresh parallelism bootstrap snapshots

---
 src/v3/compiler/src/bootstrap_generated.rs    | 276 +++++++++---------
 ...otstrap_generated_without_parse_surface.rs | 276 +++++++++---------
 2 files changed, 276 insertions(+), 276 deletions(-)

diff --git a/src/v3/compiler/src/bootstrap_generated.rs b/src/v3/compiler/src/bootstrap_generated.rs
index 693eaeea8b7..a44dd00c831 100644
--- a/src/v3/compiler/src/bootstrap_generated.rs
+++ b/src/v3/compiler/src/bootstrap_generated.rs
@@ -24930,7 +24930,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 14330, 14451),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14328, 14449),
         });
         declarations.push(Declaration {
             id: DeclarationId(737),
@@ -24955,7 +24955,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 14674, 14749),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14672, 14747),
         });
         declarations.push(Declaration {
             id: DeclarationId(738),
@@ -24980,7 +24980,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 15150, 15230),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15148, 15228),
         });
         declarations.push(Declaration {
             id: DeclarationId(739),
@@ -25005,7 +25005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 15722, 15796),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15720, 15794),
         });
         declarations.push(Declaration {
             id: DeclarationId(740),
@@ -25034,7 +25034,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 16482, 16603),
+            span: SourceSpan::new("src/v3/std/effects.dag", 16480, 16601),
         });
         declarations.push(Declaration {
             id: DeclarationId(741),
@@ -25063,7 +25063,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 17251, 17349),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17249, 17347),
         });
         declarations.push(Declaration {
             id: DeclarationId(742),
@@ -25071,7 +25071,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(738)],
                 output: DeclarationId(128),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 17576, 17648)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 17574, 17646)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25081,7 +25081,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 17524, 17648),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17522, 17646),
         });
         declarations.push(Declaration {
             id: DeclarationId(743),
@@ -25089,7 +25089,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(738)],
                 output: DeclarationId(741),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 17861, 18381)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 17859, 18379)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25099,7 +25099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 17787, 18381),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17785, 18379),
         });
         declarations.push(Declaration {
             id: DeclarationId(744),
@@ -25124,7 +25124,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 19065, 19135),
+            span: SourceSpan::new("src/v3/std/effects.dag", 19063, 19133),
         });
         declarations.push(Declaration {
             id: DeclarationId(745),
@@ -25153,7 +25153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 19489, 19789),
+            span: SourceSpan::new("src/v3/std/effects.dag", 19487, 19787),
         });
         declarations.push(Declaration {
             id: DeclarationId(746),
@@ -25178,7 +25178,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20510, 20619),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20508, 20617),
         });
         declarations.push(Declaration {
             id: DeclarationId(747),
@@ -25186,7 +25186,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744)],
                 output: DeclarationId(128),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20809, 20884)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20807, 20882)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25196,7 +25196,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20755, 20884),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20753, 20882),
         });
         declarations.push(Declaration {
             id: DeclarationId(748),
@@ -25204,7 +25204,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
                 output: DeclarationId(1820),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20944, 20966)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20942, 20964)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25214,7 +25214,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20886, 20966),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20884, 20964),
         });
         declarations.push(Declaration {
             id: DeclarationId(749),
@@ -25222,7 +25222,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1821)],
                 output: DeclarationId(1823),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21060, 21153)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21058, 21151)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25232,7 +25232,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20968, 21153),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20966, 21151),
         });
         declarations.push(Declaration {
             id: DeclarationId(750),
@@ -25240,7 +25240,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1824)],
                 output: DeclarationId(1826),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21240, 21423)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21238, 21421)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25250,7 +25250,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21155, 21423),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21153, 21421),
         });
         declarations.push(Declaration {
             id: DeclarationId(751),
@@ -25258,7 +25258,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1827)],
                 output: DeclarationId(746),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22313, 22436)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22311, 22434)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25268,7 +25268,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 22240, 22436),
+            span: SourceSpan::new("src/v3/std/effects.dag", 22238, 22434),
         });
         declarations.push(Declaration {
             id: DeclarationId(752),
@@ -25287,7 +25287,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 23637, 23672),
+            span: SourceSpan::new("src/v3/std/effects.dag", 23635, 23670),
         });
         declarations.push(Declaration {
             id: DeclarationId(753),
@@ -25312,7 +25312,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 23757, 23823),
+            span: SourceSpan::new("src/v3/std/effects.dag", 23755, 23821),
         });
         declarations.push(Declaration {
             id: DeclarationId(754),
@@ -25345,7 +25345,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 24499, 24727),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24497, 24725),
         });
         declarations.push(Declaration {
             id: DeclarationId(755),
@@ -25374,7 +25374,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 25086, 25190),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25084, 25188),
         });
         declarations.push(Declaration {
             id: DeclarationId(756),
@@ -25399,7 +25399,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 25329, 25467),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25327, 25465),
         });
         declarations.push(Declaration {
             id: DeclarationId(757),
@@ -25407,7 +25407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230), DeclarationId(230), DeclarationId(230)],
                 output: DeclarationId(756),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 25609, 25765)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 25607, 25763)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25417,7 +25417,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 25469, 25765),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25467, 25763),
         });
         declarations.push(Declaration {
             id: DeclarationId(758),
@@ -25454,7 +25454,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 25928, 26084),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25926, 26082),
         });
         declarations.push(Declaration {
             id: DeclarationId(759),
@@ -25483,7 +25483,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 26086, 26202),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26084, 26200),
         });
         declarations.push(Declaration {
             id: DeclarationId(760),
@@ -25508,7 +25508,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 26366, 26504),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26364, 26502),
         });
         declarations.push(Declaration {
             id: DeclarationId(761),
@@ -25516,7 +25516,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(758), DeclarationId(230)],
                 output: DeclarationId(760),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 26625, 26780)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 26623, 26778)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25526,7 +25526,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 26506, 26780),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26504, 26778),
         });
         declarations.push(Declaration {
             id: DeclarationId(762),
@@ -25534,7 +25534,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(754)],
                 output: DeclarationId(756),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 27018, 27848)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 27016, 27846)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25544,7 +25544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 26932, 27848),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26930, 27846),
         });
         declarations.push(Declaration {
             id: DeclarationId(763),
@@ -25552,7 +25552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230)],
                 output: DeclarationId(1828),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 29707, 30005)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 29705, 30003)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25562,7 +25562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 29658, 30005),
+            span: SourceSpan::new("src/v3/std/effects.dag", 29656, 30003),
         });
         declarations.push(Declaration {
             id: DeclarationId(764),
@@ -25570,7 +25570,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(198)],
                 output: DeclarationId(738),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30060, 30136)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30058, 30134)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25580,7 +25580,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30007, 30136),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30005, 30134),
         });
         declarations.push(Declaration {
             id: DeclarationId(765),
@@ -25588,7 +25588,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1829), DeclarationId(198)],
                 output: DeclarationId(738),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30476, 30628)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30474, 30626)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25598,7 +25598,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30400, 30628),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30398, 30626),
         });
         declarations.push(Declaration {
             id: DeclarationId(766),
@@ -25606,7 +25606,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1830), DeclarationId(198)],
                 output: DeclarationId(738),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30706, 30858)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30704, 30856)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25616,7 +25616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30630, 30858),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30628, 30856),
         });
         declarations.push(Declaration {
             id: DeclarationId(767),
@@ -25624,7 +25624,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(198), DeclarationId(730)],
                 output: DeclarationId(738),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30944, 31429)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30942, 31427)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25634,7 +25634,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30860, 31429),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30858, 31427),
         });
         declarations.push(Declaration {
             id: DeclarationId(768),
@@ -25642,7 +25642,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230), DeclarationId(198), DeclarationId(730)],
                 output: DeclarationId(745),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 31547, 31731)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 31545, 31729)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25652,7 +25652,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 31431, 31731),
+            span: SourceSpan::new("src/v3/std/effects.dag", 31429, 31729),
         });
         declarations.push(Declaration {
             id: DeclarationId(769),
@@ -25681,7 +25681,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 32431, 32548),
+            span: SourceSpan::new("src/v3/std/effects.dag", 32429, 32546),
         });
         declarations.push(Declaration {
             id: DeclarationId(770),
@@ -25706,7 +25706,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 32995, 33095),
+            span: SourceSpan::new("src/v3/std/effects.dag", 32993, 33093),
         });
         declarations.push(Declaration {
             id: DeclarationId(771),
@@ -25739,7 +25739,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 33097, 33247),
+            span: SourceSpan::new("src/v3/std/effects.dag", 33095, 33245),
         });
         declarations.push(Declaration {
             id: DeclarationId(772),
@@ -25747,7 +25747,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(737)],
                 output: DeclarationId(769),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 33886, 34428)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 33884, 34426)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25757,7 +25757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 33807, 34428),
+            span: SourceSpan::new("src/v3/std/effects.dag", 33805, 34426),
         });
         declarations.push(Declaration {
             id: DeclarationId(773),
@@ -25765,7 +25765,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(738)],
                 output: DeclarationId(769),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 34832, 35274)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 34830, 35272)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25775,7 +25775,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 34760, 35274),
+            span: SourceSpan::new("src/v3/std/effects.dag", 34758, 35272),
         });
         declarations.push(Declaration {
             id: DeclarationId(774),
@@ -25783,7 +25783,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744), DeclarationId(128), DeclarationId(128)],
                 output: DeclarationId(771),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 35406, 36055)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 35404, 36053)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25793,7 +25793,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 35276, 36055),
+            span: SourceSpan::new("src/v3/std/effects.dag", 35274, 36053),
         });
         declarations.push(Declaration {
             id: DeclarationId(775),
@@ -25826,7 +25826,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 36407, 36535),
+            span: SourceSpan::new("src/v3/std/effects.dag", 36405, 36533),
         });
         declarations.push(Declaration {
             id: DeclarationId(776),
@@ -25834,7 +25834,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1831)],
                 output: DeclarationId(1832),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 36640, 36910)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 36638, 36908)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25844,7 +25844,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 36537, 36910),
+            span: SourceSpan::new("src/v3/std/effects.dag", 36535, 36908),
         });
         declarations.push(Declaration {
             id: DeclarationId(777),
@@ -25873,7 +25873,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 37227, 37318),
+            span: SourceSpan::new("src/v3/std/effects.dag", 37225, 37316),
         });
         declarations.push(Declaration {
             id: DeclarationId(778),
@@ -39613,7 +39613,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/services.dag", 3670, 3688),
+            span: SourceSpan::new("src/v3/std/services.dag", 3669, 3687),
         });
         declarations.push(Declaration {
             id: DeclarationId(1191),
@@ -39638,7 +39638,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/services.dag", 4600, 4672),
+            span: SourceSpan::new("src/v3/std/services.dag", 4599, 4671),
         });
         declarations.push(Declaration {
             id: DeclarationId(1192),
@@ -39657,7 +39657,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/services.dag", 5480, 5523),
+            span: SourceSpan::new("src/v3/std/services.dag", 5479, 5522),
         });
         declarations.push(Declaration {
             id: DeclarationId(1193),
@@ -39686,7 +39686,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/services.dag", 6732, 6842),
+            span: SourceSpan::new("src/v3/std/services.dag", 6731, 6841),
         });
         declarations.push(Declaration {
             id: DeclarationId(1194),
@@ -67001,7 +67001,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20916, 20943),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20914, 20941),
         });
         declarations.push(Declaration {
             id: DeclarationId(1821),
@@ -67021,7 +67021,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20995, 21026),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20993, 21024),
         });
         declarations.push(Declaration {
             id: DeclarationId(1822),
@@ -67041,7 +67041,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21058),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21056),
         });
         declarations.push(Declaration {
             id: DeclarationId(1823),
@@ -67060,7 +67060,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
         });
         declarations.push(Declaration {
             id: DeclarationId(1824),
@@ -67080,7 +67080,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21185, 21206),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21183, 21204),
         });
         declarations.push(Declaration {
             id: DeclarationId(1825),
@@ -67100,7 +67100,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21238),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21236),
         });
         declarations.push(Declaration {
             id: DeclarationId(1826),
@@ -67119,7 +67119,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21237),
         });
         declarations.push(Declaration {
             id: DeclarationId(1827),
@@ -67139,7 +67139,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 22268, 22289),
+            span: SourceSpan::new("src/v3/std/effects.dag", 22266, 22287),
         });
         declarations.push(Declaration {
             id: DeclarationId(1828),
@@ -67158,7 +67158,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706),
+            span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
         });
         declarations.push(Declaration {
             id: DeclarationId(1829),
@@ -67177,7 +67177,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
         });
         declarations.push(Declaration {
             id: DeclarationId(1830),
@@ -67196,7 +67196,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30660, 30667),
         });
         declarations.push(Declaration {
             id: DeclarationId(1831),
@@ -67216,7 +67216,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 36581, 36602),
+            span: SourceSpan::new("src/v3/std/effects.dag", 36579, 36600),
         });
         declarations.push(Declaration {
             id: DeclarationId(1832),
@@ -67236,7 +67236,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 36608, 36639),
+            span: SourceSpan::new("src/v3/std/effects.dag", 36606, 36637),
         });
         declarations.push(Declaration {
             id: DeclarationId(1833),
@@ -67420,7 +67420,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 14355, 14365),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14353, 14363),
         });
         declarations.push(Declaration {
             id: DeclarationId(1842),
@@ -67439,7 +67439,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 14370, 14408),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14368, 14406),
         });
         declarations.push(Declaration {
             id: DeclarationId(1843),
@@ -67458,7 +67458,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 14413, 14451),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14411, 14449),
         });
         declarations.push(Declaration {
             id: DeclarationId(1844),
@@ -67477,7 +67477,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 14697, 14732),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14695, 14730),
         });
         declarations.push(Declaration {
             id: DeclarationId(1845),
@@ -67491,7 +67491,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 14737, 14749),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14735, 14747),
         });
         declarations.push(Declaration {
             id: DeclarationId(1846),
@@ -67510,7 +67510,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 15171, 15200),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15169, 15198),
         });
         declarations.push(Declaration {
             id: DeclarationId(1847),
@@ -67529,7 +67529,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 15205, 15230),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15203, 15228),
         });
         declarations.push(Declaration {
             id: DeclarationId(1848),
@@ -67543,7 +67543,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 15743, 15753),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15741, 15751),
         });
         declarations.push(Declaration {
             id: DeclarationId(1849),
@@ -67562,7 +67562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 15758, 15796),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15756, 15794),
         });
         declarations.push(Declaration {
             id: DeclarationId(1850),
@@ -67581,7 +67581,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 16501, 16528),
+            span: SourceSpan::new("src/v3/std/effects.dag", 16499, 16526),
         });
         declarations.push(Declaration {
             id: DeclarationId(1851),
@@ -67600,7 +67600,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 16533, 16561),
+            span: SourceSpan::new("src/v3/std/effects.dag", 16531, 16559),
         });
         declarations.push(Declaration {
             id: DeclarationId(1852),
@@ -67620,7 +67620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 16589, 16601),
+            span: SourceSpan::new("src/v3/std/effects.dag", 16587, 16599),
         });
         declarations.push(Declaration {
             id: DeclarationId(1853),
@@ -67639,7 +67639,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 16566, 16603),
+            span: SourceSpan::new("src/v3/std/effects.dag", 16564, 16601),
         });
         declarations.push(Declaration {
             id: DeclarationId(1854),
@@ -67653,7 +67653,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 17280, 17293),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17278, 17291),
         });
         declarations.push(Declaration {
             id: DeclarationId(1855),
@@ -67667,7 +67667,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 17298, 17312),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17296, 17310),
         });
         declarations.push(Declaration {
             id: DeclarationId(1856),
@@ -67686,7 +67686,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 17317, 17349),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17315, 17347),
         });
         declarations.push(Declaration {
             id: DeclarationId(1857),
@@ -67705,7 +67705,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 19519, 19560),
+            span: SourceSpan::new("src/v3/std/effects.dag", 19517, 19558),
         });
         declarations.push(Declaration {
             id: DeclarationId(1858),
@@ -67730,7 +67730,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 19565, 19634),
+            span: SourceSpan::new("src/v3/std/effects.dag", 19563, 19632),
         });
         declarations.push(Declaration {
             id: DeclarationId(1859),
@@ -67767,7 +67767,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 19639, 19789),
+            span: SourceSpan::new("src/v3/std/effects.dag", 19637, 19787),
         });
         declarations.push(Declaration {
             id: DeclarationId(1860),
@@ -67781,7 +67781,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20538, 20559),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20536, 20557),
         });
         declarations.push(Declaration {
             id: DeclarationId(1861),
@@ -67801,7 +67801,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20590, 20617),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20588, 20615),
         });
         declarations.push(Declaration {
             id: DeclarationId(1862),
@@ -67820,7 +67820,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20564, 20619),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20562, 20617),
         });
         declarations.push(Declaration {
             id: DeclarationId(1863),
@@ -67840,7 +67840,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 24543, 24564),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24541, 24562),
         });
         declarations.push(Declaration {
             id: DeclarationId(1864),
@@ -67859,7 +67859,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 24523, 24566),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24521, 24564),
         });
         declarations.push(Declaration {
             id: DeclarationId(1865),
@@ -67879,7 +67879,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 24592, 24619),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24590, 24617),
         });
         declarations.push(Declaration {
             id: DeclarationId(1866),
@@ -67898,7 +67898,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 24571, 24621),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24569, 24619),
         });
         declarations.push(Declaration {
             id: DeclarationId(1867),
@@ -67917,7 +67917,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 24626, 24661),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24624, 24659),
         });
         declarations.push(Declaration {
             id: DeclarationId(1868),
@@ -67937,7 +67937,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 24693, 24725),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24691, 24723),
         });
         declarations.push(Declaration {
             id: DeclarationId(1869),
@@ -67956,7 +67956,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 24666, 24727),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24664, 24725),
         });
         declarations.push(Declaration {
             id: DeclarationId(1870),
@@ -67975,7 +67975,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 25364, 25410),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25362, 25408),
         });
         declarations.push(Declaration {
             id: DeclarationId(1871),
@@ -67994,7 +67994,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 25415, 25467),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25413, 25465),
         });
         declarations.push(Declaration {
             id: DeclarationId(1872),
@@ -68008,7 +68008,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 25964, 25984),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25962, 25982),
         });
         declarations.push(Declaration {
             id: DeclarationId(1873),
@@ -68022,7 +68022,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 25989, 26010),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25987, 26008),
         });
         declarations.push(Declaration {
             id: DeclarationId(1874),
@@ -68036,7 +68036,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 26015, 26038),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26013, 26036),
         });
         declarations.push(Declaration {
             id: DeclarationId(1875),
@@ -68050,7 +68050,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 26043, 26061),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26041, 26059),
         });
         declarations.push(Declaration {
             id: DeclarationId(1876),
@@ -68064,7 +68064,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 26066, 26084),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26064, 26082),
         });
         declarations.push(Declaration {
             id: DeclarationId(1877),
@@ -68083,7 +68083,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 26401, 26447),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26399, 26445),
         });
         declarations.push(Declaration {
             id: DeclarationId(1878),
@@ -68102,7 +68102,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 26452, 26504),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26450, 26502),
         });
         declarations.push(Declaration {
             id: DeclarationId(1879),
@@ -68116,7 +68116,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 32458, 32464),
+            span: SourceSpan::new("src/v3/std/effects.dag", 32456, 32462),
         });
         declarations.push(Declaration {
             id: DeclarationId(1880),
@@ -68135,7 +68135,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 32469, 32506),
+            span: SourceSpan::new("src/v3/std/effects.dag", 32467, 32504),
         });
         declarations.push(Declaration {
             id: DeclarationId(1881),
@@ -68154,7 +68154,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 32511, 32548),
+            span: SourceSpan::new("src/v3/std/effects.dag", 32509, 32546),
         });
         declarations.push(Declaration {
             id: DeclarationId(1882),
@@ -68168,7 +68168,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 33022, 33041),
+            span: SourceSpan::new("src/v3/std/effects.dag", 33020, 33039),
         });
         declarations.push(Declaration {
             id: DeclarationId(1883),
@@ -68187,7 +68187,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 33046, 33095),
+            span: SourceSpan::new("src/v3/std/effects.dag", 33044, 33093),
         });
         declarations.push(Declaration {
             id: DeclarationId(1884),
@@ -80061,7 +80061,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/services.dag", 6785, 6808),
+            span: SourceSpan::new("src/v3/std/services.dag", 6784, 6807),
         });
         declarations.push(Declaration {
             id: DeclarationId(2506),
@@ -89019,7 +89019,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
         });
         declarations.push(Declaration {
             id: DeclarationId(2998),
@@ -89033,7 +89033,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
         });
         declarations.push(Declaration {
             id: DeclarationId(2999),
@@ -89058,7 +89058,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
         });
         declarations.push(Declaration {
             id: DeclarationId(3000),
@@ -89077,7 +89077,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21237),
         });
         declarations.push(Declaration {
             id: DeclarationId(3001),
@@ -89091,7 +89091,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21237),
         });
         declarations.push(Declaration {
             id: DeclarationId(3002),
@@ -89116,7 +89116,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21237),
         });
         declarations.push(Declaration {
             id: DeclarationId(3003),
@@ -89135,7 +89135,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706),
+            span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
         });
         declarations.push(Declaration {
             id: DeclarationId(3004),
@@ -89149,7 +89149,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706),
+            span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
         });
         declarations.push(Declaration {
             id: DeclarationId(3005),
@@ -89174,7 +89174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706),
+            span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
         });
         declarations.push(Declaration {
             id: DeclarationId(3006),
@@ -89193,7 +89193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
         });
         declarations.push(Declaration {
             id: DeclarationId(3007),
@@ -89207,7 +89207,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
         });
         declarations.push(Declaration {
             id: DeclarationId(3008),
@@ -89232,7 +89232,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
         });
         declarations.push(Declaration {
             id: DeclarationId(3009),
@@ -89251,7 +89251,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30660, 30667),
         });
         declarations.push(Declaration {
             id: DeclarationId(3010),
@@ -89265,7 +89265,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30660, 30667),
         });
         declarations.push(Declaration {
             id: DeclarationId(3011),
@@ -89290,7 +89290,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30660, 30667),
         });
         declarations.push(Declaration {
             id: DeclarationId(3012),
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 2ca84d93fa3..2d5a21c1d69 100644
--- a/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs
+++ b/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs
@@ -24930,7 +24930,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/effects.dag", 14330, 14451),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14328, 14449),
         });
         declarations.push(Declaration {
             id: DeclarationId(737),
@@ -24955,7 +24955,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/effects.dag", 14674, 14749),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14672, 14747),
         });
         declarations.push(Declaration {
             id: DeclarationId(738),
@@ -24980,7 +24980,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/effects.dag", 15150, 15230),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15148, 15228),
         });
         declarations.push(Declaration {
             id: DeclarationId(739),
@@ -25005,7 +25005,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/effects.dag", 15722, 15796),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15720, 15794),
         });
         declarations.push(Declaration {
             id: DeclarationId(740),
@@ -25034,7 +25034,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/effects.dag", 16482, 16603),
+            span: SourceSpan::new("src/v3/std/effects.dag", 16480, 16601),
         });
         declarations.push(Declaration {
             id: DeclarationId(741),
@@ -25063,7 +25063,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/effects.dag", 17251, 17349),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17249, 17347),
         });
         declarations.push(Declaration {
             id: DeclarationId(742),
@@ -25071,7 +25071,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(738)],
                 output: DeclarationId(128),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 17576, 17648)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 17574, 17646)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25081,7 +25081,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/effects.dag", 17524, 17648),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17522, 17646),
         });
         declarations.push(Declaration {
             id: DeclarationId(743),
@@ -25089,7 +25089,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(738)],
                 output: DeclarationId(741),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 17861, 18381)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 17859, 18379)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25099,7 +25099,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/effects.dag", 17787, 18381),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17785, 18379),
         });
         declarations.push(Declaration {
             id: DeclarationId(744),
@@ -25124,7 +25124,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/effects.dag", 19065, 19135),
+            span: SourceSpan::new("src/v3/std/effects.dag", 19063, 19133),
         });
         declarations.push(Declaration {
             id: DeclarationId(745),
@@ -25153,7 +25153,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/effects.dag", 19489, 19789),
+            span: SourceSpan::new("src/v3/std/effects.dag", 19487, 19787),
         });
         declarations.push(Declaration {
             id: DeclarationId(746),
@@ -25178,7 +25178,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/effects.dag", 20510, 20619),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20508, 20617),
         });
         declarations.push(Declaration {
             id: DeclarationId(747),
@@ -25186,7 +25186,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744)],
                 output: DeclarationId(128),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20809, 20884)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20807, 20882)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25196,7 +25196,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/effects.dag", 20755, 20884),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20753, 20882),
         });
         declarations.push(Declaration {
             id: DeclarationId(748),
@@ -25204,7 +25204,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
                 output: DeclarationId(1436),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20944, 20966)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20942, 20964)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25214,7 +25214,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/effects.dag", 20886, 20966),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20884, 20964),
         });
         declarations.push(Declaration {
             id: DeclarationId(749),
@@ -25222,7 +25222,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1437)],
                 output: DeclarationId(1439),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21060, 21153)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21058, 21151)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25232,7 +25232,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/effects.dag", 20968, 21153),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20966, 21151),
         });
         declarations.push(Declaration {
             id: DeclarationId(750),
@@ -25240,7 +25240,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1440)],
                 output: DeclarationId(1442),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21240, 21423)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21238, 21421)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25250,7 +25250,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/effects.dag", 21155, 21423),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21153, 21421),
         });
         declarations.push(Declaration {
             id: DeclarationId(751),
@@ -25258,7 +25258,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1443)],
                 output: DeclarationId(746),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22313, 22436)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22311, 22434)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25268,7 +25268,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/effects.dag", 22240, 22436),
+            span: SourceSpan::new("src/v3/std/effects.dag", 22238, 22434),
         });
         declarations.push(Declaration {
             id: DeclarationId(752),
@@ -25287,7 +25287,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/effects.dag", 23637, 23672),
+            span: SourceSpan::new("src/v3/std/effects.dag", 23635, 23670),
         });
         declarations.push(Declaration {
             id: DeclarationId(753),
@@ -25312,7 +25312,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/effects.dag", 23757, 23823),
+            span: SourceSpan::new("src/v3/std/effects.dag", 23755, 23821),
         });
         declarations.push(Declaration {
             id: DeclarationId(754),
@@ -25345,7 +25345,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/effects.dag", 24499, 24727),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24497, 24725),
         });
         declarations.push(Declaration {
             id: DeclarationId(755),
@@ -25374,7 +25374,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/effects.dag", 25086, 25190),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25084, 25188),
         });
         declarations.push(Declaration {
             id: DeclarationId(756),
@@ -25399,7 +25399,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/effects.dag", 25329, 25467),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25327, 25465),
         });
         declarations.push(Declaration {
             id: DeclarationId(757),
@@ -25407,7 +25407,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230), DeclarationId(230), DeclarationId(230)],
                 output: DeclarationId(756),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 25609, 25765)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 25607, 25763)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25417,7 +25417,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/effects.dag", 25469, 25765),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25467, 25763),
         });
         declarations.push(Declaration {
             id: DeclarationId(758),
@@ -25454,7 +25454,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/effects.dag", 25928, 26084),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25926, 26082),
         });
         declarations.push(Declaration {
             id: DeclarationId(759),
@@ -25483,7 +25483,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/effects.dag", 26086, 26202),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26084, 26200),
         });
         declarations.push(Declaration {
             id: DeclarationId(760),
@@ -25508,7 +25508,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/effects.dag", 26366, 26504),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26364, 26502),
         });
         declarations.push(Declaration {
             id: DeclarationId(761),
@@ -25516,7 +25516,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(758), DeclarationId(230)],
                 output: DeclarationId(760),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 26625, 26780)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 26623, 26778)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25526,7 +25526,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/effects.dag", 26506, 26780),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26504, 26778),
         });
         declarations.push(Declaration {
             id: DeclarationId(762),
@@ -25534,7 +25534,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(754)],
                 output: DeclarationId(756),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 27018, 27848)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 27016, 27846)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25544,7 +25544,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/effects.dag", 26932, 27848),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26930, 27846),
         });
         declarations.push(Declaration {
             id: DeclarationId(763),
@@ -25552,7 +25552,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230)],
                 output: DeclarationId(1444),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 29707, 30005)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 29705, 30003)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25562,7 +25562,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/effects.dag", 29658, 30005),
+            span: SourceSpan::new("src/v3/std/effects.dag", 29656, 30003),
         });
         declarations.push(Declaration {
             id: DeclarationId(764),
@@ -25570,7 +25570,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(198)],
                 output: DeclarationId(738),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30060, 30136)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30058, 30134)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25580,7 +25580,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/effects.dag", 30007, 30136),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30005, 30134),
         });
         declarations.push(Declaration {
             id: DeclarationId(765),
@@ -25588,7 +25588,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1445), DeclarationId(198)],
                 output: DeclarationId(738),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30476, 30628)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30474, 30626)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25598,7 +25598,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/effects.dag", 30400, 30628),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30398, 30626),
         });
         declarations.push(Declaration {
             id: DeclarationId(766),
@@ -25606,7 +25606,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1446), DeclarationId(198)],
                 output: DeclarationId(738),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30706, 30858)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30704, 30856)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25616,7 +25616,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/effects.dag", 30630, 30858),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30628, 30856),
         });
         declarations.push(Declaration {
             id: DeclarationId(767),
@@ -25624,7 +25624,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(198), DeclarationId(730)],
                 output: DeclarationId(738),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30944, 31429)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30942, 31427)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25634,7 +25634,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/effects.dag", 30860, 31429),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30858, 31427),
         });
         declarations.push(Declaration {
             id: DeclarationId(768),
@@ -25642,7 +25642,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230), DeclarationId(198), DeclarationId(730)],
                 output: DeclarationId(745),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 31547, 31731)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 31545, 31729)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25652,7 +25652,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/effects.dag", 31431, 31731),
+            span: SourceSpan::new("src/v3/std/effects.dag", 31429, 31729),
         });
         declarations.push(Declaration {
             id: DeclarationId(769),
@@ -25681,7 +25681,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/effects.dag", 32431, 32548),
+            span: SourceSpan::new("src/v3/std/effects.dag", 32429, 32546),
         });
         declarations.push(Declaration {
             id: DeclarationId(770),
@@ -25706,7 +25706,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/effects.dag", 32995, 33095),
+            span: SourceSpan::new("src/v3/std/effects.dag", 32993, 33093),
         });
         declarations.push(Declaration {
             id: DeclarationId(771),
@@ -25739,7 +25739,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/effects.dag", 33097, 33247),
+            span: SourceSpan::new("src/v3/std/effects.dag", 33095, 33245),
         });
         declarations.push(Declaration {
             id: DeclarationId(772),
@@ -25747,7 +25747,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(737)],
                 output: DeclarationId(769),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 33886, 34428)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 33884, 34426)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25757,7 +25757,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/effects.dag", 33807, 34428),
+            span: SourceSpan::new("src/v3/std/effects.dag", 33805, 34426),
         });
         declarations.push(Declaration {
             id: DeclarationId(773),
@@ -25765,7 +25765,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(738)],
                 output: DeclarationId(769),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 34832, 35274)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 34830, 35272)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25775,7 +25775,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/effects.dag", 34760, 35274),
+            span: SourceSpan::new("src/v3/std/effects.dag", 34758, 35272),
         });
         declarations.push(Declaration {
             id: DeclarationId(774),
@@ -25783,7 +25783,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744), DeclarationId(128), DeclarationId(128)],
                 output: DeclarationId(771),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 35406, 36055)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 35404, 36053)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25793,7 +25793,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/effects.dag", 35276, 36055),
+            span: SourceSpan::new("src/v3/std/effects.dag", 35274, 36053),
         });
         declarations.push(Declaration {
             id: DeclarationId(775),
@@ -25826,7 +25826,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/effects.dag", 36407, 36535),
+            span: SourceSpan::new("src/v3/std/effects.dag", 36405, 36533),
         });
         declarations.push(Declaration {
             id: DeclarationId(776),
@@ -25834,7 +25834,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1447)],
                 output: DeclarationId(1448),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 36640, 36910)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 36638, 36908)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25844,7 +25844,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/effects.dag", 36537, 36910),
+            span: SourceSpan::new("src/v3/std/effects.dag", 36535, 36908),
         });
         declarations.push(Declaration {
             id: DeclarationId(777),
@@ -25873,7 +25873,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/effects.dag", 37227, 37318),
+            span: SourceSpan::new("src/v3/std/effects.dag", 37225, 37316),
         });
         declarations.push(Declaration {
             id: DeclarationId(778),
@@ -39130,7 +39130,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/services.dag", 3670, 3688),
+            span: SourceSpan::new("src/v3/std/services.dag", 3669, 3687),
         });
         declarations.push(Declaration {
             id: DeclarationId(1176),
@@ -39155,7 +39155,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/services.dag", 4600, 4672),
+            span: SourceSpan::new("src/v3/std/services.dag", 4599, 4671),
         });
         declarations.push(Declaration {
             id: DeclarationId(1177),
@@ -39174,7 +39174,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/services.dag", 5480, 5523),
+            span: SourceSpan::new("src/v3/std/services.dag", 5479, 5522),
         });
         declarations.push(Declaration {
             id: DeclarationId(1178),
@@ -39203,7 +39203,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/services.dag", 6732, 6842),
+            span: SourceSpan::new("src/v3/std/services.dag", 6731, 6841),
         });
         declarations.push(Declaration {
             id: DeclarationId(1179),
@@ -46420,7 +46420,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/effects.dag", 20916, 20943),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20914, 20941),
         });
         declarations.push(Declaration {
             id: DeclarationId(1437),
@@ -46440,7 +46440,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/effects.dag", 20995, 21026),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20993, 21024),
         });
         declarations.push(Declaration {
             id: DeclarationId(1438),
@@ -46460,7 +46460,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/effects.dag", 21031, 21058),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21056),
         });
         declarations.push(Declaration {
             id: DeclarationId(1439),
@@ -46479,7 +46479,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/effects.dag", 21031, 21059),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
         });
         declarations.push(Declaration {
             id: DeclarationId(1440),
@@ -46499,7 +46499,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/effects.dag", 21185, 21206),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21183, 21204),
         });
         declarations.push(Declaration {
             id: DeclarationId(1441),
@@ -46519,7 +46519,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/effects.dag", 21211, 21238),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21236),
         });
         declarations.push(Declaration {
             id: DeclarationId(1442),
@@ -46538,7 +46538,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/effects.dag", 21211, 21239),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21237),
         });
         declarations.push(Declaration {
             id: DeclarationId(1443),
@@ -46558,7 +46558,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/effects.dag", 22268, 22289),
+            span: SourceSpan::new("src/v3/std/effects.dag", 22266, 22287),
         });
         declarations.push(Declaration {
             id: DeclarationId(1444),
@@ -46577,7 +46577,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/effects.dag", 29695, 29706),
+            span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
         });
         declarations.push(Declaration {
             id: DeclarationId(1445),
@@ -46596,7 +46596,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/effects.dag", 30432, 30439),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
         });
         declarations.push(Declaration {
             id: DeclarationId(1446),
@@ -46615,7 +46615,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/effects.dag", 30662, 30669),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30660, 30667),
         });
         declarations.push(Declaration {
             id: DeclarationId(1447),
@@ -46635,7 +46635,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/effects.dag", 36581, 36602),
+            span: SourceSpan::new("src/v3/std/effects.dag", 36579, 36600),
         });
         declarations.push(Declaration {
             id: DeclarationId(1448),
@@ -46655,7 +46655,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/effects.dag", 36608, 36639),
+            span: SourceSpan::new("src/v3/std/effects.dag", 36606, 36637),
         });
         declarations.push(Declaration {
             id: DeclarationId(1449),
@@ -46839,7 +46839,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/effects.dag", 14355, 14365),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14353, 14363),
         });
         declarations.push(Declaration {
             id: DeclarationId(1458),
@@ -46858,7 +46858,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/effects.dag", 14370, 14408),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14368, 14406),
         });
         declarations.push(Declaration {
             id: DeclarationId(1459),
@@ -46877,7 +46877,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/effects.dag", 14413, 14451),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14411, 14449),
         });
         declarations.push(Declaration {
             id: DeclarationId(1460),
@@ -46896,7 +46896,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/effects.dag", 14697, 14732),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14695, 14730),
         });
         declarations.push(Declaration {
             id: DeclarationId(1461),
@@ -46910,7 +46910,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/effects.dag", 14737, 14749),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14735, 14747),
         });
         declarations.push(Declaration {
             id: DeclarationId(1462),
@@ -46929,7 +46929,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/effects.dag", 15171, 15200),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15169, 15198),
         });
         declarations.push(Declaration {
             id: DeclarationId(1463),
@@ -46948,7 +46948,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/effects.dag", 15205, 15230),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15203, 15228),
         });
         declarations.push(Declaration {
             id: DeclarationId(1464),
@@ -46962,7 +46962,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/effects.dag", 15743, 15753),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15741, 15751),
         });
         declarations.push(Declaration {
             id: DeclarationId(1465),
@@ -46981,7 +46981,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/effects.dag", 15758, 15796),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15756, 15794),
         });
         declarations.push(Declaration {
             id: DeclarationId(1466),
@@ -47000,7 +47000,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/effects.dag", 16501, 16528),
+            span: SourceSpan::new("src/v3/std/effects.dag", 16499, 16526),
         });
         declarations.push(Declaration {
             id: DeclarationId(1467),
@@ -47019,7 +47019,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/effects.dag", 16533, 16561),
+            span: SourceSpan::new("src/v3/std/effects.dag", 16531, 16559),
         });
         declarations.push(Declaration {
             id: DeclarationId(1468),
@@ -47039,7 +47039,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/effects.dag", 16589, 16601),
+            span: SourceSpan::new("src/v3/std/effects.dag", 16587, 16599),
         });
         declarations.push(Declaration {
             id: DeclarationId(1469),
@@ -47058,7 +47058,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/effects.dag", 16566, 16603),
+            span: SourceSpan::new("src/v3/std/effects.dag", 16564, 16601),
         });
         declarations.push(Declaration {
             id: DeclarationId(1470),
@@ -47072,7 +47072,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/effects.dag", 17280, 17293),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17278, 17291),
         });
         declarations.push(Declaration {
             id: DeclarationId(1471),
@@ -47086,7 +47086,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/effects.dag", 17298, 17312),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17296, 17310),
         });
         declarations.push(Declaration {
             id: DeclarationId(1472),
@@ -47105,7 +47105,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/effects.dag", 17317, 17349),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17315, 17347),
         });
         declarations.push(Declaration {
             id: DeclarationId(1473),
@@ -47124,7 +47124,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/effects.dag", 19519, 19560),
+            span: SourceSpan::new("src/v3/std/effects.dag", 19517, 19558),
         });
         declarations.push(Declaration {
             id: DeclarationId(1474),
@@ -47149,7 +47149,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/effects.dag", 19565, 19634),
+            span: SourceSpan::new("src/v3/std/effects.dag", 19563, 19632),
         });
         declarations.push(Declaration {
             id: DeclarationId(1475),
@@ -47186,7 +47186,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/effects.dag", 19639, 19789),
+            span: SourceSpan::new("src/v3/std/effects.dag", 19637, 19787),
         });
         declarations.push(Declaration {
             id: DeclarationId(1476),
@@ -47200,7 +47200,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/effects.dag", 20538, 20559),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20536, 20557),
         });
         declarations.push(Declaration {
             id: DeclarationId(1477),
@@ -47220,7 +47220,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/effects.dag", 20590, 20617),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20588, 20615),
         });
         declarations.push(Declaration {
             id: DeclarationId(1478),
@@ -47239,7 +47239,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/effects.dag", 20564, 20619),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20562, 20617),
         });
         declarations.push(Declaration {
             id: DeclarationId(1479),
@@ -47259,7 +47259,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/effects.dag", 24543, 24564),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24541, 24562),
         });
         declarations.push(Declaration {
             id: DeclarationId(1480),
@@ -47278,7 +47278,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/effects.dag", 24523, 24566),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24521, 24564),
         });
         declarations.push(Declaration {
             id: DeclarationId(1481),
@@ -47298,7 +47298,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/effects.dag", 24592, 24619),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24590, 24617),
         });
         declarations.push(Declaration {
             id: DeclarationId(1482),
@@ -47317,7 +47317,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/effects.dag", 24571, 24621),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24569, 24619),
         });
         declarations.push(Declaration {
             id: DeclarationId(1483),
@@ -47336,7 +47336,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/effects.dag", 24626, 24661),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24624, 24659),
         });
         declarations.push(Declaration {
             id: DeclarationId(1484),
@@ -47356,7 +47356,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/effects.dag", 24693, 24725),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24691, 24723),
         });
         declarations.push(Declaration {
             id: DeclarationId(1485),
@@ -47375,7 +47375,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/effects.dag", 24666, 24727),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24664, 24725),
         });
         declarations.push(Declaration {
             id: DeclarationId(1486),
@@ -47394,7 +47394,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/effects.dag", 25364, 25410),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25362, 25408),
         });
         declarations.push(Declaration {
             id: DeclarationId(1487),
@@ -47413,7 +47413,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/effects.dag", 25415, 25467),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25413, 25465),
         });
         declarations.push(Declaration {
             id: DeclarationId(1488),
@@ -47427,7 +47427,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/effects.dag", 25964, 25984),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25962, 25982),
         });
         declarations.push(Declaration {
             id: DeclarationId(1489),
@@ -47441,7 +47441,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/effects.dag", 25989, 26010),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25987, 26008),
         });
         declarations.push(Declaration {
             id: DeclarationId(1490),
@@ -47455,7 +47455,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/effects.dag", 26015, 26038),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26013, 26036),
         });
         declarations.push(Declaration {
             id: DeclarationId(1491),
@@ -47469,7 +47469,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/effects.dag", 26043, 26061),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26041, 26059),
         });
         declarations.push(Declaration {
             id: DeclarationId(1492),
@@ -47483,7 +47483,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/effects.dag", 26066, 26084),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26064, 26082),
         });
         declarations.push(Declaration {
             id: DeclarationId(1493),
@@ -47502,7 +47502,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/effects.dag", 26401, 26447),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26399, 26445),
         });
         declarations.push(Declaration {
             id: DeclarationId(1494),
@@ -47521,7 +47521,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/effects.dag", 26452, 26504),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26450, 26502),
         });
         declarations.push(Declaration {
             id: DeclarationId(1495),
@@ -47535,7 +47535,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/effects.dag", 32458, 32464),
+            span: SourceSpan::new("src/v3/std/effects.dag", 32456, 32462),
         });
         declarations.push(Declaration {
             id: DeclarationId(1496),
@@ -47554,7 +47554,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/effects.dag", 32469, 32506),
+            span: SourceSpan::new("src/v3/std/effects.dag", 32467, 32504),
         });
         declarations.push(Declaration {
             id: DeclarationId(1497),
@@ -47573,7 +47573,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/effects.dag", 32511, 32548),
+            span: SourceSpan::new("src/v3/std/effects.dag", 32509, 32546),
         });
         declarations.push(Declaration {
             id: DeclarationId(1498),
@@ -47587,7 +47587,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/effects.dag", 33022, 33041),
+            span: SourceSpan::new("src/v3/std/effects.dag", 33020, 33039),
         });
         declarations.push(Declaration {
             id: DeclarationId(1499),
@@ -47606,7 +47606,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/effects.dag", 33046, 33095),
+            span: SourceSpan::new("src/v3/std/effects.dag", 33044, 33093),
         });
         declarations.push(Declaration {
             id: DeclarationId(1500),
@@ -57752,7 +57752,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/services.dag", 6785, 6808),
+            span: SourceSpan::new("src/v3/std/services.dag", 6784, 6807),
         });
         declarations.push(Declaration {
             id: DeclarationId(2050),
@@ -66710,7 +66710,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/effects.dag", 21031, 21059),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
         });
         declarations.push(Declaration {
             id: DeclarationId(2542),
@@ -66724,7 +66724,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/effects.dag", 21031, 21059),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
         });
         declarations.push(Declaration {
             id: DeclarationId(2543),
@@ -66749,7 +66749,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/effects.dag", 21031, 21059),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
         });
         declarations.push(Declaration {
             id: DeclarationId(2544),
@@ -66768,7 +66768,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/effects.dag", 21211, 21239),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21237),
         });
         declarations.push(Declaration {
             id: DeclarationId(2545),
@@ -66782,7 +66782,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/effects.dag", 21211, 21239),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21237),
         });
         declarations.push(Declaration {
             id: DeclarationId(2546),
@@ -66807,7 +66807,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/effects.dag", 21211, 21239),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21237),
         });
         declarations.push(Declaration {
             id: DeclarationId(2547),
@@ -66826,7 +66826,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/effects.dag", 29695, 29706),
+            span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
         });
         declarations.push(Declaration {
             id: DeclarationId(2548),
@@ -66840,7 +66840,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/effects.dag", 29695, 29706),
+            span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
         });
         declarations.push(Declaration {
             id: DeclarationId(2549),
@@ -66865,7 +66865,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/effects.dag", 29695, 29706),
+            span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
         });
         declarations.push(Declaration {
             id: DeclarationId(2550),
@@ -66884,7 +66884,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/effects.dag", 30432, 30439),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
         });
         declarations.push(Declaration {
             id: DeclarationId(2551),
@@ -66898,7 +66898,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/effects.dag", 30432, 30439),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
         });
         declarations.push(Declaration {
             id: DeclarationId(2552),
@@ -66923,7 +66923,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/effects.dag", 30432, 30439),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
         });
         declarations.push(Declaration {
             id: DeclarationId(2553),
@@ -66942,7 +66942,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/effects.dag", 30662, 30669),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30660, 30667),
         });
         declarations.push(Declaration {
             id: DeclarationId(2554),
@@ -66956,7 +66956,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/effects.dag", 30662, 30669),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30660, 30667),
         });
         declarations.push(Declaration {
             id: DeclarationId(2555),
@@ -66981,7 +66981,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/effects.dag", 30662, 30669),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30660, 30667),
         });
         declarations.push(Declaration {
             id: DeclarationId(2556),

From 4347dbce8ec11c2e439e27a0bdee2dbdbcb059e7 Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gmail.com>
Date: Tue, 12 May 2026 22:44:30 +0000
Subject: [PATCH 09/17] Document parallelism lens helper receipts

---
 src/v3/lenses/parallelism.dag | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/v3/lenses/parallelism.dag b/src/v3/lenses/parallelism.dag
index 35f8f71d04b..1921b4bea2f 100644
--- a/src/v3/lenses/parallelism.dag
+++ b/src/v3/lenses/parallelism.dag
@@ -34,10 +34,22 @@ import std.effects {
 }
 
 type LinearBranchesLookup
+  // 🟢 TERMINAL helper coproduct. This is the local, total result of trying to
+  // view each parallel branch as `LinearEffect`; dissolving it into
+  // `WorkflowParallelismReport` would mix traversal control flow with the
+  // public Stage 2e diagnostic contract. The terminal carrier is private to
+  // this lens and has exactly one unsupported class (`NonLinearParallelBranch`)
+  // at the report boundary.
   = LinearBranchesFound { branches: List<List<OperationEffect>> }
   | NonLinearBranchFound
 
 type NonCommutingPairLookup
+  // 🟢 TERMINAL helper coproduct. The operation pair is internal search
+  // evidence used only to decide the closed `PairwiseNonCommute` class; the
+  // exported report contract remains `ParallelismUnsupportedDetail { kind,
+  // downstream_stage, reason }` from `std.effects`. Dissolution into a public
+  // pair-evidence payload is intentionally deferred until that report contract
+  // grows a typed evidence field instead of overloading the free-text reason.
   = NonCommutingPairFound { left: OperationEffect, right: OperationEffect }
   | AllPairsCommute
 
@@ -211,6 +223,11 @@ fn parallelism_report_for_workflow(wf: WorkflowEffect) -> WorkflowParallelismRep
               match pairwise_cross_branch_commutes(branch_ops) {
                 AllPairsCommute => ParallelCompositionVerdict(IdempotentComposition)
                 NonCommutingPairFound { left: left_op, right: right_op } =>
+                  // The pair witnesses stay bound here to prove the search found
+                  // concrete non-commuting operations, but Stage 2e's exported
+                  // report contract is deliberately the closed kind plus a
+                  // stable reason string. Tests lock that contract instead of
+                  // formatting operation names into `reason`.
                   report_parallelism_unsupported(
                     PairwiseNonCommute,
                     "parallel branch operations do not commute under parallel scheduling"

From 5d13054b67a2428f1e5c1cd4236620e85d46d917 Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gmail.com>
Date: Tue, 12 May 2026 23:33:46 +0000
Subject: [PATCH 10/17] Keep parallelism primitive helper off lens surface

---
 src/v3/compiler/src/lens_parallelism_generated.rs | 2 +-
 src/v3/compiler/src/lib.rs                        | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/v3/compiler/src/lens_parallelism_generated.rs b/src/v3/compiler/src/lens_parallelism_generated.rs
index bb46684a054..4315fbc4335 100644
--- a/src/v3/compiler/src/lens_parallelism_generated.rs
+++ b/src/v3/compiler/src/lens_parallelism_generated.rs
@@ -125,7 +125,7 @@ pub fn analyze_parallelism(p0: &Dag, p1: NodeId) -> WorkflowParallelismReport {
     }
 }
 
-pub fn loop_iteration_parallel_emission_indicator(p0: &Dag, p1: NodeId) -> i64 {
+pub(super) fn loop_iteration_parallel_emission_indicator(p0: &Dag, p1: NodeId) -> i64 {
     let Some(workflow) = p0.lane2_workflow_effect_at(&p1) else {
         return 0;
     };
diff --git a/src/v3/compiler/src/lib.rs b/src/v3/compiler/src/lib.rs
index d05622657da..598b37507d8 100644
--- a/src/v3/compiler/src/lib.rs
+++ b/src/v3/compiler/src/lib.rs
@@ -5179,7 +5179,14 @@ pub mod lens_parallelism {
         include!("lens_parallelism_generated.rs");
     }
 
-    pub use generated::{analyze_parallelism, loop_iteration_parallel_emission_indicator};
+    pub use generated::analyze_parallelism;
+
+    pub fn loop_iteration_parallel_emission_indicator(
+        dag: &crate::dag::Dag,
+        workflow_root: crate::dag::NodeId,
+    ) -> i64 {
+        generated::loop_iteration_parallel_emission_indicator(dag, workflow_root)
+    }
 }
 // Surface pipeline for this crate (not workspace-root `src/tokenize.rs` / `src/parse.rs`):
 // `tokenize.dag` → `regen_tokenize` → `tokenize_generated.rs`,

From 21060160a7fbb1b88e553e4a072305dd5c8d64c0 Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gmail.com>
Date: Tue, 12 May 2026 19:58:49 -0400
Subject: [PATCH 11/17] =?UTF-8?q?WIP:=20T-Cluster-F-=CE=B1=20S1=20#81=20pa?=
 =?UTF-8?q?rallelism=20walker=20port=20(src/v3/compiler/src/workfl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/v3/lenses/parallelism.dag | 15 ++++++++++-----
 src/v3/std/verification.dag   |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/v3/lenses/parallelism.dag b/src/v3/lenses/parallelism.dag
index 1921b4bea2f..3103672a223 100644
--- a/src/v3/lenses/parallelism.dag
+++ b/src/v3/lenses/parallelism.dag
@@ -1,6 +1,6 @@
 // lenses.parallelism — Lane 2 Stage 2e parallel composition safety.
 //
-// Status: STRUCTURALLY TERMINAL; BEHAVIORALLY COMPLETE.
+// Status: STRUCTURALLY TERMINAL; BEHAVIORALLY PARTIAL.
 // See docs/v3-lens-capability-register.md.
 //
 // Port authority: retired hand-Rust Stage 2e bridge (2026-05-12), specifically:
@@ -13,6 +13,10 @@
 //
 // The breaker witness deliberately uses branch-order flattening, matching the
 // retired Rust bridge and `WorkflowEffect::operation_at`.
+//
+// Behavioral completion trigger: add typed pairwise-noncommute evidence to
+// `WorkflowParallelismReport` / `ParallelismUnsupportedDetail`, then route the
+// computed left/right `OperationEffect` witnesses through that public payload.
 
 module lenses.parallelism
 
@@ -44,12 +48,13 @@ type LinearBranchesLookup
   | NonLinearBranchFound
 
 type NonCommutingPairLookup
-  // 🟢 TERMINAL helper coproduct. The operation pair is internal search
+  // 🟡 SCAFFOLD helper coproduct. The operation pair is internal search
   // evidence used only to decide the closed `PairwiseNonCommute` class; the
   // exported report contract remains `ParallelismUnsupportedDetail { kind,
-  // downstream_stage, reason }` from `std.effects`. Dissolution into a public
-  // pair-evidence payload is intentionally deferred until that report contract
-  // grows a typed evidence field instead of overloading the free-text reason.
+  // downstream_stage, reason }` from `std.effects`. Dissolution trigger:
+  // when `WorkflowParallelismReport` grows typed non-commute evidence, remove
+  // this private carrier and carry the left/right operations through that
+  // public report payload instead of overloading the free-text reason.
   = NonCommutingPairFound { left: OperationEffect, right: OperationEffect }
   | AllPairsCommute
 
diff --git a/src/v3/std/verification.dag b/src/v3/std/verification.dag
index 8316f904cdf..8a34b977ee1 100644
--- a/src/v3/std/verification.dag
+++ b/src/v3/std/verification.dag
@@ -207,7 +207,7 @@ data lens_capability_register_rows: List<LensCapabilityRegisterRow> = [
   {
     lens_basename: "parallelism.dag"
     structural: LensCapabilityStructuralTerminal
-    behavioral: LensCapabilityBehavioralComplete
+    behavioral: LensCapabilityBehavioralPartial
     v2_counterpart: LensCapabilityV2NoneV3Native
   },
   {

From f8b4013f8ab618df87ad85ab341442506cd465cc Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gmail.com>
Date: Tue, 12 May 2026 20:00:16 -0400
Subject: [PATCH 12/17] =?UTF-8?q?WIP:=20T-Cluster-F-=CE=B1=20S1=20#81=20pa?=
 =?UTF-8?q?rallelism=20walker=20port=20(src/v3/compiler/src/workfl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/v3-lens-capability-register.md           |   4 +-
 src/v3/compiler/src/bootstrap_generated.rs    | 148 +++++++++---------
 ...otstrap_generated_without_parse_surface.rs | 148 +++++++++---------
 3 files changed, 150 insertions(+), 150 deletions(-)

diff --git a/docs/v3-lens-capability-register.md b/docs/v3-lens-capability-register.md
index 1c67635bdf3..18d7cbc6fd0 100644
--- a/docs/v3-lens-capability-register.md
+++ b/docs/v3-lens-capability-register.md
@@ -42,7 +42,7 @@ A lens is only "done" when **both** axes are at their strongest grade for the sc
 | `cost_target_realization.dag` | TERMINAL | **N/A** | None (v3-native; ε path consumer of `declaration_by_name` substrate accessor introduced by Slice 1a.0 / PR #2194) | Per-category meta-type `Declaration?` resolvers — `type_realization_meta(d)` / `callable_realization_meta(d)` / `operator_realization_meta(d)` / `behavior_realization_meta(d)` / `type_instantiation_realization_meta(d)` / `pattern_realization_meta(d)` (six total, covering all `*Realization` carriers in `src/v3/std/emit_model.dag`) — using `declaration_by_name` for name-keyed lookup. Slice 1a.1 of T-CostLens-Composition follow-on (#2141 ε scope per gunbc#2181 ratification): minimum-viable consumer-proof per INVARIANTS P2 closure of codex BLOCKING surfaced post-merge on Slice 1a.0. Slice 1a.2 adds Rust-side `v3_compiler::realization_cost::RealizationCostTable`, which filters realization declarations by `meta_tag`, requires `ValueBody.Structural.fields`, matches the active `language`, and extracts typed `target` / `op` keys plus `cost: Int`. Generated consumer: `src/v3/compiler/src/lens_cost_target_realization_generated.rs`. | N/A — ε path consumer-evidence-only; not a v2 mirror. ε composition (abstract `SymbolicCost` × per-target realization-cost) deferred to Slice 1a.3+. |
 | `effect_enumeration.dag` | TERMINAL | **PARTIAL** | None (v3-native) | `EffectEnumerationReport { facts, coverage_gaps, redundant_reads, transaction }` derived from the five `Behavior` variants and callable type-signature shape; generated consumer target: `src/v3/compiler/src/lens_effect_enumeration_generated.rs` via `regen_lens` / `emit_rust_module` | Audit verdict is path (ii): live primitives still require ambient resource/transport metadata rather than returned-modified-resource signatures (`dsl/std/resources.dag`, `dsl/std/primitives.dag`, `dsl/extdeps/shell.dag`, `dsl/extdeps/github/auth.dag`). Full `OperationEffect` retirement, resource-threading migration, and caller-side effect-set pinning are follow-up work. |
 | `idempotency.dag` | TERMINAL | **COMPLETE** | None (v3-native) | `WorkflowIdempotencyReport` via `lane2_workflow_at` + `std.effects::lane2_workflow_idempotency_report` | — (behavioral authority for the `WorkflowEffect` walk is `lane2_workflow_idempotency_report` in `src/v3/std/effects.dag`. `workflow_idempotency.rs` is still **parallel staging** for native `Dag` entry — same projection, hand mirror until an explicit dissolution removes it or routes through generated-only code; INVARIANTS P2 cleanup, not “two competing semantics.”) |
-| `parallelism.dag` | TERMINAL | **COMPLETE** | None (v3-native) | `WorkflowParallelismReport` via `lane2_workflow_at` plus the Stage 2e branch-order flattening / pairwise commutativity walk; generated consumer target: `src/v3/compiler/src/lens_parallelism_generated.rs` via `regen_lens` / `emit_rust_module` | — (behavioral authority ported from retired `src/v3/compiler/src/workflow_parallelism.rs`: `ParallelEffect` roots require linear branches; first breaking operation returns `CompositionVerdict::BrokenBy`; otherwise cross-branch `Read×Read` and same-key `Delete×Delete` commute, while `Upsert×Upsert`, read/write clashes, and unproven disjointness fail closed as `PairwiseNonCommute`.) |
+| `parallelism.dag` | TERMINAL | **PARTIAL** | None (v3-native) | `WorkflowParallelismReport` via `lane2_workflow_at` plus the Stage 2e branch-order flattening / pairwise commutativity walk; generated consumer target: `src/v3/compiler/src/lens_parallelism_generated.rs` via `regen_lens` / `emit_rust_module` | Pairwise noncommute still reports only the closed `PairwiseNonCommute` kind plus stable reason text. The lens computes the left/right `OperationEffect` witnesses internally; behavioral completion trigger is to add typed pairwise evidence to `WorkflowParallelismReport` / `ParallelismUnsupportedDetail` and route those witnesses through the public report payload. |
 | `provenance.dag` | TERMINAL | COMPLETE | None (v3-native) | `Origin = NoProducer \| MissingPort \| MissingBehavior \| Source(NodeId) \| Computed(NodeId) \| Selected(NodeId) \| Accumulated(NodeId)` | N/A |
 | `unused_parameters.dag` | TERMINAL | COMPLETE | None (v3-native) | `List<UnusedParameter>` | N/A |
 | `variant_payload.dag` | TERMINAL | COMPLETE | None (v3-native) | `VariantPayloadShapeLookup` | N/A (see `DeclarationLookup` parallel-authority debt — ROADMAP 2026-04-21 wave, line 170 — which is an internal cleanup, not a behavioral gap) |
@@ -53,7 +53,7 @@ A lens is only "done" when **both** axes are at their strongest grade for the sc
 
 ## Common root causes
 
-The former shared complexity/cost behavioral gap is now split: **complexity** is COMPLETE via the `ComplexitySummary` cementing receipt, and **cost** is COMPLETE for the abstract `SymbolicCost` scope via the gate #80 receipt. Remaining T-CostLens target-realization composition (#37/#40/#70) is tracked outside the `cost.dag` row because it composes target-specific realization rows with the abstract-cost lens. The remaining non-complete row is now distinct: **effect_enumeration** stays **PARTIAL** until the Operation/resource-threading migration retires the ambient-resource gap. **idempotency** and **parallelism** are COMPLETE (see table). Keeping this section aligned with the table is part of the register’s P2 single-authority role.
+The former shared complexity/cost behavioral gap is now split: **complexity** is COMPLETE via the `ComplexitySummary` cementing receipt, and **cost** is COMPLETE for the abstract `SymbolicCost` scope via the gate #80 receipt. Remaining T-CostLens target-realization composition (#37/#40/#70) is tracked outside the `cost.dag` row because it composes target-specific realization rows with the abstract-cost lens. The remaining non-complete rows are now distinct: **effect_enumeration** stays **PARTIAL** until the Operation/resource-threading migration retires the ambient-resource gap, and **parallelism** stays **PARTIAL** until PairwiseNonCommute carries typed left/right operation evidence instead of only the closed kind plus reason string. **idempotency** is COMPLETE (see table). Keeping this section aligned with the table is part of the register’s P2 single-authority role.
 
 ### Substrate carriers vs per-call producers (complexity, cost)
 
diff --git a/src/v3/compiler/src/bootstrap_generated.rs b/src/v3/compiler/src/bootstrap_generated.rs
index 07cac9bee20..cd38ae2b25e 100644
--- a/src/v3/compiler/src/bootstrap_generated.rs
+++ b/src/v3/compiler/src/bootstrap_generated.rs
@@ -9168,14 +9168,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
             target: TransformTarget::Callable(DeclarationId(1300)),
             inputs: vec![PortId(968)],
             output: PortId(969),
-            span: SourceSpan::new("src/v3/std/verification.dag", 28339, 28362),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28338, 28361),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(809),
             target: TransformTarget::Callable(DeclarationId(1301)),
             inputs: vec![PortId(970)],
             output: PortId(971),
-            span: SourceSpan::new("src/v3/std/verification.dag", 28384, 28418),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28383, 28417),
         }));
         nodes.push(Behavior::Branch(BranchNode {
             id: NodeId(810),
@@ -9186,7 +9186,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     output: PortId(969),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Enumerated".to_string(),
-                        span: SourceSpan::new("src/v3/std/verification.dag", 28322, 28335),
+                        span: SourceSpan::new("src/v3/std/verification.dag", 28321, 28334),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "c".to_string(),
@@ -9198,7 +9198,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     output: PortId(971),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Quantified".to_string(),
-                        span: SourceSpan::new("src/v3/std/verification.dag", 28367, 28380),
+                        span: SourceSpan::new("src/v3/std/verification.dag", 28366, 28379),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "q".to_string(),
@@ -9207,7 +9207,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                 },
             ],
             output: PortId(972),
-            span: SourceSpan::new("src/v3/std/verification.dag", 28304, 28422),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28303, 28421),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Bind(BindNode {
@@ -9215,7 +9215,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
             name: "obligation_for_suite_claim".to_string(),
             value: PortId(972),
             params: vec![PortId(967)],
-            span: SourceSpan::new("src/v3/std/verification.dag", 28304, 28422),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28303, 28421),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
@@ -42211,7 +42211,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2712),
+                            constructor: DeclarationId(2713),
                             payload: vec![],
                         },
                     ),
@@ -42421,7 +42421,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ])),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 6971, 9559),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6971, 9558),
         });
         declarations.push(Declaration {
             id: DeclarationId(1288),
@@ -42542,7 +42542,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9561, 22454),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9560, 22453),
         });
         declarations.push(Declaration {
             id: DeclarationId(1289),
@@ -42556,7 +42556,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 22562, 22582),
+            span: SourceSpan::new("src/v3/std/verification.dag", 22561, 22581),
         });
         declarations.push(Declaration {
             id: DeclarationId(1290),
@@ -42575,7 +42575,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 22725, 22780),
+            span: SourceSpan::new("src/v3/std/verification.dag", 22724, 22779),
         });
         declarations.push(Declaration {
             id: DeclarationId(1291),
@@ -42612,7 +42612,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 23390, 23523),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23389, 23522),
         });
         declarations.push(Declaration {
             id: DeclarationId(1292),
@@ -42637,7 +42637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 23704, 23741),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23703, 23740),
         });
         declarations.push(Declaration {
             id: DeclarationId(1293),
@@ -42674,7 +42674,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 23743, 23904),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23742, 23903),
         });
         declarations.push(Declaration {
             id: DeclarationId(1294),
@@ -42699,7 +42699,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 25604, 25698),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25603, 25697),
         });
         declarations.push(Declaration {
             id: DeclarationId(1295),
@@ -42728,7 +42728,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 25700, 25803),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25699, 25802),
         });
         declarations.push(Declaration {
             id: DeclarationId(1296),
@@ -42753,7 +42753,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26536, 26613),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26535, 26612),
         });
         declarations.push(Declaration {
             id: DeclarationId(1297),
@@ -42778,7 +42778,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26615, 26675),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26614, 26674),
         });
         declarations.push(Declaration {
             id: DeclarationId(1298),
@@ -42803,7 +42803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26873, 26954),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26872, 26953),
         });
         declarations.push(Declaration {
             id: DeclarationId(1299),
@@ -42813,8 +42813,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 output: DeclarationId(2686),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    27396,
-                    27412,
+                    27395,
+                    27411,
                 )),
             },
             type_params: vec![],
@@ -42825,7 +42825,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 27325, 27412),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27324, 27411),
         });
         declarations.push(Declaration {
             id: DeclarationId(1300),
@@ -42835,8 +42835,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 output: DeclarationId(1298),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    27470,
-                    27555,
+                    27469,
+                    27554,
                 )),
             },
             type_params: vec![],
@@ -42847,7 +42847,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 27414, 27555),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27413, 27554),
         });
         declarations.push(Declaration {
             id: DeclarationId(1301),
@@ -42857,8 +42857,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 output: DeclarationId(1298),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    27862,
-                    27928,
+                    27861,
+                    27927,
                 )),
             },
             type_params: vec![],
@@ -42869,7 +42869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 27785, 27928),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27784, 27927),
         });
         declarations.push(Declaration {
             id: DeclarationId(1302),
@@ -42887,7 +42887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 28233, 28422),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28232, 28421),
         });
         declarations.push(Declaration {
             id: DeclarationId(1303),
@@ -42897,8 +42897,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 output: DeclarationId(2688),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    28506,
-                    28551,
+                    28505,
+                    28550,
                 )),
             },
             type_params: vec![],
@@ -42909,7 +42909,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 28424, 28551),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28423, 28550),
         });
         declarations.push(Declaration {
             id: DeclarationId(1304),
@@ -83106,7 +83106,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 27372, 27395),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27371, 27394),
         });
         declarations.push(Declaration {
             id: DeclarationId(2687),
@@ -83126,7 +83126,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 28464, 28480),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28463, 28479),
         });
         declarations.push(Declaration {
             id: DeclarationId(2688),
@@ -83146,7 +83146,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 28485, 28505),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28484, 28504),
         });
         declarations.push(Declaration {
             id: DeclarationId(2689),
@@ -83601,7 +83601,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9584, 9592),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9583, 9591),
         });
         declarations.push(Declaration {
             id: DeclarationId(2720),
@@ -83620,7 +83620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9597, 9637),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9596, 9636),
         });
         declarations.push(Declaration {
             id: DeclarationId(2721),
@@ -83639,7 +83639,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9642, 9675),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9641, 9674),
         });
         declarations.push(Declaration {
             id: DeclarationId(2722),
@@ -83664,7 +83664,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9680, 9758),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9679, 9757),
         });
         declarations.push(Declaration {
             id: DeclarationId(2723),
@@ -83683,7 +83683,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9924, 9987),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9923, 9986),
         });
         declarations.push(Declaration {
             id: DeclarationId(2724),
@@ -83712,7 +83712,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9992, 10083),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9991, 10082),
         });
         declarations.push(Declaration {
             id: DeclarationId(2725),
@@ -83741,7 +83741,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 10088, 10220),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10087, 10219),
         });
         declarations.push(Declaration {
             id: DeclarationId(2726),
@@ -83766,7 +83766,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 10435, 10524),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10434, 10523),
         });
         declarations.push(Declaration {
             id: DeclarationId(2727),
@@ -83786,7 +83786,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 11324, 11336),
+            span: SourceSpan::new("src/v3/std/verification.dag", 11323, 11335),
         });
         declarations.push(Declaration {
             id: DeclarationId(2728),
@@ -83815,7 +83815,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 11273, 11370),
+            span: SourceSpan::new("src/v3/std/verification.dag", 11272, 11369),
         });
         declarations.push(Declaration {
             id: DeclarationId(2729),
@@ -83835,7 +83835,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 12085, 12097),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12084, 12096),
         });
         declarations.push(Declaration {
             id: DeclarationId(2730),
@@ -83868,7 +83868,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 12035, 12163),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12034, 12162),
         });
         declarations.push(Declaration {
             id: DeclarationId(2731),
@@ -83897,7 +83897,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 12461, 12583),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12460, 12582),
         });
         declarations.push(Declaration {
             id: DeclarationId(2732),
@@ -83926,7 +83926,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 12845, 12970),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12844, 12969),
         });
         declarations.push(Declaration {
             id: DeclarationId(2733),
@@ -83945,7 +83945,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 15023, 15084),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15022, 15083),
         });
         declarations.push(Declaration {
             id: DeclarationId(2734),
@@ -83970,7 +83970,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 15089, 15188),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15088, 15187),
         });
         declarations.push(Declaration {
             id: DeclarationId(2735),
@@ -83999,7 +83999,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 15542, 15674),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15541, 15673),
         });
         declarations.push(Declaration {
             id: DeclarationId(2736),
@@ -84024,7 +84024,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 16241, 16353),
+            span: SourceSpan::new("src/v3/std/verification.dag", 16240, 16352),
         });
         declarations.push(Declaration {
             id: DeclarationId(2737),
@@ -84049,7 +84049,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 17050, 17129),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17049, 17128),
         });
         declarations.push(Declaration {
             id: DeclarationId(2738),
@@ -84078,7 +84078,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 17349, 17462),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17348, 17461),
         });
         declarations.push(Declaration {
             id: DeclarationId(2739),
@@ -84107,7 +84107,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 17467, 17603),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17466, 17602),
         });
         declarations.push(Declaration {
             id: DeclarationId(2740),
@@ -84132,7 +84132,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 18089, 18171),
+            span: SourceSpan::new("src/v3/std/verification.dag", 18088, 18170),
         });
         declarations.push(Declaration {
             id: DeclarationId(2741),
@@ -84157,7 +84157,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 18176, 18262),
+            span: SourceSpan::new("src/v3/std/verification.dag", 18175, 18261),
         });
         declarations.push(Declaration {
             id: DeclarationId(2742),
@@ -84177,7 +84177,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 18341, 18351),
+            span: SourceSpan::new("src/v3/std/verification.dag", 18340, 18350),
         });
         declarations.push(Declaration {
             id: DeclarationId(2743),
@@ -84202,7 +84202,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 18267, 18357),
+            span: SourceSpan::new("src/v3/std/verification.dag", 18266, 18356),
         });
         declarations.push(Declaration {
             id: DeclarationId(2744),
@@ -84227,7 +84227,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 19571, 19696),
+            span: SourceSpan::new("src/v3/std/verification.dag", 19570, 19695),
         });
         declarations.push(Declaration {
             id: DeclarationId(2745),
@@ -84256,7 +84256,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 20638, 20772),
+            span: SourceSpan::new("src/v3/std/verification.dag", 20637, 20771),
         });
         declarations.push(Declaration {
             id: DeclarationId(2746),
@@ -84285,7 +84285,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 21411, 21555),
+            span: SourceSpan::new("src/v3/std/verification.dag", 21410, 21554),
         });
         declarations.push(Declaration {
             id: DeclarationId(2747),
@@ -84304,7 +84304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 22400, 22454),
+            span: SourceSpan::new("src/v3/std/verification.dag", 22399, 22453),
         });
         declarations.push(Declaration {
             id: DeclarationId(2748),
@@ -84324,7 +84324,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 23498, 23521),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23497, 23520),
         });
         declarations.push(Declaration {
             id: DeclarationId(2749),
@@ -84338,7 +84338,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 23724, 23730),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23723, 23729),
         });
         declarations.push(Declaration {
             id: DeclarationId(2750),
@@ -84352,7 +84352,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 23735, 23741),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23734, 23740),
         });
         declarations.push(Declaration {
             id: DeclarationId(2751),
@@ -84372,7 +84372,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 23879, 23902),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23878, 23901),
         });
         declarations.push(Declaration {
             id: DeclarationId(2752),
@@ -84391,7 +84391,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 25625, 25654),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25624, 25653),
         });
         declarations.push(Declaration {
             id: DeclarationId(2753),
@@ -84410,7 +84410,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 25659, 25698),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25658, 25697),
         });
         declarations.push(Declaration {
             id: DeclarationId(2754),
@@ -84429,7 +84429,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26556, 26577),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26555, 26576),
         });
         declarations.push(Declaration {
             id: DeclarationId(2755),
@@ -84448,7 +84448,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26582, 26613),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26581, 26612),
         });
         declarations.push(Declaration {
             id: DeclarationId(2756),
@@ -84468,7 +84468,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26657, 26673),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26656, 26672),
         });
         declarations.push(Declaration {
             id: DeclarationId(2757),
@@ -84488,7 +84488,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26929, 26952),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26928, 26951),
         });
         declarations.push(Declaration {
             id: DeclarationId(2758),
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 f3e27682892..183adeec470 100644
--- a/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs
+++ b/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs
@@ -9168,14 +9168,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
             target: TransformTarget::Callable(DeclarationId(1285)),
             inputs: vec![PortId(968)],
             output: PortId(969),
-            span: SourceSpan::new("src/v3/std/verification.dag", 28339, 28362),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28338, 28361),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(809),
             target: TransformTarget::Callable(DeclarationId(1286)),
             inputs: vec![PortId(970)],
             output: PortId(971),
-            span: SourceSpan::new("src/v3/std/verification.dag", 28384, 28418),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28383, 28417),
         }));
         nodes.push(Behavior::Branch(BranchNode {
             id: NodeId(810),
@@ -9186,7 +9186,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     output: PortId(969),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Enumerated".to_string(),
-                        span: SourceSpan::new("src/v3/std/verification.dag", 28322, 28335),
+                        span: SourceSpan::new("src/v3/std/verification.dag", 28321, 28334),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "c".to_string(),
@@ -9198,7 +9198,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     output: PortId(971),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Quantified".to_string(),
-                        span: SourceSpan::new("src/v3/std/verification.dag", 28367, 28380),
+                        span: SourceSpan::new("src/v3/std/verification.dag", 28366, 28379),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "q".to_string(),
@@ -9207,7 +9207,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                 },
             ],
             output: PortId(972),
-            span: SourceSpan::new("src/v3/std/verification.dag", 28304, 28422),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28303, 28421),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Bind(BindNode {
@@ -9215,7 +9215,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
             name: "obligation_for_suite_claim".to_string(),
             value: PortId(972),
             params: vec![PortId(967)],
-            span: SourceSpan::new("src/v3/std/verification.dag", 28304, 28422),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28303, 28421),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
@@ -41728,7 +41728,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2256),
+                            constructor: DeclarationId(2257),
                             payload: vec![],
                         },
                     ),
@@ -41938,7 +41938,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ])),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 6971, 9559),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6971, 9558),
         });
         declarations.push(Declaration {
             id: DeclarationId(1273),
@@ -42059,7 +42059,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", 9561, 22454),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9560, 22453),
         });
         declarations.push(Declaration {
             id: DeclarationId(1274),
@@ -42073,7 +42073,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", 22562, 22582),
+            span: SourceSpan::new("src/v3/std/verification.dag", 22561, 22581),
         });
         declarations.push(Declaration {
             id: DeclarationId(1275),
@@ -42092,7 +42092,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", 22725, 22780),
+            span: SourceSpan::new("src/v3/std/verification.dag", 22724, 22779),
         });
         declarations.push(Declaration {
             id: DeclarationId(1276),
@@ -42129,7 +42129,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", 23390, 23523),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23389, 23522),
         });
         declarations.push(Declaration {
             id: DeclarationId(1277),
@@ -42154,7 +42154,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", 23704, 23741),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23703, 23740),
         });
         declarations.push(Declaration {
             id: DeclarationId(1278),
@@ -42191,7 +42191,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", 23743, 23904),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23742, 23903),
         });
         declarations.push(Declaration {
             id: DeclarationId(1279),
@@ -42216,7 +42216,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", 25604, 25698),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25603, 25697),
         });
         declarations.push(Declaration {
             id: DeclarationId(1280),
@@ -42245,7 +42245,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", 25700, 25803),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25699, 25802),
         });
         declarations.push(Declaration {
             id: DeclarationId(1281),
@@ -42270,7 +42270,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", 26536, 26613),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26535, 26612),
         });
         declarations.push(Declaration {
             id: DeclarationId(1282),
@@ -42295,7 +42295,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", 26615, 26675),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26614, 26674),
         });
         declarations.push(Declaration {
             id: DeclarationId(1283),
@@ -42320,7 +42320,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", 26873, 26954),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26872, 26953),
         });
         declarations.push(Declaration {
             id: DeclarationId(1284),
@@ -42330,8 +42330,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 output: DeclarationId(2230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    27396,
-                    27412,
+                    27395,
+                    27411,
                 )),
             },
             type_params: vec![],
@@ -42342,7 +42342,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", 27325, 27412),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27324, 27411),
         });
         declarations.push(Declaration {
             id: DeclarationId(1285),
@@ -42352,8 +42352,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 output: DeclarationId(1283),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    27470,
-                    27555,
+                    27469,
+                    27554,
                 )),
             },
             type_params: vec![],
@@ -42364,7 +42364,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", 27414, 27555),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27413, 27554),
         });
         declarations.push(Declaration {
             id: DeclarationId(1286),
@@ -42374,8 +42374,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 output: DeclarationId(1283),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    27862,
-                    27928,
+                    27861,
+                    27927,
                 )),
             },
             type_params: vec![],
@@ -42386,7 +42386,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", 27785, 27928),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27784, 27927),
         });
         declarations.push(Declaration {
             id: DeclarationId(1287),
@@ -42404,7 +42404,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", 28233, 28422),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28232, 28421),
         });
         declarations.push(Declaration {
             id: DeclarationId(1288),
@@ -42414,8 +42414,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 output: DeclarationId(2232),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    28506,
-                    28551,
+                    28505,
+                    28550,
                 )),
             },
             type_params: vec![],
@@ -42426,7 +42426,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", 28424, 28551),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28423, 28550),
         });
         declarations.push(Declaration {
             id: DeclarationId(1289),
@@ -60797,7 +60797,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", 27372, 27395),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27371, 27394),
         });
         declarations.push(Declaration {
             id: DeclarationId(2231),
@@ -60817,7 +60817,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", 28464, 28480),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28463, 28479),
         });
         declarations.push(Declaration {
             id: DeclarationId(2232),
@@ -60837,7 +60837,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", 28485, 28505),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28484, 28504),
         });
         declarations.push(Declaration {
             id: DeclarationId(2233),
@@ -61292,7 +61292,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", 9584, 9592),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9583, 9591),
         });
         declarations.push(Declaration {
             id: DeclarationId(2264),
@@ -61311,7 +61311,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", 9597, 9637),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9596, 9636),
         });
         declarations.push(Declaration {
             id: DeclarationId(2265),
@@ -61330,7 +61330,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", 9642, 9675),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9641, 9674),
         });
         declarations.push(Declaration {
             id: DeclarationId(2266),
@@ -61355,7 +61355,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", 9680, 9758),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9679, 9757),
         });
         declarations.push(Declaration {
             id: DeclarationId(2267),
@@ -61374,7 +61374,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", 9924, 9987),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9923, 9986),
         });
         declarations.push(Declaration {
             id: DeclarationId(2268),
@@ -61403,7 +61403,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", 9992, 10083),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9991, 10082),
         });
         declarations.push(Declaration {
             id: DeclarationId(2269),
@@ -61432,7 +61432,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", 10088, 10220),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10087, 10219),
         });
         declarations.push(Declaration {
             id: DeclarationId(2270),
@@ -61457,7 +61457,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", 10435, 10524),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10434, 10523),
         });
         declarations.push(Declaration {
             id: DeclarationId(2271),
@@ -61477,7 +61477,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", 11324, 11336),
+            span: SourceSpan::new("src/v3/std/verification.dag", 11323, 11335),
         });
         declarations.push(Declaration {
             id: DeclarationId(2272),
@@ -61506,7 +61506,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", 11273, 11370),
+            span: SourceSpan::new("src/v3/std/verification.dag", 11272, 11369),
         });
         declarations.push(Declaration {
             id: DeclarationId(2273),
@@ -61526,7 +61526,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", 12085, 12097),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12084, 12096),
         });
         declarations.push(Declaration {
             id: DeclarationId(2274),
@@ -61559,7 +61559,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", 12035, 12163),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12034, 12162),
         });
         declarations.push(Declaration {
             id: DeclarationId(2275),
@@ -61588,7 +61588,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", 12461, 12583),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12460, 12582),
         });
         declarations.push(Declaration {
             id: DeclarationId(2276),
@@ -61617,7 +61617,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", 12845, 12970),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12844, 12969),
         });
         declarations.push(Declaration {
             id: DeclarationId(2277),
@@ -61636,7 +61636,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", 15023, 15084),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15022, 15083),
         });
         declarations.push(Declaration {
             id: DeclarationId(2278),
@@ -61661,7 +61661,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", 15089, 15188),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15088, 15187),
         });
         declarations.push(Declaration {
             id: DeclarationId(2279),
@@ -61690,7 +61690,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", 15542, 15674),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15541, 15673),
         });
         declarations.push(Declaration {
             id: DeclarationId(2280),
@@ -61715,7 +61715,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", 16241, 16353),
+            span: SourceSpan::new("src/v3/std/verification.dag", 16240, 16352),
         });
         declarations.push(Declaration {
             id: DeclarationId(2281),
@@ -61740,7 +61740,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", 17050, 17129),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17049, 17128),
         });
         declarations.push(Declaration {
             id: DeclarationId(2282),
@@ -61769,7 +61769,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", 17349, 17462),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17348, 17461),
         });
         declarations.push(Declaration {
             id: DeclarationId(2283),
@@ -61798,7 +61798,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", 17467, 17603),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17466, 17602),
         });
         declarations.push(Declaration {
             id: DeclarationId(2284),
@@ -61823,7 +61823,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", 18089, 18171),
+            span: SourceSpan::new("src/v3/std/verification.dag", 18088, 18170),
         });
         declarations.push(Declaration {
             id: DeclarationId(2285),
@@ -61848,7 +61848,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", 18176, 18262),
+            span: SourceSpan::new("src/v3/std/verification.dag", 18175, 18261),
         });
         declarations.push(Declaration {
             id: DeclarationId(2286),
@@ -61868,7 +61868,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", 18341, 18351),
+            span: SourceSpan::new("src/v3/std/verification.dag", 18340, 18350),
         });
         declarations.push(Declaration {
             id: DeclarationId(2287),
@@ -61893,7 +61893,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", 18267, 18357),
+            span: SourceSpan::new("src/v3/std/verification.dag", 18266, 18356),
         });
         declarations.push(Declaration {
             id: DeclarationId(2288),
@@ -61918,7 +61918,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", 19571, 19696),
+            span: SourceSpan::new("src/v3/std/verification.dag", 19570, 19695),
         });
         declarations.push(Declaration {
             id: DeclarationId(2289),
@@ -61947,7 +61947,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", 20638, 20772),
+            span: SourceSpan::new("src/v3/std/verification.dag", 20637, 20771),
         });
         declarations.push(Declaration {
             id: DeclarationId(2290),
@@ -61976,7 +61976,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", 21411, 21555),
+            span: SourceSpan::new("src/v3/std/verification.dag", 21410, 21554),
         });
         declarations.push(Declaration {
             id: DeclarationId(2291),
@@ -61995,7 +61995,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", 22400, 22454),
+            span: SourceSpan::new("src/v3/std/verification.dag", 22399, 22453),
         });
         declarations.push(Declaration {
             id: DeclarationId(2292),
@@ -62015,7 +62015,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", 23498, 23521),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23497, 23520),
         });
         declarations.push(Declaration {
             id: DeclarationId(2293),
@@ -62029,7 +62029,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", 23724, 23730),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23723, 23729),
         });
         declarations.push(Declaration {
             id: DeclarationId(2294),
@@ -62043,7 +62043,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", 23735, 23741),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23734, 23740),
         });
         declarations.push(Declaration {
             id: DeclarationId(2295),
@@ -62063,7 +62063,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", 23879, 23902),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23878, 23901),
         });
         declarations.push(Declaration {
             id: DeclarationId(2296),
@@ -62082,7 +62082,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", 25625, 25654),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25624, 25653),
         });
         declarations.push(Declaration {
             id: DeclarationId(2297),
@@ -62101,7 +62101,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", 25659, 25698),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25658, 25697),
         });
         declarations.push(Declaration {
             id: DeclarationId(2298),
@@ -62120,7 +62120,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", 26556, 26577),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26555, 26576),
         });
         declarations.push(Declaration {
             id: DeclarationId(2299),
@@ -62139,7 +62139,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", 26582, 26613),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26581, 26612),
         });
         declarations.push(Declaration {
             id: DeclarationId(2300),
@@ -62159,7 +62159,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", 26657, 26673),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26656, 26672),
         });
         declarations.push(Declaration {
             id: DeclarationId(2301),
@@ -62179,7 +62179,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", 26929, 26952),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26928, 26951),
         });
         declarations.push(Declaration {
             id: DeclarationId(2302),

From 479465078ab69b71b151bded44b4d8f17356aa59 Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gmail.com>
Date: Wed, 13 May 2026 01:15:35 +0000
Subject: [PATCH 13/17] Classify parallelism helper carriers in ratchet

---
 ROADMAP.md                                | 2 +-
 docs/thesis/compiler-std-consolidation.md | 6 +++---
 scripts/check-compiler-std-ratchet.sh     | 8 ++++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ROADMAP.md b/ROADMAP.md
index 911dfdd01dd..ff723e36ca2 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -438,7 +438,7 @@ Tracked debt not dispatched with the 2026-04-21 lane wave (Lane 1e P3.0, SG-2c-4
 - **CI ratchet architecture — PARTIAL (T-Receipts W1 second bundle)**: surfaced during the 2026-04-21 reflective analysis (`53b3110..ae8825a` range). Commits `37cd6128`, `4898983e`, `f84ed355` hardened the ratchet against CI-log instability, but `2d8396df` widened the exemption list. `scripts/slow-test-exemptions.txt` currently has **41** active non-comment exemptions (per `scripts/check-test-timeout.sh`’s sed-based count: non-empty lines with inline `#` comments stripped); `scripts/check-test-timeout.sh` meta-ratchet default `TEST_TIMEOUT_MAX_EXEMPTIONS` matches that count. **PR #1856 receipt:** the 41↔41 alignment was re-established by **removing a duplicate** `t_demo_fixture_test::t_demo_canonical_suites_are_runner_visible` exemption row (it had pushed `exempt_count` to **42** vs the default-**41** ratchet floor). **Landed partial:** classification audit [docs/debt/ci-ratchet-exemption-audit-2026-04-24.md](docs/debt/ci-ratchet-exemption-audit-2026-04-24.md) (2026-04-24 baseline) plus follow-up routing audit [docs/debt/ci-ratchet-exemption-audit-2026-05-02.md](docs/debt/ci-ratchet-exemption-audit-2026-05-02.md) (bounded scope — not a completed Phase 1 per-test timing pass). **Still open:** fresh CI-shaped per-test timing audit, stale exemption deletion if any entries measure under 2s, and per-exempt duration budgets once fresh timings exist. Dispatch brief: `docs/briefs/ci-ratchet-architecture-audit.md`.
 - **`IntegrationRsScan` / `integration_rs_active_line_contains` in `src/v3/compiler/tests/integration/common/mod.rs` — PARTIAL (T-Receipts; char/byte-char literal widening **PR #1856**).** Historical context (#686 / #705): the scanner was narrow enough that authors on its scan path avoided `b'\\'` / `b'"'` in favor of numeric byte constants. **Landed in #1856:** explicit `ByteCharLiteral` / `CharLiteral` states with escape-aware skipping plus lifetime vs `'…'` disambiguation and focused unit tests — byte-char and character literals no longer false-green Band-C `#[path` / `mod` needles. (Earlier ROADMAP text cited **PR #1791** for partial CI / row hygiene only; **#1856** is the live implementation receipt for the widening in `common/mod.rs`.) **Residual:** raw strings (`r#"…"#`) and byte strings (`b"…"`, `br#"…"#`) are still intentionally loud via the existing opener probe (panic in `Code`). Dissolution for that remainder: widen `IntegrationRsScan` for those forms **or** replace this scan with a structural reader. Owner: unassigned; P2 Boundary Discipline / T-Receipts bundle.
 - **Stale-receipt sweep in `docs/briefs/` — PARTIAL (T-Receipts W1).** The cited `DeclarationLookup` cleanup brief now carries a historical-receipt banner stating the lane is closed by SG-4b-1-fix and that `DeclarationLookup` / `find_declaration` are gone from `src/v3/lenses/variant_payload.dag`; its stale INVARIANTS refs were also updated to stable anchors. Remaining broad `docs/briefs/` sweep stays open for later post-wave stale claims. **Include:** `docs/design-pure-bootstrap.md`'s hand-maintained count ("78 hand-maintained .rs files") was stale vs. the SG-0 census — **CLOSED in this R1 PR**: all five occurrences (lines 7, 49, 82, 105, 242 of the design doc) now point at the live census, reframed as deltas against the illustrative 78-file baseline, or scoped to the non-test + TESTING residual framing. No frozen absolute count remains.
-- **Compiler–`std/` consolidation program — specific migrations**: end-state defined in [docs/thesis/compiler-std-consolidation.md](docs/thesis/compiler-std-consolidation.md). Each of the migrations below is a standalone lane; together they collapse the compiler-specific type surface toward the positive definition (pipeline + regen + lens-specific return-type carriers + accessor). **Ratchet:** count of `type` declarations in `src/v3/compiler/*.dag` AND `src/v3/lenses/*.dag` that are NOT in the positive-def set AND NOT exempted → 0. Positive-def: pipeline/regen types + lens-API return carriers (`Origin`, `UnusedParameter`, `ComplexitySummary`, `VariantPayloadShapeLookup` 3-variant, `TemplateArgumentBinding` semantic carrier, etc.). Exempted: `parse_tables.dag` (7 types, pending SG-2c-proper per-row classification). In-ratchet: **workaround-shaped infer-helper coproducts with named dissolution triggers (`TemplateArgumentsMatch`, `TemplateArgumentCursor`, `NormalizedInstantiationArgs`)** — Lookup-pattern carriers on lens surfaces import `v3.std.lookup::Lookup` (`complexity`, `cost`, `infer_helpers`). Primary count: 3. See thesis doc table for per-file disposition.
+- **Compiler–`std/` consolidation program — specific migrations**: end-state defined in [docs/thesis/compiler-std-consolidation.md](docs/thesis/compiler-std-consolidation.md). Each of the migrations below is a standalone lane; together they collapse the compiler-specific type surface toward the positive definition (pipeline + regen + lens-specific return-type carriers + accessor). **Ratchet:** count of `type` declarations in `src/v3/compiler/*.dag` AND `src/v3/lenses/*.dag` that are NOT in the positive-def set AND NOT exempted → 0. Positive-def: pipeline/regen types + lens-API return carriers (`Origin`, `UnusedParameter`, `ComplexitySummary`, `VariantPayloadShapeLookup` 3-variant, `TemplateArgumentBinding` semantic carrier, etc.). Exempted: `parse_tables.dag` (7 types, pending SG-2c-proper per-row classification). In-ratchet: **workaround/helper-shaped lens coproducts with named dissolution triggers (`TemplateArgumentsMatch`, `TemplateArgumentCursor`, `NormalizedInstantiationArgs`, `LinearBranchesLookup`, `NonCommutingPairLookup`)** — Lookup-pattern carriers on lens surfaces import `v3.std.lookup::Lookup` (`complexity`, `cost`, `infer_helpers`); `NonCommutingPairLookup` dissolves when typed pairwise non-commute evidence lands on `WorkflowParallelismReport`. Primary count: 5. See thesis doc table for per-file disposition.
   - **`tokenize.dag` → `std/tokenize.dag`** — landed: `Token`, `TokenKind`, `KeywordTokenKind`, `PunctTokenKind`, `LocalPunctSpec`, `StringEscapeSpec` now live in `src/v3/std/tokenize.dag`; compiler-local duplicates deleted. Ratchet drop: 25 → 19.
   - **`runtime_mirrors.dag` → `src/v3/std/parse_surface.dag` (tranche 2)** — landed: `DagDifference`, `Surface*`, and related carriers (~14 types) now live in `v3.std.parse_surface`; `runtime_mirrors.dag` deleted. Ratchet drop: 19 → 5. Parse-rule/fragment dissolution triggers (`parse_parser_body.txt`, SG-2b/SG-3f) unchanged.
   - **`parse_tables.dag`** — decide per-type whether `BinaryOpLevel` / `BinaryOpRow` / `TopLevelItemKwRow` / `SoftKeywordIdentRow` / `BracketRow` / `PrimaryPrefixRow` / `PrimaryAtomRow` stay compiler-API (dispatch-row shapes) or move to `std/syntax.dag` (language-level precedence/dispatch facts). Owner: whoever picks up **SG-2c proper** parser cutover; migration-gate: SG-2c proper completion (the `.dag` parser reveals which rows it dispatches on vs which are pure data). Precedent rule: if any individual row needs to move before SG-2c proper lands, the mover-lane sets the classification and the rest follow the same rule when touched.
diff --git a/docs/thesis/compiler-std-consolidation.md b/docs/thesis/compiler-std-consolidation.md
index 78ad48c62f3..4880f4b278b 100644
--- a/docs/thesis/compiler-std-consolidation.md
+++ b/docs/thesis/compiler-std-consolidation.md
@@ -130,7 +130,7 @@ Exempted (pending named trigger, not counted either direction):
 Ratchet-tracked (**migrates to `std/`, counted against the baseline**):
 - Compiler-side types that duplicate user-facing concepts (tokenize types moved; parse-surface family moved — remaining debt is lens Lookup/coproduct scaffolds listed in the inventory)
 - Strict 2-variant `Missing | Found(T)` Lookup-pattern carriers declared **in** `src/v3/lenses/*.dag` — **none** on the tracked lens/compiler DAG surfaces (`complexity`, `cost`, and `infer_helpers` import `v3.std.lookup::Lookup`). Carriers with additional semantic variants (e.g., `VariantPayloadShapeLookup`'s `NotPayloadProduct`, `TemplateArgumentBinding = Conflict | NoOp | Append`) are lens-API, not in-ratchet.
-- Lens-local workaround-shaped coproducts with named dissolution triggers (today: `TemplateArgumentsMatch`, `TemplateArgumentCursor` in `infer_helpers.dag`) also count against the ratchet; these are implementation scaffolds, not genuine lens-API carriers.
+- Lens-local helper/workaround-shaped coproducts with named dissolution triggers (today: `TemplateArgumentsMatch`, `TemplateArgumentCursor`, `NormalizedInstantiationArgs` in `infer_helpers.dag`, plus `LinearBranchesLookup` / `NonCommutingPairLookup` in `parallelism.dag`) also count against the ratchet; these are implementation scaffolds, not genuine lens-API carriers.
 
 Baseline (2026-04-22, measured via `grep -cE "^type [A-Z]"` after the tokenizer migration; **primary ratchet updated 2026-04-22 — consolidation tranche 2** after `parse_surface` migration):
 
@@ -145,13 +145,13 @@ Baseline (2026-04-22, measured via `grep -cE "^type [A-Z]"` after the tokenizer
 | `src/v3/lenses/idempotency.dag` | 0 | — |
 | `src/v3/lenses/infer_helpers.dag` | 4 | 3 in-ratchet (`TemplateArgumentsMatch`, `TemplateArgumentCursor`, `NormalizedInstantiationArgs` — workaround-shaped coproduct scaffolds with named dissolution triggers) + 1 positive-def (`TemplateArgumentBinding = Conflict \| NoOp \| Append \| ReplaceAt` — semantic carrier); template-argument presence uses imported `Lookup<DeclarationId>` |
 | `src/v3/lenses/lower_helpers.dag` | 0 | — |
-| `src/v3/lenses/parallelism.dag` | 0 | — |
+| `src/v3/lenses/parallelism.dag` | 2 | 2 in-ratchet (`LinearBranchesLookup` — lens-local branch extraction control-flow helper; `NonCommutingPairLookup` — scaffolded pair-evidence carrier until `WorkflowParallelismReport` grows typed non-commute evidence) |
 | `src/v3/lenses/provenance.dag` | 1 | positive-def (`Origin` — provenance-specific) |
 | `src/v3/lenses/structural_resolution.dag` | 2 | both positive-def (`UnresolvedArrowBody` and `NameKeyedReference` — both are lens-API record types carrying the lens's findings, not Lookup patterns) |
 | `src/v3/lenses/unused_parameters.dag` | 1 | positive-def (`UnusedParameter`) |
 | `src/v3/lenses/variant_payload.dag` | 2 | both positive-def (`VariantPayloadShape` domain type + `VariantPayloadShapeLookup` — 3-variant carrier with `NotPayloadProduct` semantic distinction, not generic Lookup) |
 
-**Primary ratchet count today: 3** (0 strict 2-variant Lookup-pattern carriers on lens surfaces — `complexity`, `cost`, and `infer_helpers` import `v3.std.lookup::Lookup` + 3 workaround-shaped infer-helper coproducts: `TemplateArgumentsMatch`, `TemplateArgumentCursor`, `NormalizedInstantiationArgs`). The tokenizer migration removed 6 compiler-local type declarations by moving them to `src/v3/std/tokenize.dag` (25 → 19). Consolidation tranche 2 removed 14 by moving the parse-surface family to `src/v3/std/parse_surface.dag` (19 → 5). The SG-4b callable-instantiation normalization cluster adds `NormalizedInstantiationArgs` as a tracked workaround carrier (Option-as-enum, paired to dissolve alongside `TemplateArgumentsMatch` when the lens→Rust emitter lands verified `T?` / `Bool` return mappings). The complexity lens completion slice widens the positive-def API from the old `CostEntry` row to `Certainty`, `ComplexitySummary`, `ComplexityEntry`, `DominanceOutcome`, and `ComplexityEnforcedApplication` while keeping the generic presence carrier imported from `v3.std.lookup`. All lens-local types now classified — `structural_resolution.dag`'s two record types (`UnresolvedArrowBody`, `NameKeyedReference`) are positive-def lens-API carrying the lens's findings.
+**Primary ratchet count today: 5** (0 strict 2-variant Lookup-pattern carriers on lens surfaces — `complexity`, `cost`, and `infer_helpers` import `v3.std.lookup::Lookup` + 3 workaround-shaped infer-helper coproducts: `TemplateArgumentsMatch`, `TemplateArgumentCursor`, `NormalizedInstantiationArgs` + 2 parallelism helper/scaffold coproducts: `LinearBranchesLookup`, `NonCommutingPairLookup`). The tokenizer migration removed 6 compiler-local type declarations by moving them to `src/v3/std/tokenize.dag` (25 → 19). Consolidation tranche 2 removed 14 by moving the parse-surface family to `src/v3/std/parse_surface.dag` (19 → 5). The SG-4b callable-instantiation normalization cluster adds `NormalizedInstantiationArgs` as a tracked workaround carrier (Option-as-enum, paired to dissolve alongside `TemplateArgumentsMatch` when the lens→Rust emitter lands verified `T?` / `Bool` return mappings). The parallelism walker port adds `LinearBranchesLookup` as a private branch-extraction control-flow helper and `NonCommutingPairLookup` as a scaffold that dissolves when typed pairwise non-commute evidence lands on `WorkflowParallelismReport`. The complexity lens completion slice widens the positive-def API from the old `CostEntry` row to `Certainty`, `ComplexitySummary`, `ComplexityEntry`, `DominanceOutcome`, and `ComplexityEnforcedApplication` while keeping the generic presence carrier imported from `v3.std.lookup`. All lens-local types now classified — `structural_resolution.dag`'s two record types (`UnresolvedArrowBody`, `NameKeyedReference`) are positive-def lens-API carrying the lens's findings.
 
 End state: 0. Each migration lane reduces the count; positive-definition types track growth separately and are not bounded downward by this ratchet.
 
diff --git a/scripts/check-compiler-std-ratchet.sh b/scripts/check-compiler-std-ratchet.sh
index b8a2a8a279a..eb0e6c719b0 100755
--- a/scripts/check-compiler-std-ratchet.sh
+++ b/scripts/check-compiler-std-ratchet.sh
@@ -19,7 +19,7 @@ set -euo pipefail
 REPO_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
 cd "$REPO_ROOT"
 
-BASELINE_TRACKED_TOTAL=3
+BASELINE_TRACKED_TOTAL=5
 
 SURFACES=(
   src/v3/compiler/*.dag
@@ -66,11 +66,15 @@ EXEMPT_ROWS=(
 
 # `complexity.dag`, `cost.dag`, and `infer_helpers.dag` no longer declare local
 # 2-variant `Lookup` sums — they import `v3.std.lookup::Lookup` (authority in
-# `src/v3/std/lookup.dag`, outside this script's counted surfaces).
+# `src/v3/std/lookup.dag`, outside this script's counted surfaces). Remaining
+# rows here are lens-local helper/scaffold coproducts with named dissolution
+# triggers; they are not published lens API carriers.
 TRACKED_ROWS=(
   "src/v3/lenses/infer_helpers.dag:TemplateArgumentsMatch"
   "src/v3/lenses/infer_helpers.dag:TemplateArgumentCursor"
   "src/v3/lenses/infer_helpers.dag:NormalizedInstantiationArgs"
+  "src/v3/lenses/parallelism.dag:LinearBranchesLookup"
+  "src/v3/lenses/parallelism.dag:NonCommutingPairLookup"
 )
 
 collect_type_rows() {

From 23d399ddf5b121143da2d595de1c88d9276d3c84 Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gmail.com>
Date: Tue, 12 May 2026 21:42:40 -0400
Subject: [PATCH 14/17] =?UTF-8?q?WIP:=20T-Cluster-F-=CE=B1=20S1=20#81=20pa?=
 =?UTF-8?q?rallelism=20walker=20port=20(src/v3/compiler/src/workfl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/v3/compiler/src/dag.rs                    |  2 ++
 .../src/lens_parallelism_generated.rs         | 25 ++++++++-----------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/v3/compiler/src/dag.rs b/src/v3/compiler/src/dag.rs
index c6f9a07a294..0153c78f9fb 100644
--- a/src/v3/compiler/src/dag.rs
+++ b/src/v3/compiler/src/dag.rs
@@ -339,6 +339,8 @@ pub use computation::{
     IterationPrimitive, LoweringTarget, ShrinkFactor, SizeBound,
 };
 
+pub(crate) use effects::compose_operation_effects;
+
 pub use effects::{
     analyze_workflow, lane2_workflow_idempotency_report, report_unsupported_workflow_variant,
     BranchArm, BreakingShape, CompositionVerdict, CreateCause, EffectShape, HttpMethodScalar,
diff --git a/src/v3/compiler/src/lens_parallelism_generated.rs b/src/v3/compiler/src/lens_parallelism_generated.rs
index 4315fbc4335..6ab3dd3ea36 100644
--- a/src/v3/compiler/src/lens_parallelism_generated.rs
+++ b/src/v3/compiler/src/lens_parallelism_generated.rs
@@ -58,19 +58,11 @@ fn extract_linear_branches(
     Some(out)
 }
 
-fn first_breaking_across_branches(
-    branch_ops: &[Vec<OperationEffect>],
-) -> Option<ElementRef<OperationEffect>> {
-    let flattened: Vec<OperationEffect> = branch_ops
+fn flatten_branch_ops(branch_ops: &[Vec<OperationEffect>]) -> Vec<OperationEffect> {
+    branch_ops
         .iter()
         .flat_map(|ops| ops.iter().cloned())
-        .collect();
-    for (index, op) in flattened.iter().enumerate() {
-        if matches!(op.shape, EffectShape::IsBreaking(_)) {
-            return ElementRef::from_slice(flattened.as_slice(), index);
-        }
-    }
-    None
+        .collect()
 }
 
 fn pairwise_cross_branch_commutes(
@@ -109,10 +101,13 @@ pub fn analyze_parallelism(p0: &Dag, p1: NodeId) -> WorkflowParallelismReport {
             "Stage 2e v1 requires every parallel branch to be `LinearEffect`",
         );
     };
-    if let Some(b) = first_breaking_across_branches(&branch_ops) {
-        return WorkflowParallelismReport::ParallelCompositionVerdict(CompositionVerdict::BrokenBy {
-            first_breaker: b,
-        });
+    match compose_operation_effects(flatten_branch_ops(&branch_ops).as_slice()) {
+        CompositionVerdict::BrokenBy { first_breaker } => {
+            return WorkflowParallelismReport::ParallelCompositionVerdict(
+                CompositionVerdict::BrokenBy { first_breaker },
+            );
+        }
+        CompositionVerdict::IdempotentComposition => {}
     }
     match pairwise_cross_branch_commutes(&branch_ops) {
         Ok(()) => WorkflowParallelismReport::ParallelCompositionVerdict(

From f97ea6eb27ce031b0d7f09da87038f1005ead3cd Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gmail.com>
Date: Tue, 12 May 2026 22:00:44 -0400
Subject: [PATCH 15/17] =?UTF-8?q?WIP:=20T-Cluster-F-=CE=B1=20S1=20#81=20pa?=
 =?UTF-8?q?rallelism=20walker=20port=20(src/v3/compiler/src/workfl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ROADMAP.md                                    |     2 +-
 docs/thesis/compiler-std-consolidation.md     |     6 +-
 src/v3/compiler/src/bootstrap_generated.rs    | 10517 ++++++++--------
 ...otstrap_generated_without_parse_surface.rs |  7943 ++++++------
 4 files changed, 9265 insertions(+), 9203 deletions(-)

diff --git a/ROADMAP.md b/ROADMAP.md
index ff723e36ca2..f8e918b49fe 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -438,7 +438,7 @@ Tracked debt not dispatched with the 2026-04-21 lane wave (Lane 1e P3.0, SG-2c-4
 - **CI ratchet architecture — PARTIAL (T-Receipts W1 second bundle)**: surfaced during the 2026-04-21 reflective analysis (`53b3110..ae8825a` range). Commits `37cd6128`, `4898983e`, `f84ed355` hardened the ratchet against CI-log instability, but `2d8396df` widened the exemption list. `scripts/slow-test-exemptions.txt` currently has **41** active non-comment exemptions (per `scripts/check-test-timeout.sh`’s sed-based count: non-empty lines with inline `#` comments stripped); `scripts/check-test-timeout.sh` meta-ratchet default `TEST_TIMEOUT_MAX_EXEMPTIONS` matches that count. **PR #1856 receipt:** the 41↔41 alignment was re-established by **removing a duplicate** `t_demo_fixture_test::t_demo_canonical_suites_are_runner_visible` exemption row (it had pushed `exempt_count` to **42** vs the default-**41** ratchet floor). **Landed partial:** classification audit [docs/debt/ci-ratchet-exemption-audit-2026-04-24.md](docs/debt/ci-ratchet-exemption-audit-2026-04-24.md) (2026-04-24 baseline) plus follow-up routing audit [docs/debt/ci-ratchet-exemption-audit-2026-05-02.md](docs/debt/ci-ratchet-exemption-audit-2026-05-02.md) (bounded scope — not a completed Phase 1 per-test timing pass). **Still open:** fresh CI-shaped per-test timing audit, stale exemption deletion if any entries measure under 2s, and per-exempt duration budgets once fresh timings exist. Dispatch brief: `docs/briefs/ci-ratchet-architecture-audit.md`.
 - **`IntegrationRsScan` / `integration_rs_active_line_contains` in `src/v3/compiler/tests/integration/common/mod.rs` — PARTIAL (T-Receipts; char/byte-char literal widening **PR #1856**).** Historical context (#686 / #705): the scanner was narrow enough that authors on its scan path avoided `b'\\'` / `b'"'` in favor of numeric byte constants. **Landed in #1856:** explicit `ByteCharLiteral` / `CharLiteral` states with escape-aware skipping plus lifetime vs `'…'` disambiguation and focused unit tests — byte-char and character literals no longer false-green Band-C `#[path` / `mod` needles. (Earlier ROADMAP text cited **PR #1791** for partial CI / row hygiene only; **#1856** is the live implementation receipt for the widening in `common/mod.rs`.) **Residual:** raw strings (`r#"…"#`) and byte strings (`b"…"`, `br#"…"#`) are still intentionally loud via the existing opener probe (panic in `Code`). Dissolution for that remainder: widen `IntegrationRsScan` for those forms **or** replace this scan with a structural reader. Owner: unassigned; P2 Boundary Discipline / T-Receipts bundle.
 - **Stale-receipt sweep in `docs/briefs/` — PARTIAL (T-Receipts W1).** The cited `DeclarationLookup` cleanup brief now carries a historical-receipt banner stating the lane is closed by SG-4b-1-fix and that `DeclarationLookup` / `find_declaration` are gone from `src/v3/lenses/variant_payload.dag`; its stale INVARIANTS refs were also updated to stable anchors. Remaining broad `docs/briefs/` sweep stays open for later post-wave stale claims. **Include:** `docs/design-pure-bootstrap.md`'s hand-maintained count ("78 hand-maintained .rs files") was stale vs. the SG-0 census — **CLOSED in this R1 PR**: all five occurrences (lines 7, 49, 82, 105, 242 of the design doc) now point at the live census, reframed as deltas against the illustrative 78-file baseline, or scoped to the non-test + TESTING residual framing. No frozen absolute count remains.
-- **Compiler–`std/` consolidation program — specific migrations**: end-state defined in [docs/thesis/compiler-std-consolidation.md](docs/thesis/compiler-std-consolidation.md). Each of the migrations below is a standalone lane; together they collapse the compiler-specific type surface toward the positive definition (pipeline + regen + lens-specific return-type carriers + accessor). **Ratchet:** count of `type` declarations in `src/v3/compiler/*.dag` AND `src/v3/lenses/*.dag` that are NOT in the positive-def set AND NOT exempted → 0. Positive-def: pipeline/regen types + lens-API return carriers (`Origin`, `UnusedParameter`, `ComplexitySummary`, `VariantPayloadShapeLookup` 3-variant, `TemplateArgumentBinding` semantic carrier, etc.). Exempted: `parse_tables.dag` (7 types, pending SG-2c-proper per-row classification). In-ratchet: **workaround/helper-shaped lens coproducts with named dissolution triggers (`TemplateArgumentsMatch`, `TemplateArgumentCursor`, `NormalizedInstantiationArgs`, `LinearBranchesLookup`, `NonCommutingPairLookup`)** — Lookup-pattern carriers on lens surfaces import `v3.std.lookup::Lookup` (`complexity`, `cost`, `infer_helpers`); `NonCommutingPairLookup` dissolves when typed pairwise non-commute evidence lands on `WorkflowParallelismReport`. Primary count: 5. See thesis doc table for per-file disposition.
+- **Compiler–`std/` consolidation program — specific migrations**: end-state defined in [docs/thesis/compiler-std-consolidation.md](docs/thesis/compiler-std-consolidation.md). Each of the migrations below is a standalone lane; together they collapse the compiler-specific type surface toward the positive definition (pipeline + regen + lens-specific return-type carriers + accessor). **Ratchet:** count of `type` declarations in `src/v3/compiler/*.dag` AND `src/v3/lenses/*.dag` that are NOT in the positive-def set AND NOT exempted → 0. Positive-def: pipeline/regen types + lens-API return carriers (`Origin`, `UnusedParameter`, `ComplexitySummary`, `VariantPayloadShapeLookup` 3-variant, `TemplateArgumentBinding` semantic carrier, `LinearBranchesLookup` terminal lens-private control-flow carrier, etc.). Exempted: `parse_tables.dag` (7 types, pending SG-2c-proper per-row classification). In-ratchet: **workaround/scaffold-shaped lens coproducts with named dissolution triggers (`TemplateArgumentsMatch`, `TemplateArgumentCursor`, `NormalizedInstantiationArgs`, `NonCommutingPairLookup`)** — Lookup-pattern carriers on lens surfaces import `v3.std.lookup::Lookup` (`complexity`, `cost`, `infer_helpers`); `NonCommutingPairLookup` dissolves when typed pairwise non-commute evidence lands on `WorkflowParallelismReport`. Primary count: 4. See thesis doc table for per-file disposition.
   - **`tokenize.dag` → `std/tokenize.dag`** — landed: `Token`, `TokenKind`, `KeywordTokenKind`, `PunctTokenKind`, `LocalPunctSpec`, `StringEscapeSpec` now live in `src/v3/std/tokenize.dag`; compiler-local duplicates deleted. Ratchet drop: 25 → 19.
   - **`runtime_mirrors.dag` → `src/v3/std/parse_surface.dag` (tranche 2)** — landed: `DagDifference`, `Surface*`, and related carriers (~14 types) now live in `v3.std.parse_surface`; `runtime_mirrors.dag` deleted. Ratchet drop: 19 → 5. Parse-rule/fragment dissolution triggers (`parse_parser_body.txt`, SG-2b/SG-3f) unchanged.
   - **`parse_tables.dag`** — decide per-type whether `BinaryOpLevel` / `BinaryOpRow` / `TopLevelItemKwRow` / `SoftKeywordIdentRow` / `BracketRow` / `PrimaryPrefixRow` / `PrimaryAtomRow` stay compiler-API (dispatch-row shapes) or move to `std/syntax.dag` (language-level precedence/dispatch facts). Owner: whoever picks up **SG-2c proper** parser cutover; migration-gate: SG-2c proper completion (the `.dag` parser reveals which rows it dispatches on vs which are pure data). Precedent rule: if any individual row needs to move before SG-2c proper lands, the mover-lane sets the classification and the rest follow the same rule when touched.
diff --git a/docs/thesis/compiler-std-consolidation.md b/docs/thesis/compiler-std-consolidation.md
index 4880f4b278b..593e3e0cee5 100644
--- a/docs/thesis/compiler-std-consolidation.md
+++ b/docs/thesis/compiler-std-consolidation.md
@@ -130,7 +130,7 @@ Exempted (pending named trigger, not counted either direction):
 Ratchet-tracked (**migrates to `std/`, counted against the baseline**):
 - Compiler-side types that duplicate user-facing concepts (tokenize types moved; parse-surface family moved — remaining debt is lens Lookup/coproduct scaffolds listed in the inventory)
 - Strict 2-variant `Missing | Found(T)` Lookup-pattern carriers declared **in** `src/v3/lenses/*.dag` — **none** on the tracked lens/compiler DAG surfaces (`complexity`, `cost`, and `infer_helpers` import `v3.std.lookup::Lookup`). Carriers with additional semantic variants (e.g., `VariantPayloadShapeLookup`'s `NotPayloadProduct`, `TemplateArgumentBinding = Conflict | NoOp | Append`) are lens-API, not in-ratchet.
-- Lens-local helper/workaround-shaped coproducts with named dissolution triggers (today: `TemplateArgumentsMatch`, `TemplateArgumentCursor`, `NormalizedInstantiationArgs` in `infer_helpers.dag`, plus `LinearBranchesLookup` / `NonCommutingPairLookup` in `parallelism.dag`) also count against the ratchet; these are implementation scaffolds, not genuine lens-API carriers.
+- Lens-local workaround-shaped coproducts with named dissolution triggers (today: `TemplateArgumentsMatch`, `TemplateArgumentCursor`, `NormalizedInstantiationArgs` in `infer_helpers.dag`, plus `NonCommutingPairLookup` in `parallelism.dag`) also count against the ratchet; these are implementation scaffolds, not genuine lens-API carriers.
 
 Baseline (2026-04-22, measured via `grep -cE "^type [A-Z]"` after the tokenizer migration; **primary ratchet updated 2026-04-22 — consolidation tranche 2** after `parse_surface` migration):
 
@@ -145,13 +145,13 @@ Baseline (2026-04-22, measured via `grep -cE "^type [A-Z]"` after the tokenizer
 | `src/v3/lenses/idempotency.dag` | 0 | — |
 | `src/v3/lenses/infer_helpers.dag` | 4 | 3 in-ratchet (`TemplateArgumentsMatch`, `TemplateArgumentCursor`, `NormalizedInstantiationArgs` — workaround-shaped coproduct scaffolds with named dissolution triggers) + 1 positive-def (`TemplateArgumentBinding = Conflict \| NoOp \| Append \| ReplaceAt` — semantic carrier); template-argument presence uses imported `Lookup<DeclarationId>` |
 | `src/v3/lenses/lower_helpers.dag` | 0 | — |
-| `src/v3/lenses/parallelism.dag` | 2 | 2 in-ratchet (`LinearBranchesLookup` — lens-local branch extraction control-flow helper; `NonCommutingPairLookup` — scaffolded pair-evidence carrier until `WorkflowParallelismReport` grows typed non-commute evidence) |
+| `src/v3/lenses/parallelism.dag` | 2 | 1 positive-def (`LinearBranchesLookup` — terminal lens-private branch extraction control-flow helper, not a dissolving scaffold) + 1 in-ratchet (`NonCommutingPairLookup` — scaffolded pair-evidence carrier until `WorkflowParallelismReport` grows typed non-commute evidence) |
 | `src/v3/lenses/provenance.dag` | 1 | positive-def (`Origin` — provenance-specific) |
 | `src/v3/lenses/structural_resolution.dag` | 2 | both positive-def (`UnresolvedArrowBody` and `NameKeyedReference` — both are lens-API record types carrying the lens's findings, not Lookup patterns) |
 | `src/v3/lenses/unused_parameters.dag` | 1 | positive-def (`UnusedParameter`) |
 | `src/v3/lenses/variant_payload.dag` | 2 | both positive-def (`VariantPayloadShape` domain type + `VariantPayloadShapeLookup` — 3-variant carrier with `NotPayloadProduct` semantic distinction, not generic Lookup) |
 
-**Primary ratchet count today: 5** (0 strict 2-variant Lookup-pattern carriers on lens surfaces — `complexity`, `cost`, and `infer_helpers` import `v3.std.lookup::Lookup` + 3 workaround-shaped infer-helper coproducts: `TemplateArgumentsMatch`, `TemplateArgumentCursor`, `NormalizedInstantiationArgs` + 2 parallelism helper/scaffold coproducts: `LinearBranchesLookup`, `NonCommutingPairLookup`). The tokenizer migration removed 6 compiler-local type declarations by moving them to `src/v3/std/tokenize.dag` (25 → 19). Consolidation tranche 2 removed 14 by moving the parse-surface family to `src/v3/std/parse_surface.dag` (19 → 5). The SG-4b callable-instantiation normalization cluster adds `NormalizedInstantiationArgs` as a tracked workaround carrier (Option-as-enum, paired to dissolve alongside `TemplateArgumentsMatch` when the lens→Rust emitter lands verified `T?` / `Bool` return mappings). The parallelism walker port adds `LinearBranchesLookup` as a private branch-extraction control-flow helper and `NonCommutingPairLookup` as a scaffold that dissolves when typed pairwise non-commute evidence lands on `WorkflowParallelismReport`. The complexity lens completion slice widens the positive-def API from the old `CostEntry` row to `Certainty`, `ComplexitySummary`, `ComplexityEntry`, `DominanceOutcome`, and `ComplexityEnforcedApplication` while keeping the generic presence carrier imported from `v3.std.lookup`. All lens-local types now classified — `structural_resolution.dag`'s two record types (`UnresolvedArrowBody`, `NameKeyedReference`) are positive-def lens-API carrying the lens's findings.
+**Primary ratchet count today: 4** (0 strict 2-variant Lookup-pattern carriers on lens surfaces — `complexity`, `cost`, and `infer_helpers` import `v3.std.lookup::Lookup` + 3 workaround-shaped infer-helper coproducts: `TemplateArgumentsMatch`, `TemplateArgumentCursor`, `NormalizedInstantiationArgs` + 1 parallelism scaffold coproduct: `NonCommutingPairLookup`). The tokenizer migration removed 6 compiler-local type declarations by moving them to `src/v3/std/tokenize.dag` (25 → 19). Consolidation tranche 2 removed 14 by moving the parse-surface family to `src/v3/std/parse_surface.dag` (19 → 5). The SG-4b callable-instantiation normalization cluster adds `NormalizedInstantiationArgs` as a tracked workaround carrier (Option-as-enum, paired to dissolve alongside `TemplateArgumentsMatch` when the lens→Rust emitter lands verified `T?` / `Bool` return mappings). The parallelism walker port adds `LinearBranchesLookup` as a terminal private branch-extraction control-flow helper and `NonCommutingPairLookup` as a scaffold that dissolves when typed pairwise non-commute evidence lands on `WorkflowParallelismReport`. The complexity lens completion slice widens the positive-def API from the old `CostEntry` row to `Certainty`, `ComplexitySummary`, `ComplexityEntry`, `DominanceOutcome`, and `ComplexityEnforcedApplication` while keeping the generic presence carrier imported from `v3.std.lookup`. All lens-local types now classified — `structural_resolution.dag`'s two record types (`UnresolvedArrowBody`, `NameKeyedReference`) are positive-def lens-API carrying the lens's findings.
 
 End state: 0. Each migration lane reduces the count; positive-definition types track growth separately and are not bounded downward by this ratchet.
 
diff --git a/src/v3/compiler/src/bootstrap_generated.rs b/src/v3/compiler/src/bootstrap_generated.rs
index cd38ae2b25e..3dd14a92607 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: 854,
-        next_declaration_id: 3346,
+        next_declaration_id: 3348,
         next_port_id: 1021,
         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: 3346,
+        declaration_append_begin_after_bootstrap: 3348,
     }
 }
 
@@ -1402,21 +1402,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(182),
-            target: TransformTarget::Callable(DeclarationId(2062)),
+            target: TransformTarget::Callable(DeclarationId(2064)),
             inputs: vec![PortId(185)],
             output: PortId(187),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11495, 11507),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(183),
-            target: TransformTarget::Callable(DeclarationId(2064)),
+            target: TransformTarget::Callable(DeclarationId(2066)),
             inputs: vec![PortId(187)],
             output: PortId(188),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11488, 11535),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(184),
-            target: TransformTarget::Callable(DeclarationId(2008)),
+            target: TransformTarget::Callable(DeclarationId(2010)),
             inputs: vec![PortId(185), PortId(186), PortId(188)],
             output: PortId(189),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11149, 11539),
@@ -1432,7 +1432,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(186),
-            target: TransformTarget::Callable(DeclarationId(2010)),
+            target: TransformTarget::Callable(DeclarationId(2012)),
             inputs: vec![PortId(190), PortId(191), PortId(192)],
             output: PortId(193),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11670, 11726),
@@ -1448,7 +1448,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(188),
-            target: TransformTarget::Callable(DeclarationId(2065)),
+            target: TransformTarget::Callable(DeclarationId(2067)),
             inputs: vec![PortId(194)],
             output: PortId(195),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11795, 11810),
@@ -1600,7 +1600,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(202),
-            target: TransformTarget::Callable(DeclarationId(2049)),
+            target: TransformTarget::Callable(DeclarationId(2051)),
             inputs: vec![PortId(211)],
             output: PortId(212),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12325, 12349),
@@ -1630,7 +1630,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(206),
-            target: TransformTarget::Callable(DeclarationId(2047)),
+            target: TransformTarget::Callable(DeclarationId(2049)),
             inputs: vec![PortId(216)],
             output: PortId(217),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12618, 12653),
@@ -1760,14 +1760,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(218),
-            target: TransformTarget::Callable(DeclarationId(2043)),
+            target: TransformTarget::Callable(DeclarationId(2045)),
             inputs: vec![PortId(230)],
             output: PortId(231),
             span: SourceSpan::new("src/v3/std/algebra.dag", 14214, 14229),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(219),
-            target: TransformTarget::Callable(DeclarationId(2067)),
+            target: TransformTarget::Callable(DeclarationId(2069)),
             inputs: vec![PortId(229), PortId(231)],
             output: PortId(232),
             span: SourceSpan::new("src/v3/std/algebra.dag", 14202, 14245),
@@ -2472,7 +2472,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(266),
-            target: TransformTarget::Callable(DeclarationId(2069)),
+            target: TransformTarget::Callable(DeclarationId(2071)),
             inputs: vec![PortId(312), PortId(313)],
             output: PortId(314),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16911, 17021),
@@ -2500,7 +2500,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(270),
-            target: TransformTarget::Callable(DeclarationId(2071)),
+            target: TransformTarget::Callable(DeclarationId(2073)),
             inputs: vec![PortId(317), PortId(318)],
             output: PortId(319),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17076, 17186),
@@ -3993,14 +3993,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(364),
-            target: TransformTarget::Callable(DeclarationId(2072)),
+            target: TransformTarget::Callable(DeclarationId(2074)),
             inputs: vec![PortId(425), PortId(426)],
             output: PortId(427),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22293, 22323),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(365),
-            target: TransformTarget::Callable(DeclarationId(2073)),
+            target: TransformTarget::Callable(DeclarationId(2075)),
             inputs: vec![PortId(424), PortId(427)],
             output: PortId(428),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22275, 22324),
@@ -4016,7 +4016,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(367),
-            target: TransformTarget::Callable(DeclarationId(2074)),
+            target: TransformTarget::Callable(DeclarationId(2076)),
             inputs: vec![],
             output: PortId(430),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22603, 22610),
@@ -4080,7 +4080,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(375),
-            target: TransformTarget::Callable(DeclarationId(2075)),
+            target: TransformTarget::Callable(DeclarationId(2077)),
             inputs: vec![PortId(436), PortId(438)],
             output: PortId(439),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22737, 22789),
@@ -4176,21 +4176,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(382),
-            target: TransformTarget::Callable(DeclarationId(2043)),
+            target: TransformTarget::Callable(DeclarationId(2045)),
             inputs: vec![PortId(445)],
             output: PortId(446),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23123, 23138),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(383),
-            target: TransformTarget::Callable(DeclarationId(2076)),
+            target: TransformTarget::Callable(DeclarationId(2078)),
             inputs: vec![],
             output: PortId(447),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23140, 23147),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(384),
-            target: TransformTarget::Callable(DeclarationId(2077)),
+            target: TransformTarget::Callable(DeclarationId(2079)),
             inputs: vec![PortId(446), PortId(447)],
             output: PortId(448),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23118, 23148),
@@ -4327,7 +4327,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(396),
-            target: TransformTarget::Callable(DeclarationId(2078)),
+            target: TransformTarget::Callable(DeclarationId(2080)),
             inputs: vec![],
             output: PortId(461),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23597, 23604),
@@ -4391,7 +4391,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(404),
-            target: TransformTarget::Callable(DeclarationId(2079)),
+            target: TransformTarget::Callable(DeclarationId(2081)),
             inputs: vec![PortId(467), PortId(469)],
             output: PortId(470),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23735, 23792),
@@ -4796,7 +4796,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(430),
-            target: TransformTarget::Callable(DeclarationId(2043)),
+            target: TransformTarget::Callable(DeclarationId(2045)),
             inputs: vec![PortId(509)],
             output: PortId(510),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25180, 25195),
@@ -4839,7 +4839,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(435),
-            target: TransformTarget::Callable(DeclarationId(2080)),
+            target: TransformTarget::Callable(DeclarationId(2082)),
             inputs: vec![PortId(515), PortId(516)],
             output: PortId(517),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25317, 25349),
@@ -4936,7 +4936,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(442),
-            target: TransformTarget::Callable(DeclarationId(2043)),
+            target: TransformTarget::Callable(DeclarationId(2045)),
             inputs: vec![PortId(523)],
             output: PortId(524),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25451, 25466),
@@ -4995,7 +4995,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(449),
-            target: TransformTarget::Callable(DeclarationId(2049)),
+            target: TransformTarget::Callable(DeclarationId(2051)),
             inputs: vec![PortId(532)],
             output: PortId(533),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25569, 25628),
@@ -5078,7 +5078,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(454),
-            target: TransformTarget::Callable(DeclarationId(2043)),
+            target: TransformTarget::Callable(DeclarationId(2045)),
             inputs: vec![PortId(537)],
             output: PortId(538),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25917, 25932),
@@ -5171,7 +5171,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(465),
-            target: TransformTarget::Callable(DeclarationId(2047)),
+            target: TransformTarget::Callable(DeclarationId(2049)),
             inputs: vec![PortId(551)],
             output: PortId(552),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26159, 26222),
@@ -5643,7 +5643,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(494),
-            target: TransformTarget::Callable(DeclarationId(2047)),
+            target: TransformTarget::Callable(DeclarationId(2049)),
             inputs: vec![PortId(601)],
             output: PortId(602),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27605, 27633),
@@ -5734,7 +5734,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(505),
-            target: TransformTarget::Callable(DeclarationId(2081)),
+            target: TransformTarget::Callable(DeclarationId(2083)),
             inputs: vec![],
             output: PortId(615),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27988, 27995),
@@ -5798,7 +5798,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(513),
-            target: TransformTarget::Callable(DeclarationId(2082)),
+            target: TransformTarget::Callable(DeclarationId(2084)),
             inputs: vec![PortId(621), PortId(623)],
             output: PortId(624),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28136, 28201),
@@ -5887,7 +5887,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(519),
-            target: TransformTarget::Callable(DeclarationId(2084)),
+            target: TransformTarget::Callable(DeclarationId(2086)),
             inputs: vec![PortId(628), PortId(630)],
             output: PortId(631),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28319, 28377),
@@ -5908,7 +5908,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(522),
-            target: TransformTarget::Callable(DeclarationId(2085)),
+            target: TransformTarget::Callable(DeclarationId(2087)),
             inputs: vec![PortId(629), PortId(633)],
             output: PortId(634),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28403, 28449),
@@ -5951,14 +5951,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(525),
-            target: TransformTarget::Callable(DeclarationId(2086)),
+            target: TransformTarget::Callable(DeclarationId(2088)),
             inputs: vec![],
             output: PortId(637),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28720, 28727),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(526),
-            target: TransformTarget::Callable(DeclarationId(2088)),
+            target: TransformTarget::Callable(DeclarationId(2090)),
             inputs: vec![PortId(636), PortId(637)],
             output: PortId(638),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28708, 28749),
@@ -5981,7 +5981,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(529),
-            target: TransformTarget::Callable(DeclarationId(2043)),
+            target: TransformTarget::Callable(DeclarationId(2045)),
             inputs: vec![PortId(640)],
             output: PortId(641),
             span: SourceSpan::new("src/v3/std/induction.dag", 29099, 29114),
@@ -6054,7 +6054,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(538),
-            target: TransformTarget::Callable(DeclarationId(2051)),
+            target: TransformTarget::Callable(DeclarationId(2053)),
             inputs: vec![PortId(653)],
             output: PortId(654),
             span: SourceSpan::new("src/v3/std/induction.dag", 29338, 29412),
@@ -6068,7 +6068,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(540),
-            target: TransformTarget::Callable(DeclarationId(2051)),
+            target: TransformTarget::Callable(DeclarationId(2053)),
             inputs: vec![PortId(655)],
             output: PortId(656),
             span: SourceSpan::new("src/v3/std/induction.dag", 29433, 29461),
@@ -6082,7 +6082,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(542),
-            target: TransformTarget::Callable(DeclarationId(2051)),
+            target: TransformTarget::Callable(DeclarationId(2053)),
             inputs: vec![PortId(657)],
             output: PortId(658),
             span: SourceSpan::new("src/v3/std/induction.dag", 29480, 29513),
@@ -6209,7 +6209,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(548),
-            target: TransformTarget::Callable(DeclarationId(2051)),
+            target: TransformTarget::Callable(DeclarationId(2053)),
             inputs: vec![PortId(664)],
             output: PortId(665),
             span: SourceSpan::new("src/v3/std/induction.dag", 29645, 29726),
@@ -6234,7 +6234,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(551),
-            target: TransformTarget::Callable(DeclarationId(2051)),
+            target: TransformTarget::Callable(DeclarationId(2053)),
             inputs: vec![PortId(668)],
             output: PortId(669),
             span: SourceSpan::new("src/v3/std/induction.dag", 29761, 29835),
@@ -6320,7 +6320,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(559),
-            target: TransformTarget::Callable(DeclarationId(2526)),
+            target: TransformTarget::Callable(DeclarationId(2528)),
             inputs: vec![PortId(678)],
             output: PortId(679),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3203, 3241),
@@ -6343,7 +6343,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(562),
-            target: TransformTarget::Callable(DeclarationId(2527)),
+            target: TransformTarget::Callable(DeclarationId(2529)),
             inputs: vec![PortId(682)],
             output: PortId(683),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3281, 3319),
@@ -6409,7 +6409,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(567),
-            target: TransformTarget::Callable(DeclarationId(2528)),
+            target: TransformTarget::Callable(DeclarationId(2530)),
             inputs: vec![PortId(688)],
             output: PortId(689),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3440, 3478),
@@ -6432,7 +6432,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(570),
-            target: TransformTarget::Callable(DeclarationId(2529)),
+            target: TransformTarget::Callable(DeclarationId(2531)),
             inputs: vec![PortId(692)],
             output: PortId(693),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3518, 3556),
@@ -6498,7 +6498,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(575),
-            target: TransformTarget::Callable(DeclarationId(2530)),
+            target: TransformTarget::Callable(DeclarationId(2532)),
             inputs: vec![PortId(698)],
             output: PortId(699),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3674, 3712),
@@ -6521,7 +6521,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(578),
-            target: TransformTarget::Callable(DeclarationId(2531)),
+            target: TransformTarget::Callable(DeclarationId(2533)),
             inputs: vec![PortId(702)],
             output: PortId(703),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3752, 3790),
@@ -6587,7 +6587,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(583),
-            target: TransformTarget::Callable(DeclarationId(2532)),
+            target: TransformTarget::Callable(DeclarationId(2534)),
             inputs: vec![PortId(708)],
             output: PortId(709),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3906, 3944),
@@ -6610,7 +6610,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(586),
-            target: TransformTarget::Callable(DeclarationId(2533)),
+            target: TransformTarget::Callable(DeclarationId(2535)),
             inputs: vec![PortId(712)],
             output: PortId(713),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3984, 4022),
@@ -6676,7 +6676,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(591),
-            target: TransformTarget::Callable(DeclarationId(2534)),
+            target: TransformTarget::Callable(DeclarationId(2536)),
             inputs: vec![PortId(718)],
             output: PortId(719),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4138, 4176),
@@ -6699,7 +6699,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(594),
-            target: TransformTarget::Callable(DeclarationId(2535)),
+            target: TransformTarget::Callable(DeclarationId(2537)),
             inputs: vec![PortId(722)],
             output: PortId(723),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4216, 4254),
@@ -6858,7 +6858,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(600),
-            target: TransformTarget::Callable(DeclarationId(2536)),
+            target: TransformTarget::Callable(DeclarationId(2538)),
             inputs: vec![],
             output: PortId(729),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4940, 4945),
@@ -6874,7 +6874,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(602),
-            target: TransformTarget::Callable(DeclarationId(2537)),
+            target: TransformTarget::Callable(DeclarationId(2539)),
             inputs: vec![],
             output: PortId(730),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5005, 5010),
@@ -6890,7 +6890,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(604),
-            target: TransformTarget::Callable(DeclarationId(2538)),
+            target: TransformTarget::Callable(DeclarationId(2540)),
             inputs: vec![],
             output: PortId(731),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5068, 5073),
@@ -6906,7 +6906,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(606),
-            target: TransformTarget::Callable(DeclarationId(2539)),
+            target: TransformTarget::Callable(DeclarationId(2541)),
             inputs: vec![],
             output: PortId(732),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5131, 5136),
@@ -6922,7 +6922,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(608),
-            target: TransformTarget::Callable(DeclarationId(2540)),
+            target: TransformTarget::Callable(DeclarationId(2542)),
             inputs: vec![],
             output: PortId(733),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5195, 5200),
@@ -6938,7 +6938,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(610),
-            target: TransformTarget::Callable(DeclarationId(2541)),
+            target: TransformTarget::Callable(DeclarationId(2543)),
             inputs: vec![],
             output: PortId(734),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5275, 5280),
@@ -6954,7 +6954,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(612),
-            target: TransformTarget::Callable(DeclarationId(2543)),
+            target: TransformTarget::Callable(DeclarationId(2545)),
             inputs: vec![PortId(735)],
             output: PortId(736),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5391, 5402),
@@ -6968,7 +6968,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(614),
-            target: TransformTarget::Callable(DeclarationId(2542)),
+            target: TransformTarget::Callable(DeclarationId(2544)),
             inputs: vec![PortId(736), PortId(737)],
             output: PortId(738),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5378, 5443),
@@ -6991,7 +6991,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(617),
-            target: TransformTarget::Callable(DeclarationId(2544)),
+            target: TransformTarget::Callable(DeclarationId(2546)),
             inputs: vec![PortId(739), PortId(740)],
             output: PortId(741),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5519, 5577),
@@ -7021,7 +7021,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(621),
-            target: TransformTarget::Callable(DeclarationId(2545)),
+            target: TransformTarget::Callable(DeclarationId(2547)),
             inputs: vec![PortId(743), PortId(742), PortId(744)],
             output: PortId(745),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5678, 5803),
@@ -7058,7 +7058,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(626),
-            target: TransformTarget::Callable(DeclarationId(2546)),
+            target: TransformTarget::Callable(DeclarationId(2548)),
             inputs: vec![PortId(748), PortId(749), PortId(750)],
             output: PortId(751),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5924, 6086),
@@ -7074,7 +7074,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(628),
-            target: TransformTarget::Callable(DeclarationId(1304)),
+            target: TransformTarget::Callable(DeclarationId(1306)),
             inputs: vec![PortId(752)],
             output: PortId(754),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6449, 6466),
@@ -7160,7 +7160,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(635),
-            target: TransformTarget::Callable(DeclarationId(1304)),
+            target: TransformTarget::Callable(DeclarationId(1306)),
             inputs: vec![PortId(761)],
             output: PortId(764),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6710, 6727),
@@ -7426,7 +7426,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(657),
-            target: TransformTarget::Callable(DeclarationId(1304)),
+            target: TransformTarget::Callable(DeclarationId(1306)),
             inputs: vec![PortId(792)],
             output: PortId(794),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8520, 8537),
@@ -7528,7 +7528,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(667),
-            target: TransformTarget::Callable(DeclarationId(2585)),
+            target: TransformTarget::Callable(DeclarationId(2587)),
             inputs: vec![],
             output: PortId(802),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6612, 6622),
@@ -7544,28 +7544,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(669),
-            target: TransformTarget::Callable(DeclarationId(2585)),
+            target: TransformTarget::Callable(DeclarationId(2587)),
             inputs: vec![],
             output: PortId(806),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6930, 6940),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(670),
-            target: TransformTarget::Callable(DeclarationId(2585)),
+            target: TransformTarget::Callable(DeclarationId(2587)),
             inputs: vec![],
             output: PortId(807),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6992, 7002),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(671),
-            target: TransformTarget::Callable(DeclarationId(2587)),
+            target: TransformTarget::Callable(DeclarationId(2589)),
             inputs: vec![],
             output: PortId(808),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7020, 7025),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(672),
-            target: TransformTarget::Callable(DeclarationId(2587)),
+            target: TransformTarget::Callable(DeclarationId(2589)),
             inputs: vec![],
             output: PortId(809),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7047, 7052),
@@ -7581,7 +7581,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(674),
-            target: TransformTarget::Callable(DeclarationId(2587)),
+            target: TransformTarget::Callable(DeclarationId(2589)),
             inputs: vec![],
             output: PortId(812),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7089, 7094),
@@ -7636,21 +7636,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(676),
-            target: TransformTarget::Callable(DeclarationId(2585)),
+            target: TransformTarget::Callable(DeclarationId(2587)),
             inputs: vec![],
             output: PortId(814),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7158, 7168),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(677),
-            target: TransformTarget::Callable(DeclarationId(2587)),
+            target: TransformTarget::Callable(DeclarationId(2589)),
             inputs: vec![],
             output: PortId(815),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7186, 7191),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(678),
-            target: TransformTarget::Callable(DeclarationId(2586)),
+            target: TransformTarget::Callable(DeclarationId(2588)),
             inputs: vec![],
             output: PortId(816),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7213, 7222),
@@ -7666,7 +7666,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(680),
-            target: TransformTarget::Callable(DeclarationId(2586)),
+            target: TransformTarget::Callable(DeclarationId(2588)),
             inputs: vec![],
             output: PortId(819),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7259, 7268),
@@ -7730,21 +7730,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(683),
-            target: TransformTarget::Callable(DeclarationId(2585)),
+            target: TransformTarget::Callable(DeclarationId(2587)),
             inputs: vec![],
             output: PortId(823),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7348, 7358),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(684),
-            target: TransformTarget::Callable(DeclarationId(2587)),
+            target: TransformTarget::Callable(DeclarationId(2589)),
             inputs: vec![],
             output: PortId(824),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7376, 7381),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(685),
-            target: TransformTarget::Callable(DeclarationId(2586)),
+            target: TransformTarget::Callable(DeclarationId(2588)),
             inputs: vec![],
             output: PortId(825),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7403, 7412),
@@ -7792,7 +7792,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(691),
-            target: TransformTarget::Callable(DeclarationId(2584)),
+            target: TransformTarget::Callable(DeclarationId(2586)),
             inputs: vec![PortId(831)],
             output: PortId(832),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7491, 7544),
@@ -7851,7 +7851,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(696),
-            target: TransformTarget::Callable(DeclarationId(2584)),
+            target: TransformTarget::Callable(DeclarationId(2586)),
             inputs: vec![PortId(836)],
             output: PortId(837),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7572, 7660),
@@ -8043,7 +8043,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(708),
-            target: TransformTarget::Callable(DeclarationId(2584)),
+            target: TransformTarget::Callable(DeclarationId(2586)),
             inputs: vec![PortId(847)],
             output: PortId(848),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7997, 8038),
@@ -8082,7 +8082,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(713),
-            target: TransformTarget::Callable(DeclarationId(2589)),
+            target: TransformTarget::Callable(DeclarationId(2591)),
             inputs: vec![],
             output: PortId(853),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8292, 8297),
@@ -8221,14 +8221,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(722),
-            target: TransformTarget::Callable(DeclarationId(2271)),
+            target: TransformTarget::Callable(DeclarationId(2273)),
             inputs: vec![],
             output: PortId(868),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9047, 9059),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(723),
-            target: TransformTarget::Callable(DeclarationId(2277)),
+            target: TransformTarget::Callable(DeclarationId(2279)),
             inputs: vec![PortId(868)],
             output: PortId(869),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9034, 9060),
@@ -8295,7 +8295,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(732),
-            target: TransformTarget::Callable(DeclarationId(1304)),
+            target: TransformTarget::Callable(DeclarationId(1306)),
             inputs: vec![PortId(876)],
             output: PortId(878),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10059, 10076),
@@ -8336,7 +8336,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(737),
-            target: TransformTarget::Callable(DeclarationId(2305)),
+            target: TransformTarget::Callable(DeclarationId(2307)),
             inputs: vec![PortId(883)],
             output: PortId(884),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10151, 10263),
@@ -8357,7 +8357,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(740),
-            target: TransformTarget::Callable(DeclarationId(2305)),
+            target: TransformTarget::Callable(DeclarationId(2307)),
             inputs: vec![PortId(886)],
             output: PortId(887),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10291, 10472),
@@ -8417,7 +8417,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(745),
-            target: TransformTarget::Callable(DeclarationId(2305)),
+            target: TransformTarget::Callable(DeclarationId(2307)),
             inputs: vec![PortId(892)],
             output: PortId(893),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10508, 10669),
@@ -8519,21 +8519,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(752),
-            target: TransformTarget::Callable(DeclarationId(2585)),
+            target: TransformTarget::Callable(DeclarationId(2587)),
             inputs: vec![],
             output: PortId(904),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11299, 11309),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(753),
-            target: TransformTarget::Callable(DeclarationId(2586)),
+            target: TransformTarget::Callable(DeclarationId(2588)),
             inputs: vec![],
             output: PortId(905),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11327, 11336),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(754),
-            target: TransformTarget::Callable(DeclarationId(2587)),
+            target: TransformTarget::Callable(DeclarationId(2589)),
             inputs: vec![],
             output: PortId(906),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11350, 11355),
@@ -8597,7 +8597,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(757),
-            target: TransformTarget::Callable(DeclarationId(1304)),
+            target: TransformTarget::Callable(DeclarationId(1306)),
             inputs: vec![PortId(908)],
             output: PortId(911),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12255, 12272),
@@ -8618,7 +8618,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(760),
-            target: TransformTarget::Callable(DeclarationId(2590)),
+            target: TransformTarget::Callable(DeclarationId(2592)),
             inputs: vec![PortId(913)],
             output: PortId(914),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12279, 12320),
@@ -8632,7 +8632,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(762),
-            target: TransformTarget::Callable(DeclarationId(2591)),
+            target: TransformTarget::Callable(DeclarationId(2593)),
             inputs: vec![PortId(915)],
             output: PortId(916),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12326, 12367),
@@ -8666,7 +8666,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(764),
-            target: TransformTarget::Callable(DeclarationId(1304)),
+            target: TransformTarget::Callable(DeclarationId(1306)),
             inputs: vec![PortId(908)],
             output: PortId(919),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12406, 12423),
@@ -8687,7 +8687,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(767),
-            target: TransformTarget::Callable(DeclarationId(2592)),
+            target: TransformTarget::Callable(DeclarationId(2594)),
             inputs: vec![PortId(921)],
             output: PortId(922),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12430, 12471),
@@ -8701,7 +8701,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(769),
-            target: TransformTarget::Callable(DeclarationId(2593)),
+            target: TransformTarget::Callable(DeclarationId(2595)),
             inputs: vec![PortId(923)],
             output: PortId(924),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12477, 12518),
@@ -8735,7 +8735,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(771),
-            target: TransformTarget::Callable(DeclarationId(1304)),
+            target: TransformTarget::Callable(DeclarationId(1306)),
             inputs: vec![PortId(908)],
             output: PortId(927),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12554, 12571),
@@ -8756,7 +8756,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(774),
-            target: TransformTarget::Callable(DeclarationId(2594)),
+            target: TransformTarget::Callable(DeclarationId(2596)),
             inputs: vec![PortId(929)],
             output: PortId(930),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12578, 12619),
@@ -8770,7 +8770,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(776),
-            target: TransformTarget::Callable(DeclarationId(2595)),
+            target: TransformTarget::Callable(DeclarationId(2597)),
             inputs: vec![PortId(931)],
             output: PortId(932),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12625, 12666),
@@ -8804,7 +8804,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(778),
-            target: TransformTarget::Callable(DeclarationId(1304)),
+            target: TransformTarget::Callable(DeclarationId(1306)),
             inputs: vec![PortId(908)],
             output: PortId(935),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12700, 12717),
@@ -8825,7 +8825,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(781),
-            target: TransformTarget::Callable(DeclarationId(2596)),
+            target: TransformTarget::Callable(DeclarationId(2598)),
             inputs: vec![PortId(937)],
             output: PortId(938),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12724, 12765),
@@ -8839,7 +8839,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(783),
-            target: TransformTarget::Callable(DeclarationId(2597)),
+            target: TransformTarget::Callable(DeclarationId(2599)),
             inputs: vec![PortId(939)],
             output: PortId(940),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12771, 12812),
@@ -8873,7 +8873,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(785),
-            target: TransformTarget::Callable(DeclarationId(1304)),
+            target: TransformTarget::Callable(DeclarationId(1306)),
             inputs: vec![PortId(908)],
             output: PortId(943),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12846, 12863),
@@ -8894,7 +8894,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(788),
-            target: TransformTarget::Callable(DeclarationId(2598)),
+            target: TransformTarget::Callable(DeclarationId(2600)),
             inputs: vec![PortId(945)],
             output: PortId(946),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12870, 12911),
@@ -8908,7 +8908,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(790),
-            target: TransformTarget::Callable(DeclarationId(2599)),
+            target: TransformTarget::Callable(DeclarationId(2601)),
             inputs: vec![PortId(947)],
             output: PortId(948),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12917, 12958),
@@ -9029,7 +9029,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(795),
-            target: TransformTarget::Callable(DeclarationId(1304)),
+            target: TransformTarget::Callable(DeclarationId(1306)),
             inputs: vec![PortId(951)],
             output: PortId(955),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13118, 13135),
@@ -9043,14 +9043,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(797),
-            target: TransformTarget::Callable(DeclarationId(2304)),
+            target: TransformTarget::Callable(DeclarationId(2306)),
             inputs: vec![],
             output: PortId(957),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13142, 13154),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(798),
-            target: TransformTarget::Callable(DeclarationId(2304)),
+            target: TransformTarget::Callable(DeclarationId(2306)),
             inputs: vec![],
             output: PortId(958),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13160, 13172),
@@ -9165,17 +9165,17 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(808),
-            target: TransformTarget::Callable(DeclarationId(1300)),
+            target: TransformTarget::Callable(DeclarationId(1302)),
             inputs: vec![PortId(968)],
             output: PortId(969),
-            span: SourceSpan::new("src/v3/std/verification.dag", 28338, 28361),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28552, 28575),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(809),
-            target: TransformTarget::Callable(DeclarationId(1301)),
+            target: TransformTarget::Callable(DeclarationId(1303)),
             inputs: vec![PortId(970)],
             output: PortId(971),
-            span: SourceSpan::new("src/v3/std/verification.dag", 28383, 28417),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28597, 28631),
         }));
         nodes.push(Behavior::Branch(BranchNode {
             id: NodeId(810),
@@ -9186,7 +9186,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     output: PortId(969),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Enumerated".to_string(),
-                        span: SourceSpan::new("src/v3/std/verification.dag", 28321, 28334),
+                        span: SourceSpan::new("src/v3/std/verification.dag", 28535, 28548),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "c".to_string(),
@@ -9198,7 +9198,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     output: PortId(971),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Quantified".to_string(),
-                        span: SourceSpan::new("src/v3/std/verification.dag", 28366, 28379),
+                        span: SourceSpan::new("src/v3/std/verification.dag", 28580, 28593),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "q".to_string(),
@@ -9207,7 +9207,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                 },
             ],
             output: PortId(972),
-            span: SourceSpan::new("src/v3/std/verification.dag", 28303, 28421),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28517, 28635),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Bind(BindNode {
@@ -9215,7 +9215,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
             name: "obligation_for_suite_claim".to_string(),
             value: PortId(972),
             params: vec![PortId(967)],
-            span: SourceSpan::new("src/v3/std/verification.dag", 28303, 28421),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28517, 28635),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
@@ -9834,7 +9834,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(3346);
+        let mut declarations = Vec::with_capacity(3348);
         declarations.push(Declaration {
             id: DeclarationId(0),
             name: Some("Classical".to_string()),
@@ -24042,11 +24042,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Empty".to_string(),
-                        ty: DeclarationId(1814),
+                        ty: DeclarationId(1816),
                     },
                     Field {
                         label: "Cons".to_string(),
-                        ty: DeclarationId(1816),
+                        ty: DeclarationId(1818),
                     },
                 ],
             },
@@ -24079,7 +24079,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1784),
+                output: DeclarationId(1786),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3273, 3284)),
             },
             type_params: vec![DeclarationId(688)],
@@ -24110,8 +24110,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(689),
             name: Some("cons".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(690), DeclarationId(1785)],
-                output: DeclarationId(1786),
+                inputs: vec![DeclarationId(690), DeclarationId(1787)],
+                output: DeclarationId(1788),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3453, 3475)),
             },
             type_params: vec![DeclarationId(690)],
@@ -24143,7 +24143,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("singleton".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(692)],
-                output: DeclarationId(1787),
+                output: DeclarationId(1789),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3570, 3590)),
             },
             type_params: vec![DeclarationId(692)],
@@ -24174,7 +24174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(693),
             name: Some("fold".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1788), DeclarationId(695), DeclarationId(1789)],
+                inputs: vec![DeclarationId(1790), DeclarationId(695), DeclarationId(1791)],
                 output: DeclarationId(695),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4203, 4307)),
             },
@@ -24220,7 +24220,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(696),
             name: Some("fold_right".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1790), DeclarationId(698), DeclarationId(1791)],
+                inputs: vec![DeclarationId(1792), DeclarationId(698), DeclarationId(1793)],
                 output: DeclarationId(698),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4658, 4768)),
             },
@@ -24266,8 +24266,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(699),
             name: Some("concat".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1792), DeclarationId(1793)],
-                output: DeclarationId(1794),
+                inputs: vec![DeclarationId(1794), DeclarationId(1795)],
+                output: DeclarationId(1796),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5386, 5414)),
             },
             type_params: vec![DeclarationId(700)],
@@ -24298,8 +24298,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(701),
             name: Some("map".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1795), DeclarationId(1796)],
-                output: DeclarationId(1797),
+                inputs: vec![DeclarationId(1797), DeclarationId(1798)],
+                output: DeclarationId(1799),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5721, 5778)),
             },
             type_params: vec![DeclarationId(702), DeclarationId(703)],
@@ -24344,8 +24344,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(704),
             name: Some("filter".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1798), DeclarationId(1799)],
-                output: DeclarationId(1800),
+                inputs: vec![DeclarationId(1800), DeclarationId(1801)],
+                output: DeclarationId(1802),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5905, 5988)),
             },
             type_params: vec![DeclarationId(705)],
@@ -24376,8 +24376,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(706),
             name: Some("flat_map".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1801), DeclarationId(1803)],
-                output: DeclarationId(1804),
+                inputs: vec![DeclarationId(1803), DeclarationId(1805)],
+                output: DeclarationId(1806),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6171, 6230)),
             },
             type_params: vec![DeclarationId(707), DeclarationId(708)],
@@ -24422,7 +24422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(709),
             name: Some("length".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1805)],
+                inputs: vec![DeclarationId(1807)],
                 output: DeclarationId(93),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6372, 6409)),
             },
@@ -24454,7 +24454,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(711),
             name: Some("is_empty".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1806)],
+                inputs: vec![DeclarationId(1808)],
                 output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6605, 6671)),
             },
@@ -24525,8 +24525,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(715),
             name: Some("enumerate".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1807)],
-                output: DeclarationId(1809),
+                inputs: vec![DeclarationId(1809)],
+                output: DeclarationId(1811),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7238, 7269)),
             },
             type_params: vec![DeclarationId(716)],
@@ -24557,8 +24557,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(717),
             name: Some("enumerate_helper".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1810), DeclarationId(93)],
-                output: DeclarationId(1812),
+                inputs: vec![DeclarationId(1812), DeclarationId(93)],
+                output: DeclarationId(1814),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7463, 7644)),
             },
             type_params: vec![DeclarationId(718)],
@@ -24589,7 +24589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(719),
             name: Some("contains".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1813), DeclarationId(720)],
+                inputs: vec![DeclarationId(1815), DeclarationId(720)],
                 output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 8205, 8332)),
             },
@@ -24684,7 +24684,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "rest".to_string(),
-                        ty: DeclarationId(1817),
+                        ty: DeclarationId(1819),
                     },
                 ],
             },
@@ -24727,7 +24727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "rest".to_string(),
-                        ty: DeclarationId(1818),
+                        ty: DeclarationId(1820),
                     },
                 ],
             },
@@ -24762,11 +24762,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LiteralToken".to_string(),
-                        ty: DeclarationId(1833),
+                        ty: DeclarationId(1835),
                     },
                     Field {
                         label: "ParamToken".to_string(),
-                        ty: DeclarationId(1834),
+                        ty: DeclarationId(1836),
                     },
                 ],
             },
@@ -24786,7 +24786,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tokens".to_string(),
-                    ty: DeclarationId(1835),
+                    ty: DeclarationId(1837),
                 }],
             },
             type_params: vec![],
@@ -24806,11 +24806,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ParsedSegmentTokens".to_string(),
-                        ty: DeclarationId(1837),
+                        ty: DeclarationId(1839),
                     },
                     Field {
                         label: "MalformedPathSegment".to_string(),
-                        ty: DeclarationId(1838),
+                        ty: DeclarationId(1840),
                     },
                 ],
             },
@@ -24831,11 +24831,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ParsedPathTemplate".to_string(),
-                        ty: DeclarationId(1839),
+                        ty: DeclarationId(1841),
                     },
                     Field {
                         label: "MalformedPathTemplate".to_string(),
-                        ty: DeclarationId(1840),
+                        ty: DeclarationId(1842),
                     },
                 ],
             },
@@ -24890,7 +24890,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("last_path_param".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(730)],
-                output: DeclarationId(1819),
+                output: DeclarationId(1821),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 11761, 12044)),
             },
             type_params: vec![],
@@ -24910,15 +24910,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ReadEffect".to_string(),
-                        ty: DeclarationId(1841),
+                        ty: DeclarationId(1843),
                     },
                     Field {
                         label: "UpsertEffect".to_string(),
-                        ty: DeclarationId(1842),
+                        ty: DeclarationId(1844),
                     },
                     Field {
                         label: "DeleteEffect".to_string(),
-                        ty: DeclarationId(1843),
+                        ty: DeclarationId(1845),
                     },
                 ],
             },
@@ -24939,11 +24939,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "CreateEffect".to_string(),
-                        ty: DeclarationId(1844),
+                        ty: DeclarationId(1846),
                     },
                     Field {
                         label: "AppendEffect".to_string(),
-                        ty: DeclarationId(1845),
+                        ty: DeclarationId(1847),
                     },
                 ],
             },
@@ -24964,11 +24964,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IsIdempotent".to_string(),
-                        ty: DeclarationId(1846),
+                        ty: DeclarationId(1848),
                     },
                     Field {
                         label: "IsBreaking".to_string(),
-                        ty: DeclarationId(1847),
+                        ty: DeclarationId(1849),
                     },
                 ],
             },
@@ -24989,11 +24989,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "PostAlways".to_string(),
-                        ty: DeclarationId(1848),
+                        ty: DeclarationId(1850),
                     },
                     Field {
                         label: "KeylessFallback".to_string(),
-                        ty: DeclarationId(1849),
+                        ty: DeclarationId(1851),
                     },
                 ],
             },
@@ -25014,15 +25014,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "PathParam".to_string(),
-                        ty: DeclarationId(1850),
+                        ty: DeclarationId(1852),
                     },
                     Field {
                         label: "InputField".to_string(),
-                        ty: DeclarationId(1851),
+                        ty: DeclarationId(1853),
                     },
                     Field {
                         label: "CompositeKey".to_string(),
-                        ty: DeclarationId(1853),
+                        ty: DeclarationId(1855),
                     },
                 ],
             },
@@ -25043,15 +25043,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LatticeEffect".to_string(),
-                        ty: DeclarationId(1854),
+                        ty: DeclarationId(1856),
                     },
                     Field {
                         label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(1855),
+                        ty: DeclarationId(1857),
                     },
                     Field {
                         label: "NonIdempotent".to_string(),
-                        ty: DeclarationId(1856),
+                        ty: DeclarationId(1858),
                     },
                 ],
             },
@@ -25133,15 +25133,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DerivedEffect".to_string(),
-                        ty: DeclarationId(1857),
+                        ty: DeclarationId(1859),
                     },
                     Field {
                         label: "UnknownHttpMethodInput".to_string(),
-                        ty: DeclarationId(1858),
+                        ty: DeclarationId(1860),
                     },
                     Field {
                         label: "MalformedPathInput".to_string(),
-                        ty: DeclarationId(1859),
+                        ty: DeclarationId(1861),
                     },
                 ],
             },
@@ -25162,11 +25162,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IdempotentComposition".to_string(),
-                        ty: DeclarationId(1860),
+                        ty: DeclarationId(1862),
                     },
                     Field {
                         label: "BrokenBy".to_string(),
-                        ty: DeclarationId(1862),
+                        ty: DeclarationId(1864),
                     },
                 ],
             },
@@ -25203,7 +25203,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(1820),
+                output: DeclarationId(1822),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20942, 20964)),
             },
             type_params: vec![],
@@ -25220,8 +25220,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(749),
             name: Some("indexed_breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1821)],
-                output: DeclarationId(1823),
+                inputs: vec![DeclarationId(1823)],
+                output: DeclarationId(1825),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21058, 21151)),
             },
             type_params: vec![],
@@ -25238,8 +25238,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(750),
             name: Some("first_breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1824)],
-                output: DeclarationId(1826),
+                inputs: vec![DeclarationId(1826)],
+                output: DeclarationId(1828),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21238, 21421)),
             },
             type_params: vec![],
@@ -25256,7 +25256,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(751),
             name: Some("compose_effects".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1827)],
+                inputs: vec![DeclarationId(1829)],
                 output: DeclarationId(746),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22311, 22434)),
             },
@@ -25321,19 +25321,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LinearEffect".to_string(),
-                        ty: DeclarationId(1864),
+                        ty: DeclarationId(1866),
                     },
                     Field {
                         label: "BranchEffect".to_string(),
-                        ty: DeclarationId(1866),
+                        ty: DeclarationId(1868),
                     },
                     Field {
                         label: "LoopEffect".to_string(),
-                        ty: DeclarationId(1867),
+                        ty: DeclarationId(1869),
                     },
                     Field {
                         label: "ParallelEffect".to_string(),
-                        ty: DeclarationId(1869),
+                        ty: DeclarationId(1871),
                     },
                 ],
             },
@@ -25383,11 +25383,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "WorkflowCompositionVerdict".to_string(),
-                        ty: DeclarationId(1870),
+                        ty: DeclarationId(1872),
                     },
                     Field {
                         label: "IdempotencyUnsupported".to_string(),
-                        ty: DeclarationId(1871),
+                        ty: DeclarationId(1873),
                     },
                 ],
             },
@@ -25426,23 +25426,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoWorkflowProjection".to_string(),
-                        ty: DeclarationId(1872),
+                        ty: DeclarationId(1874),
                     },
                     Field {
                         label: "NotParallelEffectRoot".to_string(),
-                        ty: DeclarationId(1873),
+                        ty: DeclarationId(1875),
                     },
                     Field {
                         label: "NonLinearParallelBranch".to_string(),
-                        ty: DeclarationId(1874),
+                        ty: DeclarationId(1876),
                     },
                     Field {
                         label: "PairwiseNonCommute".to_string(),
-                        ty: DeclarationId(1875),
+                        ty: DeclarationId(1877),
                     },
                     Field {
                         label: "LensSurfacePending".to_string(),
-                        ty: DeclarationId(1876),
+                        ty: DeclarationId(1878),
                     },
                 ],
             },
@@ -25492,11 +25492,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ParallelCompositionVerdict".to_string(),
-                        ty: DeclarationId(1877),
+                        ty: DeclarationId(1879),
                     },
                     Field {
                         label: "ParallelismUnsupported".to_string(),
-                        ty: DeclarationId(1878),
+                        ty: DeclarationId(1880),
                     },
                 ],
             },
@@ -25551,7 +25551,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("parse_http_method".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230)],
-                output: DeclarationId(1828),
+                output: DeclarationId(1830),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 29705, 30003)),
             },
             type_params: vec![],
@@ -25586,7 +25586,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(765),
             name: Some("upsert_or_create".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1829), DeclarationId(198)],
+                inputs: vec![DeclarationId(1831), DeclarationId(198)],
                 output: DeclarationId(738),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30474, 30626)),
             },
@@ -25604,7 +25604,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(766),
             name: Some("delete_or_create".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1830), DeclarationId(198)],
+                inputs: vec![DeclarationId(1832), DeclarationId(198)],
                 output: DeclarationId(738),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30704, 30856)),
             },
@@ -25661,15 +25661,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Agrees".to_string(),
-                        ty: DeclarationId(1879),
+                        ty: DeclarationId(1881),
                     },
                     Field {
                         label: "Disagrees".to_string(),
-                        ty: DeclarationId(1880),
+                        ty: DeclarationId(1882),
                     },
                     Field {
                         label: "DerivationUnknown".to_string(),
-                        ty: DeclarationId(1881),
+                        ty: DeclarationId(1883),
                     },
                 ],
             },
@@ -25690,11 +25690,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ModifierNotDeclared".to_string(),
-                        ty: DeclarationId(1882),
+                        ty: DeclarationId(1884),
                     },
                     Field {
                         label: "ModifierDeclared".to_string(),
-                        ty: DeclarationId(1883),
+                        ty: DeclarationId(1885),
                     },
                 ],
             },
@@ -25832,8 +25832,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(776),
             name: Some("generate_idempotency_obligations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1831)],
-                output: DeclarationId(1832),
+                inputs: vec![DeclarationId(1833)],
+                output: DeclarationId(1834),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 36638, 36908)),
             },
             type_params: vec![],
@@ -25926,15 +25926,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Uninferred".to_string(),
-                        ty: DeclarationId(1892),
+                        ty: DeclarationId(1894),
                     },
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(1893),
+                        ty: DeclarationId(1895),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(1894),
+                        ty: DeclarationId(1896),
                     },
                 ],
             },
@@ -25963,7 +25963,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "produced_by".to_string(),
-                        ty: DeclarationId(1895),
+                        ty: DeclarationId(1897),
                     },
                 ],
             },
@@ -25984,15 +25984,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LitInt".to_string(),
-                        ty: DeclarationId(1896),
+                        ty: DeclarationId(1898),
                     },
                     Field {
                         label: "LitBool".to_string(),
-                        ty: DeclarationId(1897),
+                        ty: DeclarationId(1899),
                     },
                     Field {
                         label: "LitString".to_string(),
-                        ty: DeclarationId(1898),
+                        ty: DeclarationId(1900),
                     },
                 ],
             },
@@ -26013,23 +26013,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(1899),
+                        ty: DeclarationId(1901),
                     },
                     Field {
                         label: "UnresolvedIdentifier".to_string(),
-                        ty: DeclarationId(1900),
+                        ty: DeclarationId(1902),
                     },
                     Field {
                         label: "ResolvedByStructure".to_string(),
-                        ty: DeclarationId(1901),
+                        ty: DeclarationId(1903),
                     },
                     Field {
                         label: "ResolvedByName".to_string(),
-                        ty: DeclarationId(1902),
+                        ty: DeclarationId(1904),
                     },
                     Field {
                         label: "TypeParam".to_string(),
-                        ty: DeclarationId(1903),
+                        ty: DeclarationId(1905),
                     },
                 ],
             },
@@ -26050,15 +26050,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "OneUnit".to_string(),
-                        ty: DeclarationId(1904),
+                        ty: DeclarationId(1906),
                     },
                     Field {
                         label: "AdditionalUnit".to_string(),
-                        ty: DeclarationId(1905),
+                        ty: DeclarationId(1907),
                     },
                     Field {
                         label: "UnitCount".to_string(),
-                        ty: DeclarationId(1906),
+                        ty: DeclarationId(1908),
                     },
                 ],
             },
@@ -26079,11 +26079,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ZeroWidth".to_string(),
-                        ty: DeclarationId(1907),
+                        ty: DeclarationId(1909),
                     },
                     Field {
                         label: "PositiveWidth".to_string(),
-                        ty: DeclarationId(1908),
+                        ty: DeclarationId(1910),
                     },
                 ],
             },
@@ -26104,11 +26104,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "BoundedInterval".to_string(),
-                        ty: DeclarationId(1909),
+                        ty: DeclarationId(1911),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1910),
+                        ty: DeclarationId(1912),
                     },
                 ],
             },
@@ -26163,11 +26163,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "StaticBound".to_string(),
-                        ty: DeclarationId(1912),
+                        ty: DeclarationId(1914),
                     },
                     Field {
                         label: "PlatformDependent".to_string(),
-                        ty: DeclarationId(1913),
+                        ty: DeclarationId(1915),
                     },
                 ],
             },
@@ -26188,15 +26188,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Exact".to_string(),
-                        ty: DeclarationId(1914),
+                        ty: DeclarationId(1916),
                     },
                     Field {
                         label: "AtMostOne".to_string(),
-                        ty: DeclarationId(1915),
+                        ty: DeclarationId(1917),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1916),
+                        ty: DeclarationId(1918),
                     },
                 ],
             },
@@ -26292,27 +26292,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(1917),
+                        ty: DeclarationId(1919),
                     },
                     Field {
                         label: "Reference".to_string(),
-                        ty: DeclarationId(1918),
+                        ty: DeclarationId(1920),
                     },
                     Field {
                         label: "Record".to_string(),
-                        ty: DeclarationId(1920),
+                        ty: DeclarationId(1922),
                     },
                     Field {
                         label: "List".to_string(),
-                        ty: DeclarationId(1922),
+                        ty: DeclarationId(1924),
                     },
                     Field {
                         label: "Map".to_string(),
-                        ty: DeclarationId(1924),
+                        ty: DeclarationId(1926),
                     },
                     Field {
                         label: "Variant".to_string(),
-                        ty: DeclarationId(1926),
+                        ty: DeclarationId(1928),
                     },
                 ],
             },
@@ -26333,23 +26333,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ValueBodyUnparsed".to_string(),
-                        ty: DeclarationId(1927),
+                        ty: DeclarationId(1929),
                     },
                     Field {
                         label: "ValueBodyStructural".to_string(),
-                        ty: DeclarationId(1929),
+                        ty: DeclarationId(1931),
                     },
                     Field {
                         label: "ValueBodyScalar".to_string(),
-                        ty: DeclarationId(1930),
+                        ty: DeclarationId(1932),
                     },
                     Field {
                         label: "ValueBodyList".to_string(),
-                        ty: DeclarationId(1932),
+                        ty: DeclarationId(1934),
                     },
                     Field {
                         label: "ValueBodyMap".to_string(),
-                        ty: DeclarationId(1934),
+                        ty: DeclarationId(1936),
                     },
                 ],
             },
@@ -26389,23 +26389,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UserDefined".to_string(),
-                        ty: DeclarationId(1935),
+                        ty: DeclarationId(1937),
                     },
                     Field {
                         label: "ExternalRealization".to_string(),
-                        ty: DeclarationId(1936),
+                        ty: DeclarationId(1938),
                     },
                     Field {
                         label: "Pending".to_string(),
-                        ty: DeclarationId(1937),
+                        ty: DeclarationId(1939),
                     },
                     Field {
                         label: "NoBody".to_string(),
-                        ty: DeclarationId(1938),
+                        ty: DeclarationId(1940),
                     },
                     Field {
                         label: "Unparsed".to_string(),
-                        ty: DeclarationId(1939),
+                        ty: DeclarationId(1941),
                     },
                 ],
             },
@@ -26426,27 +26426,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Atom".to_string(),
-                        ty: DeclarationId(1940),
+                        ty: DeclarationId(1942),
                     },
                     Field {
                         label: "Conj".to_string(),
-                        ty: DeclarationId(1942),
+                        ty: DeclarationId(1944),
                     },
                     Field {
                         label: "Disj".to_string(),
-                        ty: DeclarationId(1944),
+                        ty: DeclarationId(1946),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(1946),
+                        ty: DeclarationId(1948),
                     },
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(1947),
+                        ty: DeclarationId(1949),
                     },
                     Field {
                         label: "Instantiation".to_string(),
-                        ty: DeclarationId(1949),
+                        ty: DeclarationId(1951),
                     },
                 ],
             },
@@ -26471,7 +26471,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(1950),
+                        ty: DeclarationId(1952),
                     },
                     Field {
                         label: "connective".to_string(),
@@ -26479,27 +26479,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(1951),
+                        ty: DeclarationId(1953),
                     },
                     Field {
                         label: "phantom_params".to_string(),
-                        ty: DeclarationId(1952),
+                        ty: DeclarationId(1954),
                     },
                     Field {
                         label: "meta_tag".to_string(),
-                        ty: DeclarationId(1953),
+                        ty: DeclarationId(1955),
                     },
                     Field {
                         label: "inhabits".to_string(),
-                        ty: DeclarationId(1954),
+                        ty: DeclarationId(1956),
                     },
                     Field {
                         label: "value_body".to_string(),
-                        ty: DeclarationId(1955),
+                        ty: DeclarationId(1957),
                     },
                     Field {
                         label: "nominal_opacity".to_string(),
-                        ty: DeclarationId(1956),
+                        ty: DeclarationId(1958),
                     },
                     Field {
                         label: "span".to_string(),
@@ -26548,7 +26548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "permitted_accessors".to_string(),
-                    ty: DeclarationId(1957),
+                    ty: DeclarationId(1959),
                 }],
             },
             type_params: vec![],
@@ -26568,19 +26568,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Add".to_string(),
-                        ty: DeclarationId(1958),
+                        ty: DeclarationId(1960),
                     },
                     Field {
                         label: "Sub".to_string(),
-                        ty: DeclarationId(1959),
+                        ty: DeclarationId(1961),
                     },
                     Field {
                         label: "Mul".to_string(),
-                        ty: DeclarationId(1960),
+                        ty: DeclarationId(1962),
                     },
                     Field {
                         label: "Div".to_string(),
-                        ty: DeclarationId(1961),
+                        ty: DeclarationId(1963),
                     },
                 ],
             },
@@ -26601,27 +26601,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(1962),
+                        ty: DeclarationId(1964),
                     },
                     Field {
                         label: "Ne".to_string(),
-                        ty: DeclarationId(1963),
+                        ty: DeclarationId(1965),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(1964),
+                        ty: DeclarationId(1966),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(1965),
+                        ty: DeclarationId(1967),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(1966),
+                        ty: DeclarationId(1968),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(1967),
+                        ty: DeclarationId(1969),
                     },
                 ],
             },
@@ -26667,11 +26667,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "And".to_string(),
-                        ty: DeclarationId(1968),
+                        ty: DeclarationId(1970),
                     },
                     Field {
                         label: "Or".to_string(),
-                        ty: DeclarationId(1969),
+                        ty: DeclarationId(1971),
                     },
                 ],
             },
@@ -26692,15 +26692,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Arithmetic".to_string(),
-                        ty: DeclarationId(1970),
+                        ty: DeclarationId(1972),
                     },
                     Field {
                         label: "Comparison".to_string(),
-                        ty: DeclarationId(1971),
+                        ty: DeclarationId(1973),
                     },
                     Field {
                         label: "Logical".to_string(),
-                        ty: DeclarationId(1972),
+                        ty: DeclarationId(1974),
                     },
                 ],
             },
@@ -26721,19 +26721,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Callable".to_string(),
-                        ty: DeclarationId(1973),
+                        ty: DeclarationId(1975),
                     },
                     Field {
                         label: "UnresolvedFieldProject".to_string(),
-                        ty: DeclarationId(1974),
+                        ty: DeclarationId(1976),
                     },
                     Field {
                         label: "ResolvedFieldProject".to_string(),
-                        ty: DeclarationId(1975),
+                        ty: DeclarationId(1977),
                     },
                     Field {
                         label: "Operator".to_string(),
-                        ty: DeclarationId(1976),
+                        ty: DeclarationId(1978),
                     },
                 ],
             },
@@ -26754,11 +26754,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UnresolvedVariant".to_string(),
-                        ty: DeclarationId(1977),
+                        ty: DeclarationId(1979),
                     },
                     Field {
                         label: "ResolvedVariant".to_string(),
-                        ty: DeclarationId(1978),
+                        ty: DeclarationId(1980),
                     },
                 ],
             },
@@ -26816,7 +26816,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "binding".to_string(),
-                        ty: DeclarationId(1979),
+                        ty: DeclarationId(1981),
                     },
                 ],
             },
@@ -26952,11 +26952,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "members".to_string(),
-                        ty: DeclarationId(1980),
+                        ty: DeclarationId(1982),
                     },
                     Field {
                         label: "intra_cluster_calls".to_string(),
-                        ty: DeclarationId(1981),
+                        ty: DeclarationId(1983),
                     },
                 ],
             },
@@ -26977,11 +26977,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(1982),
+                        ty: DeclarationId(1984),
                     },
                     Field {
                         label: "Descent".to_string(),
-                        ty: DeclarationId(1983),
+                        ty: DeclarationId(1985),
                     },
                 ],
             },
@@ -27036,7 +27036,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "lane2_workflow".to_string(),
-                        ty: DeclarationId(1984),
+                        ty: DeclarationId(1986),
                     },
                 ],
             },
@@ -27065,7 +27065,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(1985),
+                        ty: DeclarationId(1987),
                     },
                     Field {
                         label: "result_port".to_string(),
@@ -27093,7 +27093,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "UserMatch".to_string(),
-                    ty: DeclarationId(1986),
+                    ty: DeclarationId(1988),
                 }],
             },
             type_params: vec![],
@@ -27121,7 +27121,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "paths".to_string(),
-                        ty: DeclarationId(1987),
+                        ty: DeclarationId(1989),
                     },
                     Field {
                         label: "result_port".to_string(),
@@ -27133,7 +27133,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "emit_participation".to_string(),
-                        ty: DeclarationId(1988),
+                        ty: DeclarationId(1990),
                     },
                 ],
             },
@@ -27198,7 +27198,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "UserCallable".to_string(),
-                    ty: DeclarationId(1989),
+                    ty: DeclarationId(1991),
                 }],
             },
             type_params: vec![],
@@ -27230,7 +27230,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(1990),
+                        ty: DeclarationId(1992),
                     },
                     Field {
                         label: "span".to_string(),
@@ -27238,11 +27238,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "lane2_workflow".to_string(),
-                        ty: DeclarationId(1991),
+                        ty: DeclarationId(1993),
                     },
                     Field {
                         label: "emit_participation".to_string(),
-                        ty: DeclarationId(1992),
+                        ty: DeclarationId(1994),
                     },
                 ],
             },
@@ -27263,23 +27263,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Value".to_string(),
-                        ty: DeclarationId(1993),
+                        ty: DeclarationId(1995),
                     },
                     Field {
                         label: "Transform".to_string(),
-                        ty: DeclarationId(1994),
+                        ty: DeclarationId(1996),
                     },
                     Field {
                         label: "Branch".to_string(),
-                        ty: DeclarationId(1995),
+                        ty: DeclarationId(1997),
                     },
                     Field {
                         label: "Loop".to_string(),
-                        ty: DeclarationId(1996),
+                        ty: DeclarationId(1998),
                     },
                     Field {
                         label: "Bind".to_string(),
-                        ty: DeclarationId(1997),
+                        ty: DeclarationId(1999),
                     },
                 ],
             },
@@ -27300,19 +27300,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "declarations".to_string(),
-                        ty: DeclarationId(1998),
+                        ty: DeclarationId(2000),
                     },
                     Field {
                         label: "nodes".to_string(),
-                        ty: DeclarationId(1999),
+                        ty: DeclarationId(2001),
                     },
                     Field {
                         label: "ports".to_string(),
-                        ty: DeclarationId(2000),
+                        ty: DeclarationId(2002),
                     },
                     Field {
                         label: "clusters".to_string(),
-                        ty: DeclarationId(2001),
+                        ty: DeclarationId(2003),
                     },
                 ],
             },
@@ -27352,15 +27352,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "accessor".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "realization".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                 ],
             },
@@ -27379,7 +27379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("port".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(722)],
-                output: DeclarationId(1884),
+                output: DeclarationId(1886),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22297,
@@ -27401,7 +27401,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("node".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-                output: DeclarationId(1885),
+                output: DeclarationId(1887),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22355,
@@ -27423,7 +27423,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("resolve_producer".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(722)],
-                output: DeclarationId(1886),
+                output: DeclarationId(1888),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22430,
@@ -27445,7 +27445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("declaration_by_id".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(723)],
-                output: DeclarationId(1887),
+                output: DeclarationId(1889),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22819,
@@ -27467,7 +27467,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("declaration_by_name".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(230)],
-                output: DeclarationId(1888),
+                output: DeclarationId(1890),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     23694,
@@ -27489,7 +27489,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("lane2_workflow_at".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-                output: DeclarationId(1889),
+                output: DeclarationId(1891),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     24020,
@@ -27513,15 +27513,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "SingleRoot".to_string(),
-                        ty: DeclarationId(2002),
+                        ty: DeclarationId(2004),
                     },
                     Field {
                         label: "NoRoot".to_string(),
-                        ty: DeclarationId(2003),
+                        ty: DeclarationId(2005),
                     },
                     Field {
                         label: "AmbiguousRoot".to_string(),
-                        ty: DeclarationId(2005),
+                        ty: DeclarationId(2007),
                     },
                 ],
             },
@@ -27562,7 +27562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("miss_declaration_id_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1890),
+                output: DeclarationId(1892),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     28025,
@@ -27584,7 +27584,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("hit_declaration_id_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(723)],
-                output: DeclarationId(1891),
+                output: DeclarationId(1893),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     28110,
@@ -27607,7 +27607,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "decl".to_string(),
-                    ty: DeclarationId(1311),
+                    ty: DeclarationId(1313),
                 }],
             },
             type_params: vec![],
@@ -27627,15 +27627,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ShrinkEffect".to_string(),
-                        ty: DeclarationId(2030),
+                        ty: DeclarationId(2032),
                     },
                     Field {
                         label: "ProjectionEffect".to_string(),
-                        ty: DeclarationId(2031),
+                        ty: DeclarationId(2033),
                     },
                     Field {
                         label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(2032),
+                        ty: DeclarationId(2034),
                     },
                 ],
             },
@@ -27656,19 +27656,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ShapeConstant".to_string(),
-                        ty: DeclarationId(2033),
+                        ty: DeclarationId(2035),
                     },
                     Field {
                         label: "ShapeLinearScan".to_string(),
-                        ty: DeclarationId(2034),
+                        ty: DeclarationId(2036),
                     },
                     Field {
                         label: "ShapeIterateBody".to_string(),
-                        ty: DeclarationId(2035),
+                        ty: DeclarationId(2037),
                     },
                     Field {
                         label: "ShapeSortBody".to_string(),
-                        ty: DeclarationId(2036),
+                        ty: DeclarationId(2038),
                     },
                 ],
             },
@@ -27697,15 +27697,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "size_effect".to_string(),
-                        ty: DeclarationId(2037),
+                        ty: DeclarationId(2039),
                     },
                     Field {
                         label: "cost_shape".to_string(),
-                        ty: DeclarationId(2038),
+                        ty: DeclarationId(2040),
                     },
                     Field {
                         label: "callback_element_position".to_string(),
-                        ty: DeclarationId(2039),
+                        ty: DeclarationId(2041),
                     },
                 ],
             },
@@ -27730,7 +27730,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "display_name".to_string(),
-                        ty: DeclarationId(2040),
+                        ty: DeclarationId(2042),
                     },
                 ],
             },
@@ -27787,11 +27787,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DegreeTwo".to_string(),
-                        ty: DeclarationId(2041),
+                        ty: DeclarationId(2043),
                     },
                     Field {
                         label: "DegreeSuccessor".to_string(),
-                        ty: DeclarationId(2042),
+                        ty: DeclarationId(2044),
                     },
                 ],
             },
@@ -27812,31 +27812,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ConstantCost".to_string(),
-                        ty: DeclarationId(2043),
+                        ty: DeclarationId(2045),
                     },
                     Field {
                         label: "LinearCost".to_string(),
-                        ty: DeclarationId(2044),
+                        ty: DeclarationId(2046),
                     },
                     Field {
                         label: "PolynomialCost".to_string(),
-                        ty: DeclarationId(2045),
+                        ty: DeclarationId(2047),
                     },
                     Field {
                         label: "ProductCost".to_string(),
-                        ty: DeclarationId(2047),
+                        ty: DeclarationId(2049),
                     },
                     Field {
                         label: "SumCost".to_string(),
-                        ty: DeclarationId(2049),
+                        ty: DeclarationId(2051),
                     },
                     Field {
                         label: "LogCost".to_string(),
-                        ty: DeclarationId(2050),
+                        ty: DeclarationId(2052),
                     },
                     Field {
                         label: "UnknownCost".to_string(),
-                        ty: DeclarationId(2051),
+                        ty: DeclarationId(2053),
                     },
                 ],
             },
@@ -27844,7 +27844,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-            inhabits: Some(DeclarationId(2052)),
+            inhabits: Some(DeclarationId(2054)),
             value_body: None,
             refinement: None,
             nominal_opacity: None,
@@ -27898,7 +27898,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("miss_symbolic_cost_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2006),
+                output: DeclarationId(2008),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 10963, 10973)),
             },
             type_params: vec![],
@@ -27916,7 +27916,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("hit_symbolic_cost_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(849)],
-                output: DeclarationId(2007),
+                output: DeclarationId(2009),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 11047, 11062)),
             },
             type_params: vec![],
@@ -27934,7 +27934,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("two_terms".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(849), DeclarationId(849)],
-                output: DeclarationId(2008),
+                output: DeclarationId(2010),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(185))),
             },
             type_params: vec![],
@@ -27951,8 +27951,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(855),
             name: Some("many_terms".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849), DeclarationId(849), DeclarationId(2009)],
-                output: DeclarationId(2010),
+                inputs: vec![DeclarationId(849), DeclarationId(849), DeclarationId(2011)],
+                output: DeclarationId(2012),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(187))),
             },
             type_params: vec![],
@@ -28077,7 +28077,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(862),
             name: Some("max_path".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2011)],
+                inputs: vec![DeclarationId(2013)],
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(220))),
             },
@@ -28134,35 +28134,35 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ClassConstant".to_string(),
-                        ty: DeclarationId(2053),
+                        ty: DeclarationId(2055),
                     },
                     Field {
                         label: "ClassLog".to_string(),
-                        ty: DeclarationId(2054),
+                        ty: DeclarationId(2056),
                     },
                     Field {
                         label: "ClassLinear".to_string(),
-                        ty: DeclarationId(2055),
+                        ty: DeclarationId(2057),
                     },
                     Field {
                         label: "ClassLinearithmic".to_string(),
-                        ty: DeclarationId(2056),
+                        ty: DeclarationId(2058),
                     },
                     Field {
                         label: "ClassQuadratic".to_string(),
-                        ty: DeclarationId(2057),
+                        ty: DeclarationId(2059),
                     },
                     Field {
                         label: "ClassPolynomial".to_string(),
-                        ty: DeclarationId(2058),
+                        ty: DeclarationId(2060),
                     },
                     Field {
                         label: "ClassExponential".to_string(),
-                        ty: DeclarationId(2059),
+                        ty: DeclarationId(2061),
                     },
                     Field {
                         label: "ClassUnknown".to_string(),
-                        ty: DeclarationId(2060),
+                        ty: DeclarationId(2062),
                     },
                 ],
             },
@@ -28170,7 +28170,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-            inhabits: Some(DeclarationId(2061)),
+            inhabits: Some(DeclarationId(2063)),
             value_body: None,
             refinement: None,
             nominal_opacity: None,
@@ -28270,8 +28270,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(871),
             name: Some("nsl_to_list".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2012)],
-                output: DeclarationId(2013),
+                inputs: vec![DeclarationId(2014)],
+                output: DeclarationId(2015),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(366))),
             },
             type_params: vec![],
@@ -28288,8 +28288,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(872),
             name: Some("drop_additive_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2014)],
-                output: DeclarationId(2015),
+                inputs: vec![DeclarationId(2016)],
+                output: DeclarationId(2017),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(379))),
             },
             type_params: vec![],
@@ -28306,8 +28306,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(873),
             name: Some("collapse_on_multiplicative_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2016)],
-                output: DeclarationId(2017),
+                inputs: vec![DeclarationId(2018)],
+                output: DeclarationId(2019),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(386))),
             },
             type_params: vec![],
@@ -28324,7 +28324,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(874),
             name: Some("any_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2018)],
+                inputs: vec![DeclarationId(2020)],
                 output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(395))),
             },
@@ -28342,8 +28342,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(875),
             name: Some("drop_multiplicative_one".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2019)],
-                output: DeclarationId(2020),
+                inputs: vec![DeclarationId(2021)],
+                output: DeclarationId(2022),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(408))),
             },
             type_params: vec![],
@@ -28396,7 +28396,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(878),
             name: Some("reduce_sum".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2021)],
+                inputs: vec![DeclarationId(2023)],
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(440))),
             },
@@ -28414,7 +28414,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(879),
             name: Some("wrap_sum".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2022)],
+                inputs: vec![DeclarationId(2024)],
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(452))),
             },
@@ -28432,7 +28432,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(880),
             name: Some("reduce_product".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2023)],
+                inputs: vec![DeclarationId(2025)],
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(469))),
             },
@@ -28581,8 +28581,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(888),
             name: Some("filter_not_dominated_by".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2024), DeclarationId(849)],
-                output: DeclarationId(2025),
+                inputs: vec![DeclarationId(2026), DeclarationId(849)],
+                output: DeclarationId(2027),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(517))),
             },
             type_params: vec![],
@@ -28599,8 +28599,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(889),
             name: Some("drop_dominated_step".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2026), DeclarationId(849)],
-                output: DeclarationId(2027),
+                inputs: vec![DeclarationId(2028), DeclarationId(849)],
+                output: DeclarationId(2029),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(524))),
             },
             type_params: vec![],
@@ -28617,8 +28617,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(890),
             name: Some("drop_dominated".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2028)],
-                output: DeclarationId(2029),
+                inputs: vec![DeclarationId(2030)],
+                output: DeclarationId(2031),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(527))),
             },
             type_params: vec![],
@@ -28638,10 +28638,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 inputs: vec![
                     DeclarationId(147),
                     DeclarationId(230),
-                    DeclarationId(2089),
-                    DeclarationId(93),
-                    DeclarationId(2090),
                     DeclarationId(2091),
+                    DeclarationId(93),
+                    DeclarationId(2092),
+                    DeclarationId(2093),
                 ],
                 output: DeclarationId(912),
                 body: ArrowBody::Unparsed(SourceSpan::new(
@@ -28672,7 +28672,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2092)),
+            meta_tag: Some(DeclarationId(2094)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![])),
@@ -28687,11 +28687,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UserMessage".to_string(),
-                        ty: DeclarationId(2094),
+                        ty: DeclarationId(2096),
                     },
                     Field {
                         label: "AssistantMessage".to_string(),
-                        ty: DeclarationId(2096),
+                        ty: DeclarationId(2098),
                     },
                 ],
             },
@@ -28712,11 +28712,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Base64Image".to_string(),
-                        ty: DeclarationId(2097),
+                        ty: DeclarationId(2099),
                     },
                     Field {
                         label: "UrlImage".to_string(),
-                        ty: DeclarationId(2098),
+                        ty: DeclarationId(2100),
                     },
                 ],
             },
@@ -28737,11 +28737,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "TextContent".to_string(),
-                        ty: DeclarationId(2099),
+                        ty: DeclarationId(2101),
                     },
                     Field {
                         label: "ImageContent".to_string(),
-                        ty: DeclarationId(2100),
+                        ty: DeclarationId(2102),
                     },
                 ],
             },
@@ -28800,11 +28800,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ToolResultText".to_string(),
-                        ty: DeclarationId(2101),
+                        ty: DeclarationId(2103),
                     },
                     Field {
                         label: "ToolResultBlocks".to_string(),
-                        ty: DeclarationId(2103),
+                        ty: DeclarationId(2105),
                     },
                 ],
             },
@@ -28824,7 +28824,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Text".to_string(),
-                    ty: DeclarationId(2104),
+                    ty: DeclarationId(2106),
                 }],
             },
             type_params: vec![],
@@ -28843,7 +28843,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "TextPlain".to_string(),
-                    ty: DeclarationId(2105),
+                    ty: DeclarationId(2107),
                 }],
             },
             type_params: vec![],
@@ -28888,23 +28888,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "AnthropicTextBlock".to_string(),
-                        ty: DeclarationId(2106),
+                        ty: DeclarationId(2108),
                     },
                     Field {
                         label: "AnthropicImageBlock".to_string(),
-                        ty: DeclarationId(2107),
+                        ty: DeclarationId(2109),
                     },
                     Field {
                         label: "AnthropicDocumentBlock".to_string(),
-                        ty: DeclarationId(2108),
+                        ty: DeclarationId(2110),
                     },
                     Field {
                         label: "AnthropicSearchResultBlock".to_string(),
-                        ty: DeclarationId(2112),
+                        ty: DeclarationId(2114),
                     },
                     Field {
                         label: "AnthropicToolReferenceBlock".to_string(),
-                        ty: DeclarationId(2113),
+                        ty: DeclarationId(2115),
                     },
                 ],
             },
@@ -28954,11 +28954,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UserTextBlock".to_string(),
-                        ty: DeclarationId(2114),
+                        ty: DeclarationId(2116),
                     },
                     Field {
                         label: "UserToolResultBlock".to_string(),
-                        ty: DeclarationId(2117),
+                        ty: DeclarationId(2119),
                     },
                 ],
             },
@@ -28979,11 +28979,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "AssistantTextBlock".to_string(),
-                        ty: DeclarationId(2118),
+                        ty: DeclarationId(2120),
                     },
                     Field {
                         label: "AssistantToolUseBlock".to_string(),
-                        ty: DeclarationId(2119),
+                        ty: DeclarationId(2121),
                     },
                 ],
             },
@@ -29004,31 +29004,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "EndTurn".to_string(),
-                        ty: DeclarationId(2120),
+                        ty: DeclarationId(2122),
                     },
                     Field {
                         label: "MaxTokens".to_string(),
-                        ty: DeclarationId(2121),
+                        ty: DeclarationId(2123),
                     },
                     Field {
                         label: "StopSequence".to_string(),
-                        ty: DeclarationId(2122),
+                        ty: DeclarationId(2124),
                     },
                     Field {
                         label: "ToolUse".to_string(),
-                        ty: DeclarationId(2123),
+                        ty: DeclarationId(2125),
                     },
                     Field {
                         label: "PauseTurn".to_string(),
-                        ty: DeclarationId(2124),
+                        ty: DeclarationId(2126),
                     },
                     Field {
                         label: "Refusal".to_string(),
-                        ty: DeclarationId(2125),
+                        ty: DeclarationId(2127),
                     },
                     Field {
                         label: "ModelContextWindowExceeded".to_string(),
-                        ty: DeclarationId(2126),
+                        ty: DeclarationId(2128),
                     },
                 ],
             },
@@ -29049,23 +29049,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "CharLocation".to_string(),
-                        ty: DeclarationId(2129),
+                        ty: DeclarationId(2131),
                     },
                     Field {
                         label: "PageLocation".to_string(),
-                        ty: DeclarationId(2132),
+                        ty: DeclarationId(2134),
                     },
                     Field {
                         label: "ContentBlockLocation".to_string(),
-                        ty: DeclarationId(2135),
+                        ty: DeclarationId(2137),
                     },
                     Field {
                         label: "WebSearchResultLocation".to_string(),
-                        ty: DeclarationId(2137),
+                        ty: DeclarationId(2139),
                     },
                     Field {
                         label: "SearchResultLocation".to_string(),
-                        ty: DeclarationId(2139),
+                        ty: DeclarationId(2141),
                     },
                 ],
             },
@@ -29086,27 +29086,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "MessagesTextBlock".to_string(),
-                        ty: DeclarationId(2142),
+                        ty: DeclarationId(2144),
                     },
                     Field {
                         label: "MessagesThinkingBlock".to_string(),
-                        ty: DeclarationId(2143),
+                        ty: DeclarationId(2145),
                     },
                     Field {
                         label: "MessagesRedactedThinkingBlock".to_string(),
-                        ty: DeclarationId(2144),
+                        ty: DeclarationId(2146),
                     },
                     Field {
                         label: "MessagesToolUseBlock".to_string(),
-                        ty: DeclarationId(2146),
+                        ty: DeclarationId(2148),
                     },
                     Field {
                         label: "MessagesServerToolUseBlock".to_string(),
-                        ty: DeclarationId(2148),
+                        ty: DeclarationId(2150),
                     },
                     Field {
                         label: "MessagesWebSearchToolResultBlock".to_string(),
-                        ty: DeclarationId(2150),
+                        ty: DeclarationId(2152),
                     },
                 ],
             },
@@ -29127,35 +29127,35 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "WebSearch".to_string(),
-                        ty: DeclarationId(2151),
+                        ty: DeclarationId(2153),
                     },
                     Field {
                         label: "WebFetch".to_string(),
-                        ty: DeclarationId(2152),
+                        ty: DeclarationId(2154),
                     },
                     Field {
                         label: "CodeExecution".to_string(),
-                        ty: DeclarationId(2153),
+                        ty: DeclarationId(2155),
                     },
                     Field {
                         label: "BashCodeExecution".to_string(),
-                        ty: DeclarationId(2154),
+                        ty: DeclarationId(2156),
                     },
                     Field {
                         label: "TextEditorCodeExecution".to_string(),
-                        ty: DeclarationId(2155),
+                        ty: DeclarationId(2157),
                     },
                     Field {
                         label: "ToolSearchToolRegex".to_string(),
-                        ty: DeclarationId(2156),
+                        ty: DeclarationId(2158),
                     },
                     Field {
                         label: "ToolSearchToolBm25".to_string(),
-                        ty: DeclarationId(2157),
+                        ty: DeclarationId(2159),
                     },
                     Field {
                         label: "Advisor".to_string(),
-                        ty: DeclarationId(2158),
+                        ty: DeclarationId(2160),
                     },
                 ],
             },
@@ -29184,15 +29184,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "cache_creation_input_tokens".to_string(),
-                        ty: DeclarationId(2159),
+                        ty: DeclarationId(2161),
                     },
                     Field {
                         label: "cache_read_input_tokens".to_string(),
-                        ty: DeclarationId(2160),
+                        ty: DeclarationId(2162),
                     },
                     Field {
                         label: "service_tier".to_string(),
-                        ty: DeclarationId(2161),
+                        ty: DeclarationId(2163),
                     },
                 ],
             },
@@ -29212,7 +29212,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Assistant".to_string(),
-                    ty: DeclarationId(2162),
+                    ty: DeclarationId(2164),
                 }],
             },
             type_params: vec![],
@@ -29244,7 +29244,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(2163),
+                        ty: DeclarationId(2165),
                     },
                     Field {
                         label: "model".to_string(),
@@ -29256,7 +29256,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "stop_sequence".to_string(),
-                        ty: DeclarationId(2164),
+                        ty: DeclarationId(2166),
                     },
                     Field {
                         label: "usage".to_string(),
@@ -29264,7 +29264,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "container".to_string(),
-                        ty: DeclarationId(2165),
+                        ty: DeclarationId(2167),
                     },
                 ],
             },
@@ -29293,7 +29293,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "entry".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                 ],
             },
@@ -29314,23 +29314,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "StdAuthority".to_string(),
-                        ty: DeclarationId(2166),
+                        ty: DeclarationId(2168),
                     },
                     Field {
                         label: "V3StdAuthority".to_string(),
-                        ty: DeclarationId(2167),
+                        ty: DeclarationId(2169),
                     },
                     Field {
                         label: "V3SpecAuthority".to_string(),
-                        ty: DeclarationId(2168),
+                        ty: DeclarationId(2170),
                     },
                     Field {
                         label: "CompilerAuthority".to_string(),
-                        ty: DeclarationId(2169),
+                        ty: DeclarationId(2171),
                     },
                     Field {
                         label: "ExtdepsFixtureAuthority".to_string(),
-                        ty: DeclarationId(2170),
+                        ty: DeclarationId(2172),
                     },
                 ],
             },
@@ -29387,483 +29387,483 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "dsl/std/logic.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2168),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/bit.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2168),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/error_primitives.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2168),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/algebra.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2168),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/magnitude.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2168),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/machine_constraints.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2168),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/nat.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2168),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/integer.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2168),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/rational.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2168),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/float.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2168),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/types.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2168),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/string_type.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2168),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/unicode.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2168),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/render_repeat_string_bootstrap.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2168),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/methods.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2168),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/serialization.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2166),
+                            constructor: DeclarationId(2168),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/algebra.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_messages.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_operations.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_schema.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/approximate_field.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bin_shim.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bootstrap_authority.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bridge_ledger.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/clean_emission.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/computation.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/computation_model.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/coproduct_projection.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/cross_target_coverage.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/diagnostics.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/dimensions.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/effects.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/emission_provenance.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/emit_model.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/extdeps_bootstrap_fixtures.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/go_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/induction.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/integer_diagnostic_order.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lens.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lens_application.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/list.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lookup.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/methods.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/parse_surface.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/python_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/resources.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/runtime.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/rust_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/services.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/substrate.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/substrate_minimal.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/termination.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/t_ci_workflow_as_data_demo.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/timing_lens.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/tokenize.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/verification.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/workflows.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2167),
+                            constructor: DeclarationId(2169),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/v3_l1.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2168),
+                            constructor: DeclarationId(2170),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/go.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2168),
+                            constructor: DeclarationId(2170),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/python.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2168),
+                            constructor: DeclarationId(2170),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/rust.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2168),
+                            constructor: DeclarationId(2170),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/pipeline.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2169),
+                            constructor: DeclarationId(2171),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/operators.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2169),
+                            constructor: DeclarationId(2171),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/regen.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2169),
+                            constructor: DeclarationId(2171),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/languages/rust/primitives.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2170),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/cron_schedule_model.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2170),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/github/github.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2170),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/github/actions.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2170),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/github/ci.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2170),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
@@ -29881,11 +29881,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Retired".to_string(),
-                        ty: DeclarationId(2171),
+                        ty: DeclarationId(2173),
                     },
                     Field {
                         label: "Open".to_string(),
-                        ty: DeclarationId(2172),
+                        ty: DeclarationId(2174),
                     },
                 ],
             },
@@ -29905,7 +29905,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "decl".to_string(),
-                    ty: DeclarationId(1311),
+                    ty: DeclarationId(1313),
                 }],
             },
             type_params: vec![],
@@ -29951,7 +29951,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6389, 6499),
         });
-        declarations.push(Declaration { id: DeclarationId(920), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(919) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2173)), 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(2172), 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(2171), 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(2171), 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(2171), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-pb-bridge-canonical-lens-name-dispatch-closure.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(2171), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/l1_5_fixed_point_test.rs".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(2171), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/bridge_lower_helpers_patch_zero_residual_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_semantic_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2172), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-v-bridge-row-4-exact-string-deeper-detail-receipt.md".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6963, 8416) });
+        declarations.push(Declaration { id: DeclarationId(920), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(919) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2175)), 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(2174), 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(2173), 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(2173), 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(2173), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-pb-bridge-canonical-lens-name-dispatch-closure.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(2173), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/l1_5_fixed_point_test.rs".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(2173), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/bridge_lower_helpers_patch_zero_residual_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_semantic_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2174), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-v-bridge-row-4-exact-string-deeper-detail-receipt.md".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6963, 8416) });
         declarations.push(Declaration {
             id: DeclarationId(921),
             name: Some("CleanEmissionContract".to_string()),
@@ -30037,15 +30037,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "WrapEverything".to_string(),
-                        ty: DeclarationId(2174),
+                        ty: DeclarationId(2176),
                     },
                     Field {
                         label: "WrapOnlyInOperandPosition".to_string(),
-                        ty: DeclarationId(2175),
+                        ty: DeclarationId(2177),
                     },
                     Field {
                         label: "NoWrapping".to_string(),
-                        ty: DeclarationId(2176),
+                        ty: DeclarationId(2178),
                     },
                 ],
             },
@@ -30066,19 +30066,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "EmitBindingAlways".to_string(),
-                        ty: DeclarationId(2177),
+                        ty: DeclarationId(2179),
                     },
                     Field {
                         label: "EmitUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(2178),
+                        ty: DeclarationId(2180),
                     },
                     Field {
                         label: "EmitPrefixedUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(2179),
+                        ty: DeclarationId(2181),
                     },
                     Field {
                         label: "NotApplicablePatternBinding".to_string(),
-                        ty: DeclarationId(2180),
+                        ty: DeclarationId(2182),
                     },
                 ],
             },
@@ -30099,11 +30099,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "AccessFromPayloadBinding".to_string(),
-                        ty: DeclarationId(2181),
+                        ty: DeclarationId(2183),
                     },
                     Field {
                         label: "OverrideNamedFieldsAtBindingSite".to_string(),
-                        ty: DeclarationId(2182),
+                        ty: DeclarationId(2184),
                     },
                 ],
             },
@@ -30124,15 +30124,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ImportEverythingDeclared".to_string(),
-                        ty: DeclarationId(2183),
+                        ty: DeclarationId(2185),
                     },
                     Field {
                         label: "IncludeOnlyReferenced".to_string(),
-                        ty: DeclarationId(2184),
+                        ty: DeclarationId(2186),
                     },
                     Field {
                         label: "ImportPerUsageSite".to_string(),
-                        ty: DeclarationId(2185),
+                        ty: DeclarationId(2187),
                     },
                 ],
             },
@@ -30153,15 +30153,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "WrapReturnValue".to_string(),
-                        ty: DeclarationId(2186),
+                        ty: DeclarationId(2188),
                     },
                     Field {
                         label: "NoWrappingOnTerminalExpression".to_string(),
-                        ty: DeclarationId(2187),
+                        ty: DeclarationId(2189),
                     },
                     Field {
                         label: "ExplicitReturnKeyword".to_string(),
-                        ty: DeclarationId(2188),
+                        ty: DeclarationId(2190),
                     },
                 ],
             },
@@ -30182,15 +30182,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "EmitLetBindingAlways".to_string(),
-                        ty: DeclarationId(2189),
+                        ty: DeclarationId(2191),
                     },
                     Field {
                         label: "EmitLetUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(2190),
+                        ty: DeclarationId(2192),
                     },
                     Field {
                         label: "OmitLetBinding".to_string(),
-                        ty: DeclarationId(2191),
+                        ty: DeclarationId(2193),
                     },
                 ],
             },
@@ -30211,15 +30211,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "WrapBody".to_string(),
-                        ty: DeclarationId(2192),
+                        ty: DeclarationId(2194),
                     },
                     Field {
                         label: "NoWrappingOnNonComplexBody".to_string(),
-                        ty: DeclarationId(2193),
+                        ty: DeclarationId(2195),
                     },
                     Field {
                         label: "NotApplicableMatchArmBody".to_string(),
-                        ty: DeclarationId(2194),
+                        ty: DeclarationId(2196),
                     },
                 ],
             },
@@ -30277,7 +30277,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2195),
+                        ty: DeclarationId(2197),
                     },
                     Field {
                         label: "syntax_only".to_string(),
@@ -30310,19 +30310,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IgnoreVerifierOutput".to_string(),
-                        ty: DeclarationId(2196),
+                        ty: DeclarationId(2198),
                     },
                     Field {
                         label: "RequireEmptyStdout".to_string(),
-                        ty: DeclarationId(2197),
+                        ty: DeclarationId(2199),
                     },
                     Field {
                         label: "RequireEmptyStderr".to_string(),
-                        ty: DeclarationId(2198),
+                        ty: DeclarationId(2200),
                     },
                     Field {
                         label: "RequireEmptyStdoutAndStderr".to_string(),
-                        ty: DeclarationId(2199),
+                        ty: DeclarationId(2201),
                     },
                 ],
             },
@@ -30343,35 +30343,35 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "CollectionSize".to_string(),
-                        ty: DeclarationId(2206),
+                        ty: DeclarationId(2208),
                     },
                     Field {
                         label: "ParserStreamSize".to_string(),
-                        ty: DeclarationId(2207),
+                        ty: DeclarationId(2209),
                     },
                     Field {
                         label: "WorklistDrainSize".to_string(),
-                        ty: DeclarationId(2208),
+                        ty: DeclarationId(2210),
                     },
                     Field {
                         label: "TreeSize".to_string(),
-                        ty: DeclarationId(2209),
+                        ty: DeclarationId(2211),
                     },
                     Field {
                         label: "ArithmeticParam".to_string(),
-                        ty: DeclarationId(2210),
+                        ty: DeclarationId(2212),
                     },
                     Field {
                         label: "ExplicitCountZero".to_string(),
-                        ty: DeclarationId(2211),
+                        ty: DeclarationId(2213),
                     },
                     Field {
                         label: "ExplicitCountPositive".to_string(),
-                        ty: DeclarationId(2212),
+                        ty: DeclarationId(2214),
                     },
                     Field {
                         label: "Forever".to_string(),
-                        ty: DeclarationId(2213),
+                        ty: DeclarationId(2215),
                     },
                 ],
             },
@@ -30414,35 +30414,35 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ChildAccessorCall".to_string(),
-                        ty: DeclarationId(2214),
+                        ty: DeclarationId(2216),
                     },
                     Field {
                         label: "CollectionShrinkCall".to_string(),
-                        ty: DeclarationId(2215),
+                        ty: DeclarationId(2217),
                     },
                     Field {
                         label: "ArithmeticSubtractCall".to_string(),
-                        ty: DeclarationId(2216),
+                        ty: DeclarationId(2218),
                     },
                     Field {
                         label: "ArithmeticDivideCall".to_string(),
-                        ty: DeclarationId(2217),
+                        ty: DeclarationId(2219),
                     },
                     Field {
                         label: "ParserAdvanceCall".to_string(),
-                        ty: DeclarationId(2218),
+                        ty: DeclarationId(2220),
                     },
                     Field {
                         label: "WorklistDrainCall".to_string(),
-                        ty: DeclarationId(2219),
+                        ty: DeclarationId(2221),
                     },
                     Field {
                         label: "FoldBodyCall".to_string(),
-                        ty: DeclarationId(2220),
+                        ty: DeclarationId(2222),
                     },
                     Field {
                         label: "SameArgumentCall".to_string(),
-                        ty: DeclarationId(2221),
+                        ty: DeclarationId(2223),
                     },
                 ],
             },
@@ -30461,7 +30461,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("per_call_pattern_at".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-                output: DeclarationId(2200),
+                output: DeclarationId(2202),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     2764,
@@ -30483,7 +30483,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("per_call_descent_operand_port".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-                output: DeclarationId(2201),
+                output: DeclarationId(2203),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     2969,
@@ -30507,15 +30507,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UnitShrink".to_string(),
-                        ty: DeclarationId(2222),
+                        ty: DeclarationId(2224),
                     },
                     Field {
                         label: "ConstantShrink".to_string(),
-                        ty: DeclarationId(2223),
+                        ty: DeclarationId(2225),
                     },
                     Field {
                         label: "ProportionalShrink".to_string(),
-                        ty: DeclarationId(2224),
+                        ty: DeclarationId(2226),
                     },
                 ],
             },
@@ -30536,15 +30536,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Fold".to_string(),
-                        ty: DeclarationId(2225),
+                        ty: DeclarationId(2227),
                     },
                     Field {
                         label: "Descend".to_string(),
-                        ty: DeclarationId(2226),
+                        ty: DeclarationId(2228),
                     },
                     Field {
                         label: "Repeat".to_string(),
-                        ty: DeclarationId(2227),
+                        ty: DeclarationId(2229),
                     },
                 ],
             },
@@ -30577,7 +30577,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "factor".to_string(),
-                        ty: DeclarationId(2228),
+                        ty: DeclarationId(2230),
                     },
                 ],
             },
@@ -30618,7 +30618,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("size_bound_param".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(933)],
-                output: DeclarationId(2202),
+                output: DeclarationId(2204),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     5787,
@@ -30684,7 +30684,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("constant_bound_value".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(933)],
-                output: DeclarationId(2203),
+                output: DeclarationId(2205),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     6715,
@@ -30708,15 +30708,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "TreeDescent".to_string(),
-                        ty: DeclarationId(2229),
+                        ty: DeclarationId(2231),
                     },
                     Field {
                         label: "CollectionFold".to_string(),
-                        ty: DeclarationId(2230),
+                        ty: DeclarationId(2232),
                     },
                     Field {
                         label: "ArithmeticRepeat".to_string(),
-                        ty: DeclarationId(2231),
+                        ty: DeclarationId(2233),
                     },
                 ],
             },
@@ -30735,7 +30735,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("algebra_profile_to_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(53)],
-                output: DeclarationId(2204),
+                output: DeclarationId(2206),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     7781,
@@ -30757,7 +30757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("type_iteration_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230)],
-                output: DeclarationId(2205),
+                output: DeclarationId(2207),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     8346,
@@ -30781,11 +30781,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Immutable".to_string(),
-                        ty: DeclarationId(2232),
+                        ty: DeclarationId(2234),
                     },
                     Field {
                         label: "Mutable".to_string(),
-                        ty: DeclarationId(2233),
+                        ty: DeclarationId(2235),
                     },
                 ],
             },
@@ -30806,11 +30806,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Pure".to_string(),
-                        ty: DeclarationId(2234),
+                        ty: DeclarationId(2236),
                     },
                     Field {
                         label: "Effectful".to_string(),
-                        ty: DeclarationId(2235),
+                        ty: DeclarationId(2237),
                     },
                 ],
             },
@@ -30831,11 +30831,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ExplicitDAG".to_string(),
-                        ty: DeclarationId(2236),
+                        ty: DeclarationId(2238),
                     },
                     Field {
                         label: "Arbitrary".to_string(),
-                        ty: DeclarationId(2237),
+                        ty: DeclarationId(2239),
                     },
                 ],
             },
@@ -30856,11 +30856,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Bounded".to_string(),
-                        ty: DeclarationId(2238),
+                        ty: DeclarationId(2240),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(2239),
+                        ty: DeclarationId(2241),
                     },
                 ],
             },
@@ -30924,28 +30924,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "mutability".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2232),
+                            constructor: DeclarationId(2234),
                             payload: vec![],
                         },
                     ),
                     (
                         "purity".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2234),
+                            constructor: DeclarationId(2236),
                             payload: vec![],
                         },
                     ),
                     (
                         "structure".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2236),
+                            constructor: DeclarationId(2238),
                             payload: vec![],
                         },
                     ),
                     (
                         "iteration".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2238),
+                            constructor: DeclarationId(2240),
                             payload: vec![],
                         },
                     ),
@@ -30962,19 +30962,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ValueOnly".to_string(),
-                        ty: DeclarationId(2240),
+                        ty: DeclarationId(2242),
                     },
                     Field {
                         label: "GarbageCollected".to_string(),
-                        ty: DeclarationId(2241),
+                        ty: DeclarationId(2243),
                     },
                     Field {
                         label: "RefCounted".to_string(),
-                        ty: DeclarationId(2242),
+                        ty: DeclarationId(2244),
                     },
                     Field {
                         label: "OwnershipBased".to_string(),
-                        ty: DeclarationId(2243),
+                        ty: DeclarationId(2245),
                     },
                 ],
             },
@@ -30995,11 +30995,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LexicalScoping".to_string(),
-                        ty: DeclarationId(2244),
+                        ty: DeclarationId(2246),
                     },
                     Field {
                         label: "DynamicScoping".to_string(),
-                        ty: DeclarationId(2245),
+                        ty: DeclarationId(2247),
                     },
                 ],
             },
@@ -31044,7 +31044,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "excluded_prefixes".to_string(),
-                    ty: DeclarationId(2246),
+                    ty: DeclarationId(2248),
                 }],
             },
             type_params: vec![],
@@ -31068,7 +31068,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "additional_excluded_prefixes".to_string(),
-                        ty: DeclarationId(2247),
+                        ty: DeclarationId(2249),
                     },
                 ],
             },
@@ -31116,11 +31116,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "OwnershipBased".to_string(),
-                        ty: DeclarationId(2248),
+                        ty: DeclarationId(2250),
                     },
                     Field {
                         label: "GarbageCollected".to_string(),
-                        ty: DeclarationId(2249),
+                        ty: DeclarationId(2251),
                     },
                 ],
             },
@@ -31157,7 +31157,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "StringTag".to_string(),
-                    ty: DeclarationId(2250),
+                    ty: DeclarationId(2252),
                 }],
             },
             type_params: vec![],
@@ -31177,11 +31177,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Empty".to_string(),
-                        ty: DeclarationId(2251),
+                        ty: DeclarationId(2253),
                     },
                     Field {
                         label: "Populated".to_string(),
-                        ty: DeclarationId(2252),
+                        ty: DeclarationId(2254),
                     },
                 ],
             },
@@ -31227,7 +31227,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "declaration".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "wire_tag_field".to_string(),
@@ -31235,7 +31235,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "variant_projections".to_string(),
-                        ty: DeclarationId(2253),
+                        ty: DeclarationId(2255),
                     },
                 ],
             },
@@ -31336,27 +31336,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Atom".to_string(),
-                        ty: DeclarationId(2254),
+                        ty: DeclarationId(2256),
                     },
                     Field {
                         label: "Conj".to_string(),
-                        ty: DeclarationId(2255),
+                        ty: DeclarationId(2257),
                     },
                     Field {
                         label: "Disj".to_string(),
-                        ty: DeclarationId(2256),
+                        ty: DeclarationId(2258),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2257),
+                        ty: DeclarationId(2259),
                     },
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(2258),
+                        ty: DeclarationId(2260),
                     },
                     Field {
                         label: "Instantiation".to_string(),
-                        ty: DeclarationId(2259),
+                        ty: DeclarationId(2261),
                     },
                 ],
             },
@@ -31377,23 +31377,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Value".to_string(),
-                        ty: DeclarationId(2260),
+                        ty: DeclarationId(2262),
                     },
                     Field {
                         label: "Transform".to_string(),
-                        ty: DeclarationId(2261),
+                        ty: DeclarationId(2263),
                     },
                     Field {
                         label: "Branch".to_string(),
-                        ty: DeclarationId(2262),
+                        ty: DeclarationId(2264),
                     },
                     Field {
                         label: "Loop".to_string(),
-                        ty: DeclarationId(2263),
+                        ty: DeclarationId(2265),
                     },
                     Field {
                         label: "Bind".to_string(),
-                        ty: DeclarationId(2264),
+                        ty: DeclarationId(2266),
                     },
                 ],
             },
@@ -31468,7 +31468,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "cells".to_string(),
-                        ty: DeclarationId(2265),
+                        ty: DeclarationId(2267),
                     },
                 ],
             },
@@ -31494,7 +31494,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2266)),
+            meta_tag: Some(DeclarationId(2268)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -31521,14 +31521,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -31558,14 +31558,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -31595,14 +31595,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -31632,14 +31632,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -31669,14 +31669,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -31706,14 +31706,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -31743,14 +31743,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -31780,14 +31780,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -31817,14 +31817,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -31854,14 +31854,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -31891,14 +31891,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -31928,14 +31928,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -31965,14 +31965,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -32002,14 +32002,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -32039,14 +32039,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -32076,14 +32076,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -32113,14 +32113,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -32150,14 +32150,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -32187,14 +32187,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -32224,14 +32224,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -32261,14 +32261,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -32298,14 +32298,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -32335,14 +32335,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -32372,14 +32372,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -32409,14 +32409,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -32446,14 +32446,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -32483,14 +32483,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -32520,14 +32520,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -32557,14 +32557,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -32594,14 +32594,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -32631,14 +32631,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -32668,14 +32668,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -32705,14 +32705,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -32742,14 +32742,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -32779,14 +32779,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -32816,14 +32816,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -32853,14 +32853,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -32890,14 +32890,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -32927,14 +32927,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -32964,14 +32964,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -33001,14 +33001,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2258),
+                                    constructor: DeclarationId(2260),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2261),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
@@ -33027,43 +33027,43 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-                        ty: DeclarationId(2267),
+                        ty: DeclarationId(2269),
                     },
                     Field {
                         label: "ParseError".to_string(),
-                        ty: DeclarationId(2268),
+                        ty: DeclarationId(2270),
                     },
                     Field {
                         label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(2269),
+                        ty: DeclarationId(2271),
                     },
                     Field {
                         label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(2270),
+                        ty: DeclarationId(2272),
                     },
                     Field {
                         label: "ResolveError".to_string(),
-                        ty: DeclarationId(2271),
+                        ty: DeclarationId(2273),
                     },
                     Field {
                         label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(2272),
+                        ty: DeclarationId(2274),
                     },
                     Field {
                         label: "BranchConditionNotBool".to_string(),
-                        ty: DeclarationId(2273),
+                        ty: DeclarationId(2275),
                     },
                     Field {
                         label: "MagnitudeOutOfRange".to_string(),
-                        ty: DeclarationId(2274),
+                        ty: DeclarationId(2276),
                     },
                     Field {
                         label: "MalformedIntegerRangeFact".to_string(),
-                        ty: DeclarationId(2275),
+                        ty: DeclarationId(2277),
                     },
                     Field {
                         label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(2276),
+                        ty: DeclarationId(2278),
                     },
                 ],
             },
@@ -33137,7 +33137,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "kind_decl".to_string(),
-                    ty: DeclarationId(1311),
+                    ty: DeclarationId(1313),
                 }],
             },
             type_params: vec![],
@@ -33157,11 +33157,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "CompilerKind".to_string(),
-                        ty: DeclarationId(2277),
+                        ty: DeclarationId(2279),
                     },
                     Field {
                         label: "LensInstanceKind".to_string(),
-                        ty: DeclarationId(2278),
+                        ty: DeclarationId(2280),
                     },
                 ],
             },
@@ -33194,7 +33194,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "fixes".to_string(),
-                        ty: DeclarationId(2279),
+                        ty: DeclarationId(2281),
                     },
                 ],
             },
@@ -33215,31 +33215,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UnderRefined".to_string(),
-                        ty: DeclarationId(2280),
+                        ty: DeclarationId(2282),
                     },
                     Field {
                         label: "NoInhabitant".to_string(),
-                        ty: DeclarationId(2281),
+                        ty: DeclarationId(2283),
                     },
                     Field {
                         label: "ContradictoryUse".to_string(),
-                        ty: DeclarationId(2283),
+                        ty: DeclarationId(2285),
                     },
                     Field {
                         label: "OutOfR2Scope".to_string(),
-                        ty: DeclarationId(2284),
+                        ty: DeclarationId(2286),
                     },
                     Field {
                         label: "LifetimeProgramExtractionPending".to_string(),
-                        ty: DeclarationId(2285),
+                        ty: DeclarationId(2287),
                     },
                     Field {
                         label: "FoldNotImplemented".to_string(),
-                        ty: DeclarationId(2286),
+                        ty: DeclarationId(2288),
                     },
                     Field {
                         label: "MissingEmissionPath".to_string(),
-                        ty: DeclarationId(2287),
+                        ty: DeclarationId(2289),
                     },
                 ],
             },
@@ -33260,11 +33260,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Inhabits".to_string(),
-                        ty: DeclarationId(2302),
+                        ty: DeclarationId(2304),
                     },
                     Field {
                         label: "Violates".to_string(),
-                        ty: DeclarationId(2303),
+                        ty: DeclarationId(2305),
                     },
                 ],
             },
@@ -33299,11 +33299,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoDiagnostic".to_string(),
-                        ty: DeclarationId(2304),
+                        ty: DeclarationId(2306),
                     },
                     Field {
                         label: "SomeDiagnostic".to_string(),
-                        ty: DeclarationId(2305),
+                        ty: DeclarationId(2307),
                     },
                 ],
             },
@@ -33324,11 +33324,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DimensionOk".to_string(),
-                        ty: DeclarationId(2308),
+                        ty: DeclarationId(2310),
                     },
                     Field {
                         label: "DimensionFail".to_string(),
-                        ty: DeclarationId(2312),
+                        ty: DeclarationId(2314),
                     },
                 ],
             },
@@ -33367,15 +33367,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "witness_of".to_string(),
-                        ty: DeclarationId(2314),
+                        ty: DeclarationId(2316),
                     },
                     Field {
                         label: "compose".to_string(),
-                        ty: DeclarationId(2315),
+                        ty: DeclarationId(2317),
                     },
                     Field {
                         label: "break_diagnostic".to_string(),
-                        ty: DeclarationId(2316),
+                        ty: DeclarationId(2318),
                     },
                 ],
             },
@@ -33415,7 +33415,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             type_params: vec![DeclarationId(992), DeclarationId(993)],
             phantom_params: vec![PhantomParameter {
                 parameter: DeclarationId(992),
-                algebra: DeclarationId(2317),
+                algebra: DeclarationId(2319),
             }],
             meta_tag: None,
             specialization_parent: None,
@@ -33556,11 +33556,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("add_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(2288),
-                    DeclarationId(2289),
                     DeclarationId(2290),
+                    DeclarationId(2291),
+                    DeclarationId(2292),
                 ],
-                output: DeclarationId(2291),
+                output: DeclarationId(2293),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4966, 4988)),
             },
             type_params: vec![DeclarationId(1002), DeclarationId(1003)],
@@ -33606,11 +33606,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("sub_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(2292),
-                    DeclarationId(2293),
                     DeclarationId(2294),
+                    DeclarationId(2295),
+                    DeclarationId(2296),
                 ],
-                output: DeclarationId(2295),
+                output: DeclarationId(2297),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5162, 5184)),
             },
             type_params: vec![DeclarationId(1005), DeclarationId(1006)],
@@ -33656,11 +33656,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("mul_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(2296),
-                    DeclarationId(2297),
+                    DeclarationId(2298),
+                    DeclarationId(2299),
                     DeclarationId(1009),
                 ],
-                output: DeclarationId(2298),
+                output: DeclarationId(2300),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5350, 5379)),
             },
             type_params: vec![DeclarationId(1008), DeclarationId(1009)],
@@ -33706,11 +33706,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("div_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(2299),
-                    DeclarationId(2300),
+                    DeclarationId(2301),
+                    DeclarationId(2302),
                     DeclarationId(1012),
                 ],
-                output: DeclarationId(2301),
+                output: DeclarationId(2303),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5545, 5574)),
             },
             type_params: vec![DeclarationId(1011), DeclarationId(1012)],
@@ -33775,11 +33775,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoSourceSpan".to_string(),
-                        ty: DeclarationId(2318),
+                        ty: DeclarationId(2320),
                     },
                     Field {
                         label: "SomeSourceSpan".to_string(),
-                        ty: DeclarationId(2319),
+                        ty: DeclarationId(2321),
                     },
                 ],
             },
@@ -33829,11 +33829,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "carrier".to_string(),
@@ -33845,7 +33845,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2320),
+                        ty: DeclarationId(2322),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -33870,15 +33870,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "kernel_integer".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "bound".to_string(),
@@ -33886,7 +33886,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_realization".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                 ],
             },
@@ -33907,15 +33907,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "BoundUnspecified".to_string(),
-                        ty: DeclarationId(2321),
+                        ty: DeclarationId(2323),
                     },
                     Field {
                         label: "StaticBoundFact".to_string(),
-                        ty: DeclarationId(2322),
+                        ty: DeclarationId(2324),
                     },
                     Field {
                         label: "PlatformDependentFact".to_string(),
-                        ty: DeclarationId(2323),
+                        ty: DeclarationId(2325),
                     },
                 ],
             },
@@ -33965,11 +33965,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DirectField".to_string(),
-                        ty: DeclarationId(2324),
+                        ty: DeclarationId(2326),
                     },
                     Field {
                         label: "AccessorMethod".to_string(),
-                        ty: DeclarationId(2325),
+                        ty: DeclarationId(2327),
                     },
                 ],
             },
@@ -33990,15 +33990,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "op".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "carrier".to_string(),
@@ -34027,11 +34027,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "carrier".to_string(),
@@ -34060,11 +34060,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "strategy".to_string(),
@@ -34072,7 +34072,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "parameters".to_string(),
-                        ty: DeclarationId(2326),
+                        ty: DeclarationId(2328),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -34122,11 +34122,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Borrowed".to_string(),
-                        ty: DeclarationId(2327),
+                        ty: DeclarationId(2329),
                     },
                     Field {
                         label: "Consumed".to_string(),
-                        ty: DeclarationId(2328),
+                        ty: DeclarationId(2330),
                     },
                 ],
             },
@@ -34147,11 +34147,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Owned".to_string(),
-                        ty: DeclarationId(2329),
+                        ty: DeclarationId(2331),
                     },
                     Field {
                         label: "Borrowed".to_string(),
-                        ty: DeclarationId(2330),
+                        ty: DeclarationId(2332),
                     },
                 ],
             },
@@ -34172,11 +34172,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "SelfContained".to_string(),
-                        ty: DeclarationId(2331),
+                        ty: DeclarationId(2333),
                     },
                     Field {
                         label: "Caller".to_string(),
-                        ty: DeclarationId(2332),
+                        ty: DeclarationId(2334),
                     },
                 ],
             },
@@ -34197,15 +34197,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Growable".to_string(),
-                        ty: DeclarationId(2333),
+                        ty: DeclarationId(2335),
                     },
                     Field {
                         label: "Fixed".to_string(),
-                        ty: DeclarationId(2334),
+                        ty: DeclarationId(2336),
                     },
                     Field {
                         label: "NotApplicable".to_string(),
-                        ty: DeclarationId(2335),
+                        ty: DeclarationId(2337),
                     },
                 ],
             },
@@ -34225,7 +34225,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Utf8FreeMonoidChar".to_string(),
-                    ty: DeclarationId(2336),
+                    ty: DeclarationId(2338),
                 }],
             },
             type_params: vec![],
@@ -34245,31 +34245,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "target_type".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "type_realization".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "ownership".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "lifetime".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "growability".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "encoding".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                 ],
             },
@@ -34290,11 +34290,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "carrier".to_string(),
@@ -34323,43 +34323,43 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ListEmpty".to_string(),
-                        ty: DeclarationId(2337),
+                        ty: DeclarationId(2339),
                     },
                     Field {
                         label: "ListSingleton".to_string(),
-                        ty: DeclarationId(2338),
+                        ty: DeclarationId(2340),
                     },
                     Field {
                         label: "ListCons".to_string(),
-                        ty: DeclarationId(2339),
+                        ty: DeclarationId(2341),
                     },
                     Field {
                         label: "ListConcat".to_string(),
-                        ty: DeclarationId(2340),
+                        ty: DeclarationId(2342),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(2341),
+                        ty: DeclarationId(2343),
                     },
                     Field {
                         label: "ListIsEmpty".to_string(),
-                        ty: DeclarationId(2342),
+                        ty: DeclarationId(2344),
                     },
                     Field {
                         label: "ListFold".to_string(),
-                        ty: DeclarationId(2343),
+                        ty: DeclarationId(2345),
                     },
                     Field {
                         label: "ListMap".to_string(),
-                        ty: DeclarationId(2344),
+                        ty: DeclarationId(2346),
                     },
                     Field {
                         label: "ListFilter".to_string(),
-                        ty: DeclarationId(2345),
+                        ty: DeclarationId(2347),
                     },
                     Field {
                         label: "ListContains".to_string(),
-                        ty: DeclarationId(2346),
+                        ty: DeclarationId(2348),
                     },
                 ],
             },
@@ -34380,11 +34380,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "strategy".to_string(),
@@ -34392,11 +34392,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "empty_variant".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "cons_variant".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "scrutinee".to_string(),
@@ -34441,11 +34441,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "PlaceholderPatternStrategy".to_string(),
-                        ty: DeclarationId(2347),
+                        ty: DeclarationId(2349),
                     },
                     Field {
                         label: "VectorList".to_string(),
-                        ty: DeclarationId(2348),
+                        ty: DeclarationId(2350),
                     },
                 ],
             },
@@ -34789,39 +34789,39 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "concat_contract".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "length_contract".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "is_empty_contract".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "fold_contract".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "filter_contract".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "flat_map_contract".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "any_contract".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "all_contract".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "map_contract".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "filter".to_string(),
@@ -34924,11 +34924,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Borrow".to_string(),
-                        ty: DeclarationId(2349),
+                        ty: DeclarationId(2351),
                     },
                     Field {
                         label: "PassByValue".to_string(),
-                        ty: DeclarationId(2350),
+                        ty: DeclarationId(2352),
                     },
                 ],
             },
@@ -34949,11 +34949,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "CopyOrClone".to_string(),
-                        ty: DeclarationId(2351),
+                        ty: DeclarationId(2353),
                     },
                     Field {
                         label: "PassByValue".to_string(),
-                        ty: DeclarationId(2352),
+                        ty: DeclarationId(2354),
                     },
                 ],
             },
@@ -34974,51 +34974,51 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "statements".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "expressions".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "control_flow".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "literals".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "modules".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "functions".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "type_applications".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "type_definitions".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "record_derive_templates".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "patterns".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "collection_ops".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "values".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                 ],
             },
@@ -35039,11 +35039,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IndexedArgs".to_string(),
-                        ty: DeclarationId(2353),
+                        ty: DeclarationId(2355),
                     },
                     Field {
                         label: "NamedArg".to_string(),
-                        ty: DeclarationId(2354),
+                        ty: DeclarationId(2356),
                     },
                 ],
             },
@@ -35064,11 +35064,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "SingleTemplate".to_string(),
-                        ty: DeclarationId(2355),
+                        ty: DeclarationId(2357),
                     },
                     Field {
                         label: "HigherOrderTemplates".to_string(),
-                        ty: DeclarationId(2356),
+                        ty: DeclarationId(2358),
                     },
                 ],
             },
@@ -35335,7 +35335,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({left}, {right}...)".to_string(),
                             ))],
@@ -35348,7 +35348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -35386,7 +35386,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "int64(len({recv}))".to_string(),
                             ))],
@@ -35399,7 +35399,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -35437,7 +35437,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv}) == 0".to_string(),
                             ))],
@@ -35450,7 +35450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -35490,7 +35490,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "/* fold({recv}, {init}, {body}) */".to_string(),
                             ))],
@@ -35503,7 +35503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -35543,7 +35543,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "/* map({recv}, {body}) */".to_string(),
                             ))],
@@ -35556,7 +35556,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -35596,7 +35596,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Filter({recv}, {arg})".to_string(),
                             ))],
@@ -35609,7 +35609,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -35649,7 +35649,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Any({recv}, {arg})".to_string(),
                             ))],
@@ -35662,7 +35662,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -35702,7 +35702,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.All({recv}, {arg})".to_string(),
                             ))],
@@ -35715,7 +35715,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -35755,7 +35755,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.FlatMap({recv}, {arg})".to_string(),
                             ))],
@@ -35768,7 +35768,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -35790,7 +35790,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2357)),
+            meta_tag: Some(DeclarationId(2359)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -35809,7 +35809,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -35822,7 +35822,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -35844,7 +35844,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Join({recv}, {arg})".to_string(),
                             ))],
@@ -35857,7 +35857,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -35879,7 +35879,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Split({recv}, {arg})".to_string(),
                             ))],
@@ -35892,7 +35892,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -35916,7 +35916,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -35929,7 +35929,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -35949,7 +35949,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -35962,7 +35962,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -35984,7 +35984,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.SortBy({recv}, {arg})".to_string(),
                             ))],
@@ -35997,7 +35997,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -36019,7 +36019,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({recv}, {arg})".to_string(),
                             ))],
@@ -36032,7 +36032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -36054,7 +36054,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Contains({recv}, {arg})".to_string(),
                             ))],
@@ -36067,7 +36067,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -36084,23 +36084,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DirectRecursion".to_string(),
-                        ty: DeclarationId(2371),
+                        ty: DeclarationId(2373),
                     },
                     Field {
                         label: "ListRecursion".to_string(),
-                        ty: DeclarationId(2372),
+                        ty: DeclarationId(2374),
                     },
                     Field {
                         label: "OptionalRecursion".to_string(),
-                        ty: DeclarationId(2373),
+                        ty: DeclarationId(2375),
                     },
                     Field {
                         label: "SetRecursion".to_string(),
-                        ty: DeclarationId(2374),
+                        ty: DeclarationId(2376),
                     },
                     Field {
                         label: "MapValueRecursion".to_string(),
-                        ty: DeclarationId(2375),
+                        ty: DeclarationId(2377),
                     },
                 ],
             },
@@ -36212,23 +36212,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "StrictSubValue".to_string(),
-                        ty: DeclarationId(2376),
+                        ty: DeclarationId(2378),
                     },
                     Field {
                         label: "IteratedSubValue".to_string(),
-                        ty: DeclarationId(2377),
+                        ty: DeclarationId(2379),
                     },
                     Field {
                         label: "ArithmeticDescent".to_string(),
-                        ty: DeclarationId(2378),
+                        ty: DeclarationId(2380),
                     },
                     Field {
                         label: "PreservedValue".to_string(),
-                        ty: DeclarationId(2379),
+                        ty: DeclarationId(2381),
                     },
                     Field {
                         label: "SubValueUnknown".to_string(),
-                        ty: DeclarationId(2380),
+                        ty: DeclarationId(2382),
                     },
                 ],
             },
@@ -36379,7 +36379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("sub_value_to_call_pattern".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1073)],
-                output: DeclarationId(2358),
+                output: DeclarationId(2360),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     20571,
@@ -36401,7 +36401,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("sub_value_to_lowering_target".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1073)],
-                output: DeclarationId(2359),
+                output: DeclarationId(2361),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     21959,
@@ -36425,19 +36425,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IntegerExpZero".to_string(),
-                        ty: DeclarationId(2381),
+                        ty: DeclarationId(2383),
                     },
                     Field {
                         label: "IntegerExpPos".to_string(),
-                        ty: DeclarationId(2382),
+                        ty: DeclarationId(2384),
                     },
                     Field {
                         label: "FractionExp".to_string(),
-                        ty: DeclarationId(2383),
+                        ty: DeclarationId(2385),
                     },
                     Field {
                         label: "LogBasedExp".to_string(),
-                        ty: DeclarationId(2384),
+                        ty: DeclarationId(2386),
                     },
                 ],
             },
@@ -36480,11 +36480,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "PolyCost".to_string(),
-                        ty: DeclarationId(2385),
+                        ty: DeclarationId(2387),
                     },
                     Field {
                         label: "LogCost".to_string(),
-                        ty: DeclarationId(2386),
+                        ty: DeclarationId(2388),
                     },
                 ],
             },
@@ -36505,31 +36505,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ConstantBound".to_string(),
-                        ty: DeclarationId(2387),
+                        ty: DeclarationId(2389),
                     },
                     Field {
                         label: "AtomicBound".to_string(),
-                        ty: DeclarationId(2388),
+                        ty: DeclarationId(2390),
                     },
                     Field {
                         label: "ProductBound".to_string(),
-                        ty: DeclarationId(2390),
+                        ty: DeclarationId(2392),
                     },
                     Field {
                         label: "SumOfProductsBound".to_string(),
-                        ty: DeclarationId(2393),
+                        ty: DeclarationId(2395),
                     },
                     Field {
                         label: "SumBound".to_string(),
-                        ty: DeclarationId(2395),
+                        ty: DeclarationId(2397),
                     },
                     Field {
                         label: "ForeverBound".to_string(),
-                        ty: DeclarationId(2396),
+                        ty: DeclarationId(2398),
                     },
                     Field {
                         label: "ErrorBound".to_string(),
-                        ty: DeclarationId(2397),
+                        ty: DeclarationId(2399),
                     },
                 ],
             },
@@ -36547,7 +36547,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1086),
             name: Some("sum_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2360)],
+                inputs: vec![DeclarationId(2362)],
                 output: DeclarationId(1085),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -36627,7 +36627,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1090),
             name: Some("product_atoms_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2361)],
+                inputs: vec![DeclarationId(2363)],
                 output: DeclarationId(849),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -36649,7 +36649,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1091),
             name: Some("product_term_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2362)],
+                inputs: vec![DeclarationId(2364)],
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(555))),
             },
@@ -36667,7 +36667,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1092),
             name: Some("sum_products_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2364)],
+                inputs: vec![DeclarationId(2366)],
                 output: DeclarationId(849),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -36921,7 +36921,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("int_add_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(2365),
+                output: DeclarationId(2367),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33617,
@@ -36943,7 +36943,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("int_mul_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(2366),
+                output: DeclarationId(2368),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33913,
@@ -36965,7 +36965,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("bounded_int_pow_exponent".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(2367),
+                output: DeclarationId(2369),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35162,
@@ -36987,7 +36987,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("int_pow_bounded".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(2368),
+                output: DeclarationId(2370),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35637,
@@ -37009,7 +37009,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("ceil_log".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(2369),
+                output: DeclarationId(2371),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     36900,
@@ -37036,7 +37036,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     DeclarationId(93),
                     DeclarationId(93),
                 ],
-                output: DeclarationId(2370),
+                output: DeclarationId(2372),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     37172,
@@ -37439,12 +37439,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1311),
+                    value: DeclarationId(1313),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2398)),
+            meta_tag: Some(DeclarationId(2400)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -37465,12 +37465,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1311),
+                    value: DeclarationId(1313),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2399)),
+            meta_tag: Some(DeclarationId(2401)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -37495,23 +37495,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "read".to_string(),
-                        ty: DeclarationId(2401),
+                        ty: DeclarationId(2403),
                     },
                     Field {
                         label: "sequential".to_string(),
-                        ty: DeclarationId(2402),
+                        ty: DeclarationId(2404),
                     },
                     Field {
                         label: "branch".to_string(),
-                        ty: DeclarationId(2403),
+                        ty: DeclarationId(2405),
                     },
                     Field {
                         label: "iterate".to_string(),
-                        ty: DeclarationId(2404),
+                        ty: DeclarationId(2406),
                     },
                     Field {
                         label: "validate".to_string(),
-                        ty: DeclarationId(2405),
+                        ty: DeclarationId(2407),
                     },
                 ],
             },
@@ -37546,11 +37546,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DeclarationScope".to_string(),
-                        ty: DeclarationId(2406),
+                        ty: DeclarationId(2408),
                     },
                     Field {
                         label: "NodeScope".to_string(),
-                        ty: DeclarationId(2407),
+                        ty: DeclarationId(2409),
                     },
                 ],
             },
@@ -37570,7 +37570,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Error".to_string(),
-                    ty: DeclarationId(2408),
+                    ty: DeclarationId(2410),
                 }],
             },
             type_params: vec![],
@@ -37590,11 +37590,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "project".to_string(),
-                        ty: DeclarationId(2409),
+                        ty: DeclarationId(2411),
                     },
                     Field {
                         label: "violates".to_string(),
-                        ty: DeclarationId(2410),
+                        ty: DeclarationId(2412),
                     },
                 ],
             },
@@ -37643,11 +37643,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "lens".to_string(),
-                        ty: DeclarationId(2411),
+                        ty: DeclarationId(2413),
                     },
                     Field {
                         label: "enforcement".to_string(),
-                        ty: DeclarationId(2412),
+                        ty: DeclarationId(2414),
                     },
                 ],
             },
@@ -37696,7 +37696,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "enforceable_lens".to_string(),
-                        ty: DeclarationId(2413),
+                        ty: DeclarationId(2415),
                     },
                     Field {
                         label: "section".to_string(),
@@ -37761,7 +37761,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "lens".to_string(),
-                        ty: DeclarationId(2414),
+                        ty: DeclarationId(2416),
                     },
                     Field {
                         label: "section".to_string(),
@@ -37804,11 +37804,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Miss".to_string(),
-                        ty: DeclarationId(2417),
+                        ty: DeclarationId(2419),
                     },
                     Field {
                         label: "Hit".to_string(),
-                        ty: DeclarationId(2418),
+                        ty: DeclarationId(2420),
                     },
                 ],
             },
@@ -37841,7 +37841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("miss_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2415),
+                output: DeclarationId(2417),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4601, 4611)),
             },
             type_params: vec![],
@@ -37859,7 +37859,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("hit_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(2416),
+                output: DeclarationId(2418),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4654, 4666)),
             },
             type_params: vec![],
@@ -37897,7 +37897,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "items".to_string(),
-                    ty: DeclarationId(2419),
+                    ty: DeclarationId(2421),
                 }],
             },
             type_params: vec![],
@@ -37925,7 +37925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "refinement".to_string(),
-                        ty: DeclarationId(2420),
+                        ty: DeclarationId(2422),
                     },
                 ],
             },
@@ -38000,11 +38000,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Positional".to_string(),
-                        ty: DeclarationId(2422),
+                        ty: DeclarationId(2424),
                     },
                     Field {
                         label: "Record".to_string(),
-                        ty: DeclarationId(2424),
+                        ty: DeclarationId(2426),
                     },
                 ],
             },
@@ -38025,19 +38025,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Named".to_string(),
-                        ty: DeclarationId(2425),
+                        ty: DeclarationId(2427),
                     },
                     Field {
                         label: "Parameterized".to_string(),
-                        ty: DeclarationId(2427),
+                        ty: DeclarationId(2429),
                     },
                     Field {
                         label: "Optional".to_string(),
-                        ty: DeclarationId(2428),
+                        ty: DeclarationId(2430),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2430),
+                        ty: DeclarationId(2432),
                     },
                 ],
             },
@@ -38178,15 +38178,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "BareVariant".to_string(),
-                        ty: DeclarationId(2431),
+                        ty: DeclarationId(2433),
                     },
                     Field {
                         label: "VariantWith".to_string(),
-                        ty: DeclarationId(2432),
+                        ty: DeclarationId(2434),
                     },
                     Field {
                         label: "VariantFields".to_string(),
-                        ty: DeclarationId(2434),
+                        ty: DeclarationId(2436),
                     },
                 ],
             },
@@ -38207,15 +38207,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Int".to_string(),
-                        ty: DeclarationId(2435),
+                        ty: DeclarationId(2437),
                     },
                     Field {
                         label: "Bool".to_string(),
-                        ty: DeclarationId(2436),
+                        ty: DeclarationId(2438),
                     },
                     Field {
                         label: "String".to_string(),
-                        ty: DeclarationId(2437),
+                        ty: DeclarationId(2439),
                     },
                 ],
             },
@@ -38236,55 +38236,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(2438),
+                        ty: DeclarationId(2440),
                     },
                     Field {
                         label: "Var".to_string(),
-                        ty: DeclarationId(2439),
+                        ty: DeclarationId(2441),
                     },
                     Field {
                         label: "Path".to_string(),
-                        ty: DeclarationId(2442),
+                        ty: DeclarationId(2444),
                     },
                     Field {
                         label: "Call".to_string(),
-                        ty: DeclarationId(2444),
+                        ty: DeclarationId(2446),
                     },
                     Field {
                         label: "PathCall".to_string(),
-                        ty: DeclarationId(2448),
+                        ty: DeclarationId(2450),
                     },
                     Field {
                         label: "VariantRecord".to_string(),
-                        ty: DeclarationId(2450),
+                        ty: DeclarationId(2452),
                     },
                     Field {
                         label: "Operator".to_string(),
-                        ty: DeclarationId(2452),
+                        ty: DeclarationId(2454),
                     },
                     Field {
                         label: "Lambda".to_string(),
-                        ty: DeclarationId(2454),
+                        ty: DeclarationId(2456),
                     },
                     Field {
                         label: "If".to_string(),
-                        ty: DeclarationId(2455),
+                        ty: DeclarationId(2457),
                     },
                     Field {
                         label: "Match".to_string(),
-                        ty: DeclarationId(2457),
+                        ty: DeclarationId(2459),
                     },
                     Field {
                         label: "Record".to_string(),
-                        ty: DeclarationId(2459),
+                        ty: DeclarationId(2461),
                     },
                     Field {
                         label: "List".to_string(),
-                        ty: DeclarationId(2461),
+                        ty: DeclarationId(2463),
                     },
                     Field {
                         label: "Map".to_string(),
-                        ty: DeclarationId(2463),
+                        ty: DeclarationId(2465),
                     },
                 ],
             },
@@ -38305,43 +38305,43 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Let".to_string(),
-                        ty: DeclarationId(2465),
+                        ty: DeclarationId(2467),
                     },
                     Field {
                         label: "Fn".to_string(),
-                        ty: DeclarationId(2468),
+                        ty: DeclarationId(2470),
                     },
                     Field {
                         label: "FnExternalBody".to_string(),
-                        ty: DeclarationId(2471),
+                        ty: DeclarationId(2473),
                     },
                     Field {
                         label: "Data".to_string(),
-                        ty: DeclarationId(2473),
+                        ty: DeclarationId(2475),
                     },
                     Field {
                         label: "Module".to_string(),
-                        ty: DeclarationId(2475),
+                        ty: DeclarationId(2477),
                     },
                     Field {
                         label: "Import".to_string(),
-                        ty: DeclarationId(2478),
+                        ty: DeclarationId(2480),
                     },
                     Field {
                         label: "TypeAtom".to_string(),
-                        ty: DeclarationId(2480),
+                        ty: DeclarationId(2482),
                     },
                     Field {
                         label: "TypeRecord".to_string(),
-                        ty: DeclarationId(2483),
+                        ty: DeclarationId(2485),
                     },
                     Field {
                         label: "TypeSum".to_string(),
-                        ty: DeclarationId(2487),
+                        ty: DeclarationId(2489),
                     },
                     Field {
                         label: "TypeAlias".to_string(),
-                        ty: DeclarationId(2490),
+                        ty: DeclarationId(2492),
                     },
                 ],
             },
@@ -38383,7 +38383,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[*{left}, *{right}]".to_string(),
                             ))],
@@ -38396,7 +38396,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -38438,7 +38438,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -38451,7 +38451,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -38493,7 +38493,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "(len({recv}) == 0)".to_string(),
                             ))],
@@ -38506,7 +38506,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -38550,7 +38550,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "__v3_fold({recv}, {init}, {body})".to_string(),
                             ))],
@@ -38563,7 +38563,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -38607,7 +38607,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[{body} for {item} in {recv}]".to_string(),
                             ))],
@@ -38620,7 +38620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -38664,7 +38664,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[x for x in {recv} if {arg}(x)]".to_string(),
                             ))],
@@ -38677,7 +38677,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -38721,7 +38721,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "any({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -38734,7 +38734,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -38778,7 +38778,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "all({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -38791,7 +38791,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -38835,7 +38835,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[y for x in {recv} for y in {arg}(x)]".to_string(),
                             ))],
@@ -38848,7 +38848,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -38874,7 +38874,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2491)),
+            meta_tag: Some(DeclarationId(2493)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -38893,7 +38893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -38906,7 +38906,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -38926,7 +38926,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg}.join({recv})".to_string(),
                             ))],
@@ -38939,7 +38939,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -38959,7 +38959,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}.split({arg})".to_string(),
                             ))],
@@ -38972,7 +38972,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -38994,7 +38994,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[-1] if {recv} else None".to_string(),
                             ))],
@@ -39007,7 +39007,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -39029,7 +39029,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[0] if {recv} else None".to_string(),
                             ))],
@@ -39042,7 +39042,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -39064,7 +39064,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "list(enumerate({recv}))".to_string(),
                             ))],
@@ -39077,7 +39077,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -39099,7 +39099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[ord(c) for c in {recv}]".to_string(),
                             ))],
@@ -39112,7 +39112,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -39136,7 +39136,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -39149,7 +39149,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -39169,7 +39169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -39182,7 +39182,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -39204,7 +39204,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "sorted({recv}, key={arg})".to_string(),
                             ))],
@@ -39217,7 +39217,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -39237,7 +39237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv} + [{arg}]".to_string(),
                             ))],
@@ -39250,7 +39250,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -39270,7 +39270,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg} in {recv}".to_string(),
                             ))],
@@ -39283,7 +39283,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -39336,7 +39336,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "target".to_string(),
-                    ty: DeclarationId(1311),
+                    ty: DeclarationId(1313),
                 }],
             },
             type_params: vec![],
@@ -39381,23 +39381,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LiteralValue".to_string(),
-                        ty: DeclarationId(2493),
+                        ty: DeclarationId(2495),
                     },
                     Field {
                         label: "RecordValue".to_string(),
-                        ty: DeclarationId(2495),
+                        ty: DeclarationId(2497),
                     },
                     Field {
                         label: "VariantValue".to_string(),
-                        ty: DeclarationId(2496),
+                        ty: DeclarationId(2498),
                     },
                     Field {
                         label: "NodeRef".to_string(),
-                        ty: DeclarationId(2497),
+                        ty: DeclarationId(2499),
                     },
                     Field {
                         label: "CardinalityValue".to_string(),
-                        ty: DeclarationId(2498),
+                        ty: DeclarationId(2500),
                     },
                 ],
             },
@@ -39450,7 +39450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bindings".to_string(),
-                    ty: DeclarationId(2499),
+                    ty: DeclarationId(2501),
                 }],
             },
             type_params: vec![],
@@ -39469,7 +39469,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "frames".to_string(),
-                    ty: DeclarationId(2500),
+                    ty: DeclarationId(2502),
                 }],
             },
             type_params: vec![],
@@ -39507,7 +39507,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "ApplicativeOrder".to_string(),
-                    ty: DeclarationId(2501),
+                    ty: DeclarationId(2503),
                 }],
             },
             type_params: vec![],
@@ -39527,11 +39527,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LeftFirst".to_string(),
-                        ty: DeclarationId(2502),
+                        ty: DeclarationId(2504),
                     },
                     Field {
                         label: "RightFirst".to_string(),
-                        ty: DeclarationId(2503),
+                        ty: DeclarationId(2505),
                     },
                 ],
             },
@@ -39582,7 +39582,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1184),
             name: Some("evaluate".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(721), DeclarationId(2492)],
+                inputs: vec![DeclarationId(828), DeclarationId(721), DeclarationId(2494)],
                 output: DeclarationId(1175),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/runtime.dag", 11265, 11284)),
             },
@@ -39596,11 +39596,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/runtime.dag", 11196, 11284),
         });
-        declarations.push(Declaration { id: DeclarationId(1185), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(263)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2356), payload: vec![FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __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(2354), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3555, 4208) });
-        declarations.push(Declaration { id: DeclarationId(1186), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(249)))])), ("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(2356), 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(2354), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4210, 4705) });
-        declarations.push(Declaration { id: DeclarationId(1187), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(248)))])), ("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(2356), 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(2354), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4707, 5196) });
-        declarations.push(Declaration { id: DeclarationId(1188), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(265)))])), ("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(2356), 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(2354), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5198, 5729) });
-        declarations.push(Declaration { id: DeclarationId(1189), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(1054) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2504)), 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(258)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2355), 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(2354), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(271)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2355), 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(2354), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(295)))])), ("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(2355), 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(2354), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(273)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2355), 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(2354), 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}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2355), 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(2354), 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}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2355), 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(2354), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(252)))])), ("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(2355), 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(2354), payload: vec![] })]), FieldValue::Reference(DeclarationId(1185)), FieldValue::Reference(DeclarationId(1186)), FieldValue::Reference(DeclarationId(1187)), FieldValue::Reference(DeclarationId(1188)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(293)))])), ("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(2355), 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(2354), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(299)))])), ("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(2355), 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(2354), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5732, 8453) });
+        declarations.push(Declaration { id: DeclarationId(1185), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(263)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2358), payload: vec![FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __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(2356), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3555, 4208) });
+        declarations.push(Declaration { id: DeclarationId(1186), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(249)))])), ("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(2358), 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(2356), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4210, 4705) });
+        declarations.push(Declaration { id: DeclarationId(1187), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(248)))])), ("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(2358), 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(2356), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4707, 5196) });
+        declarations.push(Declaration { id: DeclarationId(1188), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(265)))])), ("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(2358), 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(2356), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5198, 5729) });
+        declarations.push(Declaration { id: DeclarationId(1189), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(1054) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2506)), 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(258)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2357), 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(2356), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(271)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2357), 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(2356), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(295)))])), ("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(2357), 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(2356), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(273)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2357), 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(2356), 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}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2357), 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(2356), 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}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2357), 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(2356), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(252)))])), ("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(2357), 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(2356), payload: vec![] })]), FieldValue::Reference(DeclarationId(1185)), FieldValue::Reference(DeclarationId(1186)), FieldValue::Reference(DeclarationId(1187)), FieldValue::Reference(DeclarationId(1188)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(293)))])), ("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(2357), 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(2356), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(299)))])), ("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(2357), 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(2356), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5732, 8453) });
         declarations.push(Declaration {
             id: DeclarationId(1190),
             name: Some("InputField".to_string()),
@@ -39646,7 +39646,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "decl".to_string(),
-                    ty: DeclarationId(1311),
+                    ty: DeclarationId(1313),
                 }],
             },
             type_params: vec![],
@@ -39670,7 +39670,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(2505),
+                        ty: DeclarationId(2507),
                     },
                     Field {
                         label: "endpoint".to_string(),
@@ -39692,12 +39692,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1194),
             name: Some("modeled_gunbc_ci_workflow".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1740),
+                template: DeclarationId(1742),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1740)),
+            meta_tag: Some(DeclarationId(1742)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -39714,7 +39714,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("ci_demo_timing_read".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2506),
+                output: DeclarationId(2508),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(597))),
             },
             type_params: vec![],
@@ -39732,7 +39732,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("ci_wad_modeled_workflow_timing_witness".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2507),
+                output: DeclarationId(2509),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(599))),
             },
             type_params: vec![],
@@ -39750,7 +39750,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_seed_list_declaration_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2508),
+                output: DeclarationId(2510),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(601))),
             },
             type_params: vec![],
@@ -39768,7 +39768,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_seed_list_behavior_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2509),
+                output: DeclarationId(2511),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(603))),
             },
             type_params: vec![],
@@ -39786,7 +39786,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_seed_list_dagport_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2510),
+                output: DeclarationId(2512),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(605))),
             },
             type_params: vec![],
@@ -39804,7 +39804,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_seed_list_cluster_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2511),
+                output: DeclarationId(2513),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(607))),
             },
             type_params: vec![],
@@ -39822,7 +39822,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_empty_list_diagnostic".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2512),
+                output: DeclarationId(2514),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(609))),
             },
             type_params: vec![],
@@ -39840,7 +39840,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_empty_list_witness_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2514),
+                output: DeclarationId(2516),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(611))),
             },
             type_params: vec![],
@@ -39858,7 +39858,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_witnesses_singleton_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1237)],
-                output: DeclarationId(2516),
+                output: DeclarationId(2518),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(615))),
             },
             type_params: vec![],
@@ -39876,7 +39876,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_violations_singleton".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(982)],
-                output: DeclarationId(2517),
+                output: DeclarationId(2519),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(618))),
             },
             type_params: vec![],
@@ -39894,7 +39894,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_dimension_ok_tm_payload".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1237)],
-                output: DeclarationId(2518),
+                output: DeclarationId(2520),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(622))),
             },
             type_params: vec![],
@@ -39912,7 +39912,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_dimension_fail_tm_payload".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1237), DeclarationId(982)],
-                output: DeclarationId(2519),
+                output: DeclarationId(2521),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(627))),
             },
             type_params: vec![],
@@ -39930,7 +39930,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("report_dim_ok_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(1237)],
-                output: DeclarationId(2520),
+                output: DeclarationId(2522),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(634))),
             },
             type_params: vec![],
@@ -39948,7 +39948,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("report_dim_fail_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(1237), DeclarationId(982)],
-                output: DeclarationId(2521),
+                output: DeclarationId(2523),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(641))),
             },
             type_params: vec![],
@@ -39966,7 +39966,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("report_inhabits_branch_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(1237), DeclarationId(986)],
-                output: DeclarationId(2522),
+                output: DeclarationId(2524),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(646))),
             },
             type_params: vec![],
@@ -39983,8 +39983,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1210),
             name: Some("dimension_report_tm_from_witness".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(2523)],
-                output: DeclarationId(2524),
+                inputs: vec![DeclarationId(828), DeclarationId(2525)],
+                output: DeclarationId(2526),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(656))),
             },
             type_params: vec![],
@@ -40002,7 +40002,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("demo_ci_modeled_timing_dimension_report".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2525),
+                output: DeclarationId(2527),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(664))),
             },
             type_params: vec![],
@@ -40022,15 +40022,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Strict".to_string(),
-                        ty: DeclarationId(2555),
+                        ty: DeclarationId(2557),
                     },
                     Field {
                         label: "NonIncreasing".to_string(),
-                        ty: DeclarationId(2556),
+                        ty: DeclarationId(2558),
                     },
                     Field {
                         label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2557),
+                        ty: DeclarationId(2559),
                     },
                 ],
             },
@@ -40132,8 +40132,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1217),
             name: Some("optional_evidence_meet".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2547), DeclarationId(2548)],
-                output: DeclarationId(2549),
+                inputs: vec![DeclarationId(2549), DeclarationId(2550)],
+                output: DeclarationId(2551),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2488,
@@ -40154,8 +40154,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1218),
             name: Some("map_evidence_merge_at".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2550), DeclarationId(230), DeclarationId(1212)],
-                output: DeclarationId(2551),
+                inputs: vec![DeclarationId(2552), DeclarationId(230), DeclarationId(1212)],
+                output: DeclarationId(2553),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2833,
@@ -40179,23 +40179,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "TreeSize".to_string(),
-                        ty: DeclarationId(2558),
+                        ty: DeclarationId(2560),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(2559),
+                        ty: DeclarationId(2561),
                     },
                     Field {
                         label: "ArithmeticValue".to_string(),
-                        ty: DeclarationId(2560),
+                        ty: DeclarationId(2562),
                     },
                     Field {
                         label: "TokenPosition".to_string(),
-                        ty: DeclarationId(2561),
+                        ty: DeclarationId(2563),
                     },
                     Field {
                         label: "SetCardinality".to_string(),
-                        ty: DeclarationId(2562),
+                        ty: DeclarationId(2564),
                     },
                 ],
             },
@@ -40216,11 +40216,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "OneStep".to_string(),
-                        ty: DeclarationId(2563),
+                        ty: DeclarationId(2565),
                     },
                     Field {
                         label: "AdditionalStep".to_string(),
-                        ty: DeclarationId(2564),
+                        ty: DeclarationId(2566),
                     },
                 ],
             },
@@ -40263,11 +40263,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DivideByTwo".to_string(),
-                        ty: DeclarationId(2565),
+                        ty: DeclarationId(2567),
                     },
                     Field {
                         label: "StrictlyLarger".to_string(),
-                        ty: DeclarationId(2566),
+                        ty: DeclarationId(2568),
                     },
                 ],
             },
@@ -40330,7 +40330,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("positive_descent_amount_from_positive_int".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(2552),
+                output: DeclarationId(2554),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     6420,
@@ -40352,7 +40352,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(93)],
-                output: DeclarationId(2553),
+                output: DeclarationId(2555),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     6860,
@@ -40376,31 +40376,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ChildAccessor".to_string(),
-                        ty: DeclarationId(2567),
+                        ty: DeclarationId(2569),
                     },
                     Field {
                         label: "ListShrink".to_string(),
-                        ty: DeclarationId(2568),
+                        ty: DeclarationId(2570),
                     },
                     Field {
                         label: "ArithmeticSubtractDescent".to_string(),
-                        ty: DeclarationId(2569),
+                        ty: DeclarationId(2571),
                     },
                     Field {
                         label: "ArithmeticDivideDescent".to_string(),
-                        ty: DeclarationId(2570),
+                        ty: DeclarationId(2572),
                     },
                     Field {
                         label: "ParserAdvance".to_string(),
-                        ty: DeclarationId(2571),
+                        ty: DeclarationId(2573),
                     },
                     Field {
                         label: "SetRemoval".to_string(),
-                        ty: DeclarationId(2572),
+                        ty: DeclarationId(2574),
                     },
                     Field {
                         label: "FoldIteration".to_string(),
-                        ty: DeclarationId(2573),
+                        ty: DeclarationId(2575),
                     },
                 ],
             },
@@ -40420,7 +40420,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "dimensions".to_string(),
-                    ty: DeclarationId(2574),
+                    ty: DeclarationId(2576),
                 }],
             },
             type_params: vec![],
@@ -40448,7 +40448,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "evidence".to_string(),
-                        ty: DeclarationId(2575),
+                        ty: DeclarationId(2577),
                     },
                 ],
             },
@@ -40468,7 +40468,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Strict".to_string(),
-                    ty: DeclarationId(2576),
+                    ty: DeclarationId(2578),
                 }],
             },
             type_params: vec![],
@@ -40488,11 +40488,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NonIncreasing".to_string(),
-                        ty: DeclarationId(2577),
+                        ty: DeclarationId(2579),
                     },
                     Field {
                         label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2578),
+                        ty: DeclarationId(2580),
                     },
                 ],
             },
@@ -40513,11 +40513,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "EvidenceUnknown".to_string(),
-                        ty: DeclarationId(2579),
+                        ty: DeclarationId(2581),
                     },
                     Field {
                         label: "EvidenceIncomplete".to_string(),
-                        ty: DeclarationId(2580),
+                        ty: DeclarationId(2582),
                     },
                 ],
             },
@@ -40546,7 +40546,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "per_path".to_string(),
-                        ty: DeclarationId(2581),
+                        ty: DeclarationId(2583),
                     },
                 ],
             },
@@ -40565,7 +40565,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("descent_execution_proof".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(724), DeclarationId(722)],
-                output: DeclarationId(2554),
+                output: DeclarationId(2556),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     12400,
@@ -40626,19 +40626,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Observed".to_string(),
-                        ty: DeclarationId(2584),
+                        ty: DeclarationId(2586),
                     },
                     Field {
                         label: "Unobserved".to_string(),
-                        ty: DeclarationId(2585),
+                        ty: DeclarationId(2587),
                     },
                     Field {
                         label: "Ambiguous".to_string(),
-                        ty: DeclarationId(2586),
+                        ty: DeclarationId(2588),
                     },
                     Field {
                         label: "Stale".to_string(),
-                        ty: DeclarationId(2587),
+                        ty: DeclarationId(2589),
                     },
                 ],
             },
@@ -40703,7 +40703,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "observations".to_string(),
-                    ty: DeclarationId(2588),
+                    ty: DeclarationId(2590),
                 }],
             },
             type_params: vec![],
@@ -40893,7 +40893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("timing_lens_empty_corrections".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2582),
+                output: DeclarationId(2584),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(714))),
             },
             type_params: vec![],
@@ -41001,7 +41001,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("timing_lens_read".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2583),
+                output: DeclarationId(2585),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(793))),
             },
             type_params: vec![],
@@ -41039,183 +41039,183 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2600),
+                        ty: DeclarationId(2602),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2601),
+                        ty: DeclarationId(2603),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2602),
+                        ty: DeclarationId(2604),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2603),
+                        ty: DeclarationId(2605),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2604),
+                        ty: DeclarationId(2606),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2605),
+                        ty: DeclarationId(2607),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2606),
+                        ty: DeclarationId(2608),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2607),
+                        ty: DeclarationId(2609),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2608),
+                        ty: DeclarationId(2610),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2609),
+                        ty: DeclarationId(2611),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2610),
+                        ty: DeclarationId(2612),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2611),
+                        ty: DeclarationId(2613),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2612),
+                        ty: DeclarationId(2614),
                     },
                     Field {
                         label: "Ident".to_string(),
-                        ty: DeclarationId(2613),
+                        ty: DeclarationId(2615),
                     },
                     Field {
                         label: "IntLit".to_string(),
-                        ty: DeclarationId(2614),
+                        ty: DeclarationId(2616),
                     },
                     Field {
                         label: "StringLit".to_string(),
-                        ty: DeclarationId(2615),
+                        ty: DeclarationId(2617),
                     },
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2616),
+                        ty: DeclarationId(2618),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2617),
+                        ty: DeclarationId(2619),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2618),
+                        ty: DeclarationId(2620),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2619),
+                        ty: DeclarationId(2621),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2620),
+                        ty: DeclarationId(2622),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2621),
+                        ty: DeclarationId(2623),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2622),
+                        ty: DeclarationId(2624),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2623),
+                        ty: DeclarationId(2625),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2624),
+                        ty: DeclarationId(2626),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2625),
+                        ty: DeclarationId(2627),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2626),
+                        ty: DeclarationId(2628),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2627),
+                        ty: DeclarationId(2629),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2628),
+                        ty: DeclarationId(2630),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2629),
+                        ty: DeclarationId(2631),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2630),
+                        ty: DeclarationId(2632),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2631),
+                        ty: DeclarationId(2633),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2632),
+                        ty: DeclarationId(2634),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2633),
+                        ty: DeclarationId(2635),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2634),
+                        ty: DeclarationId(2636),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2635),
+                        ty: DeclarationId(2637),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2636),
+                        ty: DeclarationId(2638),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2637),
+                        ty: DeclarationId(2639),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2638),
+                        ty: DeclarationId(2640),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2639),
+                        ty: DeclarationId(2641),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2640),
+                        ty: DeclarationId(2642),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2641),
+                        ty: DeclarationId(2643),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2642),
+                        ty: DeclarationId(2644),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2643),
+                        ty: DeclarationId(2645),
                     },
                     Field {
                         label: "Eof".to_string(),
-                        ty: DeclarationId(2644),
+                        ty: DeclarationId(2646),
                     },
                 ],
             },
@@ -41261,55 +41261,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2645),
+                        ty: DeclarationId(2647),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2646),
+                        ty: DeclarationId(2648),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2647),
+                        ty: DeclarationId(2649),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2648),
+                        ty: DeclarationId(2650),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2649),
+                        ty: DeclarationId(2651),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2650),
+                        ty: DeclarationId(2652),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2651),
+                        ty: DeclarationId(2653),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2652),
+                        ty: DeclarationId(2654),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2653),
+                        ty: DeclarationId(2655),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2654),
+                        ty: DeclarationId(2656),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2655),
+                        ty: DeclarationId(2657),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2656),
+                        ty: DeclarationId(2658),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2657),
+                        ty: DeclarationId(2659),
                     },
                 ],
             },
@@ -41330,115 +41330,115 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2658),
+                        ty: DeclarationId(2660),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2659),
+                        ty: DeclarationId(2661),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2660),
+                        ty: DeclarationId(2662),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2661),
+                        ty: DeclarationId(2663),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2662),
+                        ty: DeclarationId(2664),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2663),
+                        ty: DeclarationId(2665),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2664),
+                        ty: DeclarationId(2666),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2665),
+                        ty: DeclarationId(2667),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2666),
+                        ty: DeclarationId(2668),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2667),
+                        ty: DeclarationId(2669),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2668),
+                        ty: DeclarationId(2670),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2669),
+                        ty: DeclarationId(2671),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2670),
+                        ty: DeclarationId(2672),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2671),
+                        ty: DeclarationId(2673),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2672),
+                        ty: DeclarationId(2674),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2673),
+                        ty: DeclarationId(2675),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2674),
+                        ty: DeclarationId(2676),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2675),
+                        ty: DeclarationId(2677),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2676),
+                        ty: DeclarationId(2678),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2677),
+                        ty: DeclarationId(2679),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2678),
+                        ty: DeclarationId(2680),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2679),
+                        ty: DeclarationId(2681),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2680),
+                        ty: DeclarationId(2682),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2681),
+                        ty: DeclarationId(2683),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2682),
+                        ty: DeclarationId(2684),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2683),
+                        ty: DeclarationId(2685),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2684),
+                        ty: DeclarationId(2686),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2685),
+                        ty: DeclarationId(2687),
                     },
                 ],
             },
@@ -41617,7 +41617,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         });
         declarations.push(Declaration {
             id: DeclarationId(1270),
-            name: Some("CompilerStdPositiveSetRatchet".to_string()),
+            name: Some("BinShimFilesSubsetPredicate".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -41627,11 +41627,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2140, 2177),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2168, 2203),
         });
         declarations.push(Declaration {
             id: DeclarationId(1271),
-            name: Some("compiler_std_positive_set_ratchet".to_string()),
+            name: Some("bin_shim_files_subset_predicate".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1270),
                 arguments: vec![],
@@ -41644,52 +41644,83 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: Some(ValueBody::Structural { fields: vec![] }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2179, 2253),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2205, 2275),
         });
         declarations.push(Declaration {
             id: DeclarationId(1272),
+            name: Some("CompilerStdPositiveSetRatchet".to_string()),
+            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", 2354, 2391),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1273),
+            name: Some("compiler_std_positive_set_ratchet".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1272),
+                arguments: vec![],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: Some(DeclarationId(1272)),
+            specialization_parent: None,
+            inhabits: None,
+            value_body: Some(ValueBody::Structural { fields: vec![] }),
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/verification.dag", 2393, 2467),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1274),
             name: Some("DiagnosticKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-                        ty: DeclarationId(2689),
+                        ty: DeclarationId(2691),
                     },
                     Field {
                         label: "ParseError".to_string(),
-                        ty: DeclarationId(2690),
+                        ty: DeclarationId(2692),
                     },
                     Field {
                         label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(2691),
+                        ty: DeclarationId(2693),
                     },
                     Field {
                         label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(2692),
+                        ty: DeclarationId(2694),
                     },
                     Field {
                         label: "ResolveError".to_string(),
-                        ty: DeclarationId(2693),
+                        ty: DeclarationId(2695),
                     },
                     Field {
                         label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(2694),
+                        ty: DeclarationId(2696),
                     },
                     Field {
                         label: "BranchConditionNotBool".to_string(),
-                        ty: DeclarationId(2695),
+                        ty: DeclarationId(2697),
                     },
                     Field {
                         label: "MagnitudeOutOfRange".to_string(),
-                        ty: DeclarationId(2696),
+                        ty: DeclarationId(2698),
                     },
                     Field {
                         label: "MalformedIntegerRangeFact".to_string(),
-                        ty: DeclarationId(2697),
+                        ty: DeclarationId(2699),
                     },
                     Field {
                         label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(2698),
+                        ty: DeclarationId(2700),
                     },
                 ],
             },
@@ -41701,20 +41732,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2588, 2819),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2802, 3033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1273),
+            id: DeclarationId(1275),
             name: Some("DiagnosticDetailExpectation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "AnyDetail".to_string(),
-                        ty: DeclarationId(2699),
+                        ty: DeclarationId(2701),
                     },
                     Field {
                         label: "Contains".to_string(),
-                        ty: DeclarationId(2700),
+                        ty: DeclarationId(2702),
                     },
                 ],
             },
@@ -41726,20 +41757,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 3188, 3255),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3402, 3469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1274),
+            id: DeclarationId(1276),
             name: Some("DiagnosticReference".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(1272),
+                        ty: DeclarationId(1274),
                     },
                     Field {
                         label: "detail_contains".to_string(),
-                        ty: DeclarationId(1273),
+                        ty: DeclarationId(1275),
                     },
                 ],
             },
@@ -41751,20 +41782,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 3399, 3497),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3613, 3711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1275),
+            id: DeclarationId(1277),
             name: Some("PortStateExpectation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(2701),
+                        ty: DeclarationId(2703),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(2702),
+                        ty: DeclarationId(2704),
                     },
                 ],
             },
@@ -41776,15 +41807,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 3884, 3937),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4098, 4151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1276),
+            id: DeclarationId(1278),
             name: Some("PerfBudgetComparisonOp".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "AtMostBudget".to_string(),
-                    ty: DeclarationId(2703),
+                    ty: DeclarationId(2705),
                 }],
             },
             type_params: vec![],
@@ -41795,24 +41826,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4130, 4174),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4344, 4388),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1277),
+            id: DeclarationId(1279),
             name: Some("AlgebraicLawKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Associativity".to_string(),
-                        ty: DeclarationId(2704),
+                        ty: DeclarationId(2706),
                     },
                     Field {
                         label: "Commutativity".to_string(),
-                        ty: DeclarationId(2705),
+                        ty: DeclarationId(2707),
                     },
                     Field {
                         label: "Identity".to_string(),
-                        ty: DeclarationId(2706),
+                        ty: DeclarationId(2708),
                     },
                 ],
             },
@@ -41824,15 +41855,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4963, 5033),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5177, 5247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1278),
+            id: DeclarationId(1280),
             name: Some("ProgramGenerator".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "generator".to_string(),
-                    ty: DeclarationId(1311),
+                    ty: DeclarationId(1313),
                 }],
             },
             type_params: vec![],
@@ -41843,15 +41874,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 5270, 5323),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5484, 5537),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1279),
+            id: DeclarationId(1281),
             name: Some("ProgramShape".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "LiteralProgram".to_string(),
-                    ty: DeclarationId(2707),
+                    ty: DeclarationId(2709),
                 }],
             },
             type_params: vec![],
@@ -41862,15 +41893,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 5556, 5645),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5770, 5859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1280),
+            id: DeclarationId(1282),
             name: Some("SymbolicCostBindParamExpected".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "LinearCostForBindParam".to_string(),
-                    ty: DeclarationId(2708),
+                    ty: DeclarationId(2710),
                 }],
             },
             type_params: vec![],
@@ -41881,15 +41912,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 5647, 5739),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5861, 5953),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1281),
+            id: DeclarationId(1283),
             name: Some("BindParamSizeVariable".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "SelectedBindParamSizeVariable".to_string(),
-                    ty: DeclarationId(2709),
+                    ty: DeclarationId(2711),
                 }],
             },
             type_params: vec![],
@@ -41900,10 +41931,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 5741, 5801),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5955, 6015),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1282),
+            id: DeclarationId(1284),
             name: Some("BindParamRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -41919,20 +41950,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 5803, 5837),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6017, 6051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1283),
+            id: DeclarationId(1285),
             name: Some("LensCapabilityStructuralStatus".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "LensCapabilityStructuralTerminal".to_string(),
-                        ty: DeclarationId(2710),
+                        ty: DeclarationId(2712),
                     },
                     Field {
                         label: "LensCapabilityStructuralPartial".to_string(),
-                        ty: DeclarationId(2711),
+                        ty: DeclarationId(2713),
                     },
                 ],
             },
@@ -41944,28 +41975,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 6363, 6471),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6577, 6685),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1284),
+            id: DeclarationId(1286),
             name: Some("LensCapabilityBehavioralStatus".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "LensCapabilityBehavioralComplete".to_string(),
-                        ty: DeclarationId(2712),
+                        ty: DeclarationId(2714),
                     },
                     Field {
                         label: "LensCapabilityBehavioralPartial".to_string(),
-                        ty: DeclarationId(2713),
+                        ty: DeclarationId(2715),
                     },
                     Field {
                         label: "LensCapabilityBehavioralStub".to_string(),
-                        ty: DeclarationId(2714),
+                        ty: DeclarationId(2716),
                     },
                     Field {
                         label: "LensCapabilityBehavioralNA".to_string(),
-                        ty: DeclarationId(2715),
+                        ty: DeclarationId(2717),
                     },
                 ],
             },
@@ -41977,24 +42008,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 6473, 6645),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6687, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1285),
+            id: DeclarationId(1287),
             name: Some("LensCapabilityV2Counterpart".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "LensCapabilityV2RealV2".to_string(),
-                        ty: DeclarationId(2716),
+                        ty: DeclarationId(2718),
                     },
                     Field {
                         label: "LensCapabilityV2NoneV3Native".to_string(),
-                        ty: DeclarationId(2717),
+                        ty: DeclarationId(2719),
                     },
                     Field {
                         label: "LensCapabilityV2NotApplicable".to_string(),
-                        ty: DeclarationId(2718),
+                        ty: DeclarationId(2720),
                     },
                 ],
             },
@@ -42006,10 +42037,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 6647, 6773),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6861, 6987),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1286),
+            id: DeclarationId(1288),
             name: Some("LensCapabilityRegisterRow".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -42019,15 +42050,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "structural".to_string(),
-                        ty: DeclarationId(1283),
+                        ty: DeclarationId(1285),
                     },
                     Field {
                         label: "behavioral".to_string(),
-                        ty: DeclarationId(1284),
+                        ty: DeclarationId(1286),
                     },
                     Field {
                         label: "v2_counterpart".to_string(),
-                        ty: DeclarationId(1285),
+                        ty: DeclarationId(1287),
                     },
                 ],
             },
@@ -42039,21 +42070,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 6775, 6969),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6989, 7183),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1287),
+            id: DeclarationId(1289),
             name: Some("lens_capability_register_rows".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1286),
+                    value: DeclarationId(1288),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2758)),
+            meta_tag: Some(DeclarationId(2760)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -42065,21 +42096,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2710),
+                            constructor: DeclarationId(2712),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2712),
+                            constructor: DeclarationId(2714),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2716),
+                            constructor: DeclarationId(2718),
                             payload: vec![],
                         },
                     ),
@@ -42092,21 +42123,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2710),
+                            constructor: DeclarationId(2712),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2712),
+                            constructor: DeclarationId(2714),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2716),
+                            constructor: DeclarationId(2718),
                             payload: vec![],
                         },
                     ),
@@ -42121,21 +42152,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2710),
+                            constructor: DeclarationId(2712),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2715),
+                            constructor: DeclarationId(2717),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2717),
+                            constructor: DeclarationId(2719),
                             payload: vec![],
                         },
                     ),
@@ -42150,21 +42181,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2710),
+                            constructor: DeclarationId(2712),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2713),
+                            constructor: DeclarationId(2715),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2717),
+                            constructor: DeclarationId(2719),
                             payload: vec![],
                         },
                     ),
@@ -42177,21 +42208,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2710),
+                            constructor: DeclarationId(2712),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2712),
+                            constructor: DeclarationId(2714),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2717),
+                            constructor: DeclarationId(2719),
                             payload: vec![],
                         },
                     ),
@@ -42204,21 +42235,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2710),
+                            constructor: DeclarationId(2712),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2713),
+                            constructor: DeclarationId(2715),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2717),
+                            constructor: DeclarationId(2719),
                             payload: vec![],
                         },
                     ),
@@ -42231,21 +42262,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2710),
+                            constructor: DeclarationId(2712),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2712),
+                            constructor: DeclarationId(2714),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2717),
+                            constructor: DeclarationId(2719),
                             payload: vec![],
                         },
                     ),
@@ -42260,21 +42291,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2710),
+                            constructor: DeclarationId(2712),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2712),
+                            constructor: DeclarationId(2714),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2717),
+                            constructor: DeclarationId(2719),
                             payload: vec![],
                         },
                     ),
@@ -42287,21 +42318,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2710),
+                            constructor: DeclarationId(2712),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2712),
+                            constructor: DeclarationId(2714),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2717),
+                            constructor: DeclarationId(2719),
                             payload: vec![],
                         },
                     ),
@@ -42316,21 +42347,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2710),
+                            constructor: DeclarationId(2712),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2712),
+                            constructor: DeclarationId(2714),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2717),
+                            constructor: DeclarationId(2719),
                             payload: vec![],
                         },
                     ),
@@ -42343,21 +42374,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2711),
+                            constructor: DeclarationId(2713),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2715),
+                            constructor: DeclarationId(2717),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2718),
+                            constructor: DeclarationId(2720),
                             payload: vec![],
                         },
                     ),
@@ -42370,21 +42401,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2711),
+                            constructor: DeclarationId(2713),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2715),
+                            constructor: DeclarationId(2717),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2718),
+                            constructor: DeclarationId(2720),
                             payload: vec![],
                         },
                     ),
@@ -42399,21 +42430,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2710),
+                            constructor: DeclarationId(2712),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2715),
+                            constructor: DeclarationId(2717),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2718),
+                            constructor: DeclarationId(2720),
                             payload: vec![],
                         },
                     ),
@@ -42421,116 +42452,116 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ])),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 6971, 9558),
+            span: SourceSpan::new("src/v3/std/verification.dag", 7185, 9772),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1288),
+            id: DeclarationId(1290),
             name: Some("TestPredicate".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Compiles".to_string(),
-                        ty: DeclarationId(2719),
+                        ty: DeclarationId(2721),
                     },
                     Field {
                         label: "FailsWithDiagnostic".to_string(),
-                        ty: DeclarationId(2720),
+                        ty: DeclarationId(2722),
                     },
                     Field {
                         label: "OutputEquals".to_string(),
-                        ty: DeclarationId(2721),
+                        ty: DeclarationId(2723),
                     },
                     Field {
                         label: "PortHasState".to_string(),
-                        ty: DeclarationId(2722),
+                        ty: DeclarationId(2724),
                     },
                     Field {
                         label: "DeclarationHasRefinement".to_string(),
-                        ty: DeclarationId(2723),
+                        ty: DeclarationId(2725),
                     },
                     Field {
                         label: "CostBounded".to_string(),
-                        ty: DeclarationId(2724),
+                        ty: DeclarationId(2726),
                     },
                     Field {
                         label: "BehavioralObservation".to_string(),
-                        ty: DeclarationId(2725),
+                        ty: DeclarationId(2727),
                     },
                     Field {
                         label: "MockBackedInvariant".to_string(),
-                        ty: DeclarationId(2726),
+                        ty: DeclarationId(2728),
                     },
                     Field {
                         label: "ExecuteCommand".to_string(),
-                        ty: DeclarationId(2728),
+                        ty: DeclarationId(2730),
                     },
                     Field {
                         label: "ForAllTargets".to_string(),
-                        ty: DeclarationId(2730),
+                        ty: DeclarationId(2732),
                     },
                     Field {
                         label: "LensOutputEquals".to_string(),
-                        ty: DeclarationId(2731),
+                        ty: DeclarationId(2733),
                     },
                     Field {
                         label: "DifferentialEquals".to_string(),
-                        ty: DeclarationId(2732),
+                        ty: DeclarationId(2734),
                     },
                     Field {
                         label: "SymbolicCostExprEquals".to_string(),
-                        ty: DeclarationId(2733),
+                        ty: DeclarationId(2735),
                     },
                     Field {
                         label: "SymbolicCostExprEqualsForBindParam".to_string(),
-                        ty: DeclarationId(2734),
+                        ty: DeclarationId(2736),
                     },
                     Field {
                         label: "PerfWithinBaseline".to_string(),
-                        ty: DeclarationId(2735),
+                        ty: DeclarationId(2737),
                     },
                     Field {
                         label: "BinaryDimensionReportEquals".to_string(),
-                        ty: DeclarationId(2736),
+                        ty: DeclarationId(2738),
                     },
                     Field {
                         label: "AlgebraicLaw".to_string(),
-                        ty: DeclarationId(2737),
+                        ty: DeclarationId(2739),
                     },
                     Field {
                         label: "CensusBoundCheck".to_string(),
-                        ty: DeclarationId(2738),
+                        ty: DeclarationId(2740),
                     },
                     Field {
                         label: "CensusSubsetCount".to_string(),
-                        ty: DeclarationId(2739),
+                        ty: DeclarationId(2741),
                     },
                     Field {
                         label: "FixedPointConverges".to_string(),
-                        ty: DeclarationId(2740),
+                        ty: DeclarationId(2742),
                     },
                     Field {
                         label: "RatchetZero".to_string(),
-                        ty: DeclarationId(2741),
+                        ty: DeclarationId(2743),
                     },
                     Field {
                         label: "GeneratedFromDag".to_string(),
-                        ty: DeclarationId(2743),
+                        ty: DeclarationId(2745),
                     },
                     Field {
                         label: "CementingDispatchMatchesProjection".to_string(),
-                        ty: DeclarationId(2744),
+                        ty: DeclarationId(2746),
                     },
                     Field {
                         label: "ReleaseDeferredClaim".to_string(),
-                        ty: DeclarationId(2745),
+                        ty: DeclarationId(2747),
                     },
                     Field {
                         label: "SubstrateResearchDeferredClaim".to_string(),
-                        ty: DeclarationId(2746),
+                        ty: DeclarationId(2748),
                     },
                     Field {
                         label: "BridgeLedgerZero".to_string(),
-                        ty: DeclarationId(2747),
+                        ty: DeclarationId(2749),
                     },
                 ],
             },
@@ -42542,10 +42573,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9560, 22453),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9774, 22667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1289),
+            id: DeclarationId(1291),
             name: Some("ProgramInput".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -42556,15 +42587,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 22561, 22581),
+            span: SourceSpan::new("src/v3/std/verification.dag", 22775, 22795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1290),
+            id: DeclarationId(1292),
             name: Some("ProgramOutputBind".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "output_ref".to_string(),
-                    ty: DeclarationId(1311),
+                    ty: DeclarationId(1313),
                 }],
             },
             type_params: vec![],
@@ -42575,10 +42606,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 22724, 22779),
+            span: SourceSpan::new("src/v3/std/verification.dag", 22938, 22993),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1291),
+            id: DeclarationId(1293),
             name: Some("TestClaim".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -42596,11 +42627,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "predicate".to_string(),
-                        ty: DeclarationId(1288),
+                        ty: DeclarationId(1290),
                     },
                     Field {
                         label: "requires".to_string(),
-                        ty: DeclarationId(2748),
+                        ty: DeclarationId(2750),
                     },
                 ],
             },
@@ -42612,20 +42643,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 23389, 23522),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23603, 23736),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1292),
+            id: DeclarationId(1294),
             name: Some("Quantifier".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ForAll".to_string(),
-                        ty: DeclarationId(2749),
+                        ty: DeclarationId(2751),
                     },
                     Field {
                         label: "Exists".to_string(),
-                        ty: DeclarationId(2750),
+                        ty: DeclarationId(2752),
                     },
                 ],
             },
@@ -42637,10 +42668,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 23703, 23740),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23917, 23954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1293),
+            id: DeclarationId(1295),
             name: Some("QuantifiedTestClaim".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -42650,19 +42681,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "generator".to_string(),
-                        ty: DeclarationId(1278),
+                        ty: DeclarationId(1280),
                     },
                     Field {
                         label: "quantifier".to_string(),
-                        ty: DeclarationId(1292),
+                        ty: DeclarationId(1294),
                     },
                     Field {
                         label: "predicate".to_string(),
-                        ty: DeclarationId(1288),
+                        ty: DeclarationId(1290),
                     },
                     Field {
                         label: "requires".to_string(),
-                        ty: DeclarationId(2751),
+                        ty: DeclarationId(2753),
                     },
                 ],
             },
@@ -42674,20 +42705,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 23742, 23903),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23956, 24117),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1294),
+            id: DeclarationId(1296),
             name: Some("TestNodeRef".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "EnumeratedTestNode".to_string(),
-                        ty: DeclarationId(2752),
+                        ty: DeclarationId(2754),
                     },
                     Field {
                         label: "QuantifiedTestNode".to_string(),
-                        ty: DeclarationId(2753),
+                        ty: DeclarationId(2755),
                     },
                 ],
             },
@@ -42699,16 +42730,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 25603, 25697),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25817, 25911),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1295),
+            id: DeclarationId(1297),
             name: Some("TestNodeCostDimension".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "node".to_string(),
-                        ty: DeclarationId(1294),
+                        ty: DeclarationId(1296),
                     },
                     Field {
                         label: "budget".to_string(),
@@ -42728,20 +42759,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 25699, 25802),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25913, 26016),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1296),
+            id: DeclarationId(1298),
             name: Some("SuiteClaim".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Enumerated".to_string(),
-                        ty: DeclarationId(2754),
+                        ty: DeclarationId(2756),
                     },
                     Field {
                         label: "Quantified".to_string(),
-                        ty: DeclarationId(2755),
+                        ty: DeclarationId(2757),
                     },
                 ],
             },
@@ -42753,10 +42784,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26535, 26612),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26749, 26826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1297),
+            id: DeclarationId(1299),
             name: Some("TestSuite".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -42766,7 +42797,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "claims".to_string(),
-                        ty: DeclarationId(2756),
+                        ty: DeclarationId(2758),
                     },
                 ],
             },
@@ -42778,10 +42809,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26614, 26674),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26828, 26888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1298),
+            id: DeclarationId(1300),
             name: Some("TestObligation".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -42791,7 +42822,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "resources".to_string(),
-                        ty: DeclarationId(2757),
+                        ty: DeclarationId(2759),
                     },
                 ],
             },
@@ -42803,18 +42834,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26872, 26953),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27086, 27167),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1299),
+            id: DeclarationId(1301),
             name: Some("claim_obligation_resources".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1291)],
-                output: DeclarationId(2686),
+                inputs: vec![DeclarationId(1293)],
+                output: DeclarationId(2688),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    27395,
-                    27411,
+                    27609,
+                    27625,
                 )),
             },
             type_params: vec![],
@@ -42825,18 +42856,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 27324, 27411),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27538, 27625),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1300),
+            id: DeclarationId(1302),
             name: Some("obligation_for_claim".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1291)],
-                output: DeclarationId(1298),
+                inputs: vec![DeclarationId(1293)],
+                output: DeclarationId(1300),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    27469,
-                    27554,
+                    27683,
+                    27768,
                 )),
             },
             type_params: vec![],
@@ -42847,18 +42878,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 27413, 27554),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27627, 27768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1301),
+            id: DeclarationId(1303),
             name: Some("obligation_for_quantified_claim".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1293)],
-                output: DeclarationId(1298),
+                inputs: vec![DeclarationId(1295)],
+                output: DeclarationId(1300),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    27861,
-                    27927,
+                    28075,
+                    28141,
                 )),
             },
             type_params: vec![],
@@ -42869,14 +42900,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 27784, 27927),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27998, 28141),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1302),
+            id: DeclarationId(1304),
             name: Some("obligation_for_suite_claim".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1296)],
-                output: DeclarationId(1298),
+                inputs: vec![DeclarationId(1298)],
+                output: DeclarationId(1300),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(811))),
             },
             type_params: vec![],
@@ -42887,18 +42918,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 28232, 28421),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28446, 28635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1303),
+            id: DeclarationId(1305),
             name: Some("materialize_test_obligations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2687)],
-                output: DeclarationId(2688),
+                inputs: vec![DeclarationId(2689)],
+                output: DeclarationId(2690),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    28505,
-                    28550,
+                    28719,
+                    28764,
                 )),
             },
             type_params: vec![],
@@ -42909,14 +42940,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 28423, 28550),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28637, 28764),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1304),
+            id: DeclarationId(1306),
             name: Some("behavior_spine".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828)],
-                output: DeclarationId(2759),
+                output: DeclarationId(2761),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(813))),
             },
             type_params: vec![],
@@ -42930,7 +42961,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/workflows.dag", 963, 1018),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1305),
+            id: DeclarationId(1307),
             name: Some("ValueBehavior".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -42944,7 +42975,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2935, 2956),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1306),
+            id: DeclarationId(1308),
             name: Some("Transform".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -42958,7 +42989,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2957, 2974),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1307),
+            id: DeclarationId(1309),
             name: Some("Branch".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -42972,7 +43003,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2975, 2989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1308),
+            id: DeclarationId(1310),
             name: Some("Loop".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -42986,7 +43017,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2990, 3002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1309),
+            id: DeclarationId(1311),
             name: Some("Bind".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -43000,7 +43031,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3003, 3015),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1310),
+            id: DeclarationId(1312),
             name: Some("Main".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -43014,7 +43045,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3016, 3028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1311),
+            id: DeclarationId(1313),
             name: Some("DeclarationRef".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -43028,7 +43059,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3761, 3783),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1312),
+            id: DeclarationId(1314),
             name: Some("go_execution_model".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(957),
@@ -43044,14 +43075,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2241),
+                            constructor: DeclarationId(2243),
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2244),
+                            constructor: DeclarationId(2246),
                             payload: vec![],
                         },
                     ),
@@ -43062,7 +43093,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 2055, 2157),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1313),
+            id: DeclarationId(1315),
             name: Some("go_source_filtering".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(959),
@@ -43092,7 +43123,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 2159, 2309),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1314),
+            id: DeclarationId(1316),
             name: Some("go_execution_requirement".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(961),
@@ -43113,7 +43144,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 2311, 2386),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1315),
+            id: DeclarationId(1317),
             name: Some("go_int".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -43128,7 +43159,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -43154,7 +43185,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 2388, 2518),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1316),
+            id: DeclarationId(1318),
             name: Some("go_int32".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -43169,7 +43200,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -43195,7 +43226,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 2520, 2654),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1317),
+            id: DeclarationId(1319),
             name: Some("go_integer_inhabit_i32_at_program_bound".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1017),
@@ -43210,7 +43241,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -43223,17 +43254,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2322),
+                            constructor: DeclarationId(2324),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1909),
+                                constructor: DeclarationId(1911),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(
                                         "-2147483648".to_string(),
                                     )),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1908),
+                                        constructor: DeclarationId(1910),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1906),
+                                            constructor: DeclarationId(1908),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 "4294967295".to_string(),
                                             ))],
@@ -43245,7 +43276,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1316)),
+                        FieldValue::Reference(DeclarationId(1318)),
                     ),
                 ],
             }),
@@ -43254,7 +43285,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 2656, 2959),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1318),
+            id: DeclarationId(1320),
             name: Some("go_integer_inhabit_int_platform_dependent".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1017),
@@ -43269,7 +43300,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -43282,13 +43313,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2323),
+                            constructor: DeclarationId(2325),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1315)),
+                        FieldValue::Reference(DeclarationId(1317)),
                     ),
                 ],
             }),
@@ -43297,7 +43328,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 3397, 3598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1319),
+            id: DeclarationId(1321),
             name: Some("go_bool".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -43312,7 +43343,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -43338,7 +43369,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 3600, 3731),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1320),
+            id: DeclarationId(1322),
             name: Some("go_string".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -43353,7 +43384,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -43379,7 +43410,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 3733, 3870),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1321),
+            id: DeclarationId(1323),
             name: Some("go_node_id".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -43394,7 +43425,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -43420,7 +43451,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 3872, 4010),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1322),
+            id: DeclarationId(1324),
             name: Some("go_port_id".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -43435,7 +43466,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -43461,7 +43492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 4012, 4150),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1323),
+            id: DeclarationId(1325),
             name: Some("go_declaration_id".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -43476,7 +43507,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -43502,7 +43533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 4152, 4311),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1324),
+            id: DeclarationId(1326),
             name: Some("go_cluster_id".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -43517,7 +43548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -43543,7 +43574,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 4313, 4460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1325),
+            id: DeclarationId(1327),
             name: Some("go_type_shape".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -43558,7 +43589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -43582,7 +43613,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2324),
+                                    constructor: DeclarationId(2326),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "declaration".to_string(),
                                     ))],
@@ -43605,7 +43636,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 4462, 4703),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1326),
+            id: DeclarationId(1328),
             name: Some("go_port_state".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -43620,7 +43651,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -43646,7 +43677,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 4705, 4853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1327),
+            id: DeclarationId(1329),
             name: Some("go_port".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -43661,7 +43692,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -43686,7 +43717,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -43705,7 +43736,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "state".to_string(),
                                         ))],
@@ -43726,7 +43757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "produced_by".to_string(),
                                         ))],
@@ -43750,7 +43781,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 4855, 5238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1328),
+            id: DeclarationId(1330),
             name: Some("go_source_span".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -43765,7 +43796,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -43790,7 +43821,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "file".to_string(),
                                         ))],
@@ -43809,7 +43840,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_start".to_string(),
                                         ))],
@@ -43828,7 +43859,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_end".to_string(),
                                         ))],
@@ -43852,7 +43883,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 5240, 5634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1329),
+            id: DeclarationId(1331),
             name: Some("go_literal_bits".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -43867,7 +43898,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -43893,7 +43924,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 5636, 5790),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1330),
+            id: DeclarationId(1332),
             name: Some("go_atom_payload".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -43908,7 +43939,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -43934,7 +43965,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 5792, 5946),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1331),
+            id: DeclarationId(1333),
             name: Some("go_cardinality_bound".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -43949,7 +43980,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -43975,7 +44006,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 5948, 6117),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1332),
+            id: DeclarationId(1334),
             name: Some("go_interval".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -43990,7 +44021,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -44016,7 +44047,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 6119, 6263),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1333),
+            id: DeclarationId(1335),
             name: Some("go_positive_interval_width".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -44031,7 +44062,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -44059,7 +44090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 6265, 6450),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1334),
+            id: DeclarationId(1336),
             name: Some("go_interval_width".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -44074,7 +44105,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -44100,7 +44131,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 6452, 6612),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1335),
+            id: DeclarationId(1337),
             name: Some("go_conj_field".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -44115,7 +44146,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -44140,7 +44171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -44159,7 +44190,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -44183,7 +44214,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 6614, 6916),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1336),
+            id: DeclarationId(1338),
             name: Some("go_template_argument".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -44198,7 +44229,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -44225,7 +44256,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -44244,7 +44275,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -44268,7 +44299,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 6918, 7255),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1337),
+            id: DeclarationId(1339),
             name: Some("go_phantom_parameter".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -44283,7 +44314,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -44310,7 +44341,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -44329,7 +44360,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "algebra".to_string(),
                                         ))],
@@ -44353,7 +44384,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 7257, 7598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1338),
+            id: DeclarationId(1340),
             name: Some("go_nominal_opacity".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -44368,7 +44399,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -44394,7 +44425,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2324),
+                                    constructor: DeclarationId(2326),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "permitted_accessors".to_string(),
                                     ))],
@@ -44417,7 +44448,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 7600, 7872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1339),
+            id: DeclarationId(1341),
             name: Some("go_field_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -44432,7 +44463,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -44457,7 +44488,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -44476,7 +44507,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -44500,7 +44531,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 7874, 8185),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1340),
+            id: DeclarationId(1342),
             name: Some("go_non_empty_list".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -44515,7 +44546,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -44540,7 +44571,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -44559,7 +44590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -44583,7 +44614,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 8187, 8503),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1341),
+            id: DeclarationId(1343),
             name: Some("go_non_singleton_list".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -44598,7 +44629,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -44623,7 +44654,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -44642,7 +44673,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "second".to_string(),
                                         ))],
@@ -44661,7 +44692,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -44685,7 +44716,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 8505, 8914),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1342),
+            id: DeclarationId(1344),
             name: Some("go_param_ref".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -44700,7 +44731,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -44725,7 +44756,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2325),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "member_of".to_string(),
                                         ))],
@@ -44744,7 +44775,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2325),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "slot_of".to_string(),
                                         ))],
@@ -44768,7 +44799,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 8916, 9232),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1343),
+            id: DeclarationId(1345),
             name: Some("go_transform_ref".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -44783,7 +44814,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -44807,7 +44838,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2325),
+                                    constructor: DeclarationId(2327),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "node_id".to_string(),
                                     ))],
@@ -44830,7 +44861,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 9234, 9475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1344),
+            id: DeclarationId(1346),
             name: Some("go_member_descent".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -44845,7 +44876,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -44869,7 +44900,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2324),
+                                    constructor: DeclarationId(2326),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "param".to_string(),
                                     ))],
@@ -44892,7 +44923,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 9477, 9718),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1345),
+            id: DeclarationId(1347),
             name: Some("go_intra_cluster_call".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -44907,7 +44938,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -44931,7 +44962,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2324),
+                                    constructor: DeclarationId(2326),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "transform".to_string(),
                                     ))],
@@ -44954,7 +44985,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 9720, 9979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1346),
+            id: DeclarationId(1348),
             name: Some("go_cluster".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -44969,7 +45000,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -44994,7 +45025,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "members".to_string(),
                                         ))],
@@ -45015,7 +45046,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "intra_cluster_calls".to_string(),
                                         ))],
@@ -45039,7 +45070,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 9981, 10314),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1347),
+            id: DeclarationId(1349),
             name: Some("go_field_value".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -45054,7 +45085,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -45080,7 +45111,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 10316, 10467),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1348),
+            id: DeclarationId(1350),
             name: Some("go_value_body".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -45095,7 +45126,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -45121,7 +45152,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 10469, 10617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1349),
+            id: DeclarationId(1351),
             name: Some("go_arrow_body".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -45136,7 +45167,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -45162,7 +45193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 10619, 10767),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1350),
+            id: DeclarationId(1352),
             name: Some("go_type_connective".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -45177,7 +45208,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -45203,7 +45234,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 10769, 10932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1351),
+            id: DeclarationId(1353),
             name: Some("go_declaration".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -45218,7 +45249,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -45243,7 +45274,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -45262,7 +45293,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -45283,7 +45314,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "connective".to_string(),
                                         ))],
@@ -45304,7 +45335,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "type_params".to_string(),
                                         ))],
@@ -45325,7 +45356,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "phantom_params".to_string(),
                                         ))],
@@ -45346,7 +45377,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "meta_tag".to_string(),
                                         ))],
@@ -45367,7 +45398,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inhabits".to_string(),
                                         ))],
@@ -45388,7 +45419,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value_body".to_string(),
                                         ))],
@@ -45409,7 +45440,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nominal_opacity".to_string(),
                                         ))],
@@ -45428,7 +45459,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -45452,7 +45483,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 10934, 11951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1352),
+            id: DeclarationId(1354),
             name: Some("go_arithmetic_op".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -45467,7 +45498,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -45493,7 +45524,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 11953, 12110),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1353),
+            id: DeclarationId(1355),
             name: Some("go_comparison_op".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -45508,7 +45539,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -45534,7 +45565,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 12112, 12269),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1354),
+            id: DeclarationId(1356),
             name: Some("go_logical_op".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -45549,7 +45580,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -45575,7 +45606,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 12271, 12419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1355),
+            id: DeclarationId(1357),
             name: Some("go_operator_kind".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -45590,7 +45621,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -45616,7 +45647,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 12421, 12578),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1356),
+            id: DeclarationId(1358),
             name: Some("go_transform_target".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -45631,7 +45662,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -45657,7 +45688,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 12580, 12746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1357),
+            id: DeclarationId(1359),
             name: Some("go_branch_pattern".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -45672,7 +45703,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -45698,7 +45729,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 12748, 12908),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1358),
+            id: DeclarationId(1360),
             name: Some("go_payload_binding".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -45713,7 +45744,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -45740,7 +45771,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding_name".to_string(),
                                         ))],
@@ -45761,7 +45792,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload_port".to_string(),
                                         ))],
@@ -45785,7 +45816,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 12910, 13261),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1359),
+            id: DeclarationId(1361),
             name: Some("go_branch_path".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -45800,7 +45831,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -45825,7 +45856,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -45846,7 +45877,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -45865,7 +45896,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -45884,7 +45915,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -45908,7 +45939,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 13263, 13750),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1360),
+            id: DeclarationId(1362),
             name: Some("go_loop_bound".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -45923,7 +45954,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -45949,7 +45980,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 13752, 13900),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1361),
+            id: DeclarationId(1363),
             name: Some("go_value_node".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -45964,7 +45995,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -45989,7 +46020,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -46008,7 +46039,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -46029,7 +46060,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -46048,7 +46079,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -46072,7 +46103,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 14374, 14848),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1362),
+            id: DeclarationId(1364),
             name: Some("go_transform_node".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -46087,7 +46118,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -46112,7 +46143,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -46131,7 +46162,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "target".to_string(),
                                         ))],
@@ -46150,7 +46181,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inputs".to_string(),
                                         ))],
@@ -46171,7 +46202,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -46190,7 +46221,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -46214,7 +46245,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 14850, 15415),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1363),
+            id: DeclarationId(1365),
             name: Some("go_branch_node".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -46229,7 +46260,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -46254,7 +46285,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -46273,7 +46304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "input".to_string(),
                                         ))],
@@ -46292,7 +46323,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "paths".to_string(),
                                         ))],
@@ -46313,7 +46344,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -46332,7 +46363,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -46353,7 +46384,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -46377,7 +46408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 15417, 16074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1364),
+            id: DeclarationId(1366),
             name: Some("go_loop_node".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -46392,7 +46423,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -46417,7 +46448,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -46436,7 +46467,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "source".to_string(),
                                         ))],
@@ -46455,7 +46486,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "init".to_string(),
                                         ))],
@@ -46474,7 +46505,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -46493,7 +46524,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "bound".to_string(),
                                         ))],
@@ -46514,7 +46545,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -46533,7 +46564,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -46557,7 +46588,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 16076, 16778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1365),
+            id: DeclarationId(1367),
             name: Some("go_bind_node".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -46572,7 +46603,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -46597,7 +46628,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -46616,7 +46647,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -46637,7 +46668,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -46656,7 +46687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "params".to_string(),
                                         ))],
@@ -46675,7 +46706,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -46696,7 +46727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -46720,7 +46751,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 16780, 17431),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1366),
+            id: DeclarationId(1368),
             name: Some("go_behavior".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -46735,7 +46766,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -46761,7 +46792,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 17433, 17577),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1367),
+            id: DeclarationId(1369),
             name: Some("go_dag".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -46776,7 +46807,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -46803,7 +46834,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "declarations".to_string(),
                                         ))],
@@ -46822,7 +46853,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nodes".to_string(),
                                         ))],
@@ -46841,7 +46872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ports".to_string(),
                                         ))],
@@ -46862,7 +46893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "clusters".to_string(),
                                         ))],
@@ -46886,7 +46917,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 17579, 18046),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1368),
+            id: DeclarationId(1370),
             name: Some("go_surface_module".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -46901,7 +46932,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -46925,7 +46956,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2324),
+                                    constructor: DeclarationId(2326),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "items".to_string(),
                                     ))],
@@ -46948,7 +46979,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 18349, 18590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1369),
+            id: DeclarationId(1371),
             name: Some("go_surface_item".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -46963,7 +46994,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -46989,7 +47020,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 18592, 18746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1370),
+            id: DeclarationId(1372),
             name: Some("go_surface_param".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -47004,7 +47035,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -47029,7 +47060,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -47048,7 +47079,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -47069,7 +47100,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "refinement".to_string(),
                                         ))],
@@ -47093,7 +47124,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 18748, 19146),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1371),
+            id: DeclarationId(1373),
             name: Some("go_surface_field".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -47108,7 +47139,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -47133,7 +47164,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -47152,7 +47183,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -47176,7 +47207,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 19148, 19457),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1372),
+            id: DeclarationId(1374),
             name: Some("go_surface_variant".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -47191,7 +47222,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -47216,7 +47247,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -47235,7 +47266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -47254,7 +47285,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -47278,7 +47309,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 19459, 19861),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1373),
+            id: DeclarationId(1375),
             name: Some("go_variant_payload".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -47293,7 +47324,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -47319,7 +47350,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 19863, 20026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1374),
+            id: DeclarationId(1376),
             name: Some("go_surface_type".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -47334,7 +47365,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -47360,7 +47391,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 20028, 20182),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1375),
+            id: DeclarationId(1377),
             name: Some("go_surface_record_field".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -47375,7 +47406,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -47400,7 +47431,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -47419,7 +47450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -47438,7 +47469,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -47462,7 +47493,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 20184, 20595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1376),
+            id: DeclarationId(1378),
             name: Some("go_surface_map_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -47477,7 +47508,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -47502,7 +47533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key".to_string(),
                                         ))],
@@ -47523,7 +47554,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key_span".to_string(),
                                         ))],
@@ -47542,7 +47573,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -47561,7 +47592,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -47585,7 +47616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 20597, 21082),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1377),
+            id: DeclarationId(1379),
             name: Some("go_surface_match_arm".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -47600,7 +47631,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -47625,7 +47656,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -47644,7 +47675,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -47663,7 +47694,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -47687,7 +47718,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 21084, 21490),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1378),
+            id: DeclarationId(1380),
             name: Some("go_surface_pattern_field".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -47702,7 +47733,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -47727,7 +47758,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -47746,7 +47777,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -47765,7 +47796,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -47789,7 +47820,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 21492, 21910),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1379),
+            id: DeclarationId(1381),
             name: Some("go_surface_pattern".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -47804,7 +47835,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -47830,7 +47861,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 21912, 22075),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1380),
+            id: DeclarationId(1382),
             name: Some("go_surface_literal".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -47845,7 +47876,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -47871,7 +47902,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22077, 22240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1381),
+            id: DeclarationId(1383),
             name: Some("go_surface_expr".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -47886,7 +47917,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -47912,7 +47943,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22242, 22396),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1382),
+            id: DeclarationId(1384),
             name: Some("go_int_add".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -47927,7 +47958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -47949,7 +47980,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22398, 22539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1383),
+            id: DeclarationId(1385),
             name: Some("go_int_sub".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -47964,7 +47995,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -47986,7 +48017,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22541, 22682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1384),
+            id: DeclarationId(1386),
             name: Some("go_int_mul".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -48001,7 +48032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -48023,7 +48054,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22684, 22825),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1385),
+            id: DeclarationId(1387),
             name: Some("go_int_div".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -48038,7 +48069,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -48062,7 +48093,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22827, 22975),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1386),
+            id: DeclarationId(1388),
             name: Some("go_int_eq".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -48077,7 +48108,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -48099,7 +48130,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22977, 23117),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1387),
+            id: DeclarationId(1389),
             name: Some("go_node_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -48114,7 +48145,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -48136,7 +48167,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 23119, 23266),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1388),
+            id: DeclarationId(1390),
             name: Some("go_port_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -48151,7 +48182,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -48173,7 +48204,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 23268, 23415),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1389),
+            id: DeclarationId(1391),
             name: Some("go_declaration_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -48188,7 +48219,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -48210,7 +48241,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 23417, 23578),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1390),
+            id: DeclarationId(1392),
             name: Some("go_int_ne".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -48225,7 +48256,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -48247,7 +48278,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 23580, 23720),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1391),
+            id: DeclarationId(1393),
             name: Some("go_node_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -48262,7 +48293,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -48284,7 +48315,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 23722, 23869),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1392),
+            id: DeclarationId(1394),
             name: Some("go_port_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -48299,7 +48330,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -48321,7 +48352,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 23871, 24018),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1393),
+            id: DeclarationId(1395),
             name: Some("go_declaration_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -48336,7 +48367,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -48358,7 +48389,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24020, 24181),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1394),
+            id: DeclarationId(1396),
             name: Some("go_int_lt".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -48373,7 +48404,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -48395,7 +48426,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24183, 24322),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1395),
+            id: DeclarationId(1397),
             name: Some("go_int_le".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -48410,7 +48441,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -48432,7 +48463,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24324, 24464),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1396),
+            id: DeclarationId(1398),
             name: Some("go_int_gt".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -48447,7 +48478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -48469,7 +48500,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24466, 24605),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1397),
+            id: DeclarationId(1399),
             name: Some("go_int_ge".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -48484,7 +48515,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -48506,7 +48537,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24607, 24747),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1398),
+            id: DeclarationId(1400),
             name: Some("go_bool_meet".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -48521,7 +48552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -48543,7 +48574,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24749, 24898),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1399),
+            id: DeclarationId(1401),
             name: Some("go_bool_join".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -48558,7 +48589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -48580,7 +48611,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24900, 25049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1400),
+            id: DeclarationId(1402),
             name: Some("go_let_stmt".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1022),
@@ -48595,11 +48626,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1309)),
+                        FieldValue::Reference(DeclarationId(1311)),
                     ),
                     (
                         "carrier".to_string(),
@@ -48618,7 +48649,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 25051, 25184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1401),
+            id: DeclarationId(1403),
             name: Some("go_if_expr".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1022),
@@ -48633,11 +48664,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1307)),
+                        FieldValue::Reference(DeclarationId(1309)),
                     ),
                     (
                         "carrier".to_string(),
@@ -48656,7 +48687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 25186, 25329),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1402),
+            id: DeclarationId(1404),
             name: Some("go_main_wrap".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1022),
@@ -48671,11 +48702,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1310)),
+                        FieldValue::Reference(DeclarationId(1312)),
                     ),
                     (
                         "carrier".to_string(),
@@ -48694,7 +48725,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 25331, 25484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1403),
+            id: DeclarationId(1405),
             name: Some("go_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -48709,7 +48740,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -48718,7 +48749,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2337),
+                            constructor: DeclarationId(2339),
                             payload: vec![],
                         },
                     ),
@@ -48734,7 +48765,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 25486, 25624),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1404),
+            id: DeclarationId(1406),
             name: Some("go_singleton_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -48749,7 +48780,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -48758,7 +48789,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2338),
+                            constructor: DeclarationId(2340),
                             payload: vec![],
                         },
                     ),
@@ -48772,7 +48803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2328),
+                                    constructor: DeclarationId(2330),
                                     payload: vec![],
                                 },
                             ),
@@ -48789,7 +48820,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 25626, 25818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1405),
+            id: DeclarationId(1407),
             name: Some("go_cons_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -48804,7 +48835,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -48813,7 +48844,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2339),
+                            constructor: DeclarationId(2341),
                             payload: vec![],
                         },
                     ),
@@ -48828,7 +48859,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![],
                                     },
                                 ),
@@ -48841,7 +48872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![],
                                     },
                                 ),
@@ -48859,7 +48890,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 25820, 26037),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1406),
+            id: DeclarationId(1408),
             name: Some("go_concat_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -48874,7 +48905,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -48883,7 +48914,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2340),
+                            constructor: DeclarationId(2342),
                             payload: vec![],
                         },
                     ),
@@ -48898,7 +48929,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![],
                                     },
                                 ),
@@ -48911,7 +48942,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![],
                                     },
                                 ),
@@ -48929,7 +48960,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 26039, 26262),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1407),
+            id: DeclarationId(1409),
             name: Some("go_length_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -48944,7 +48975,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -48953,7 +48984,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2341),
+                            constructor: DeclarationId(2343),
                             payload: vec![],
                         },
                     ),
@@ -48967,7 +48998,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2327),
+                                    constructor: DeclarationId(2329),
                                     payload: vec![],
                                 },
                             ),
@@ -48984,7 +49015,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 26264, 26447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1408),
+            id: DeclarationId(1410),
             name: Some("go_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1031),
@@ -48999,7 +49030,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -49020,7 +49051,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 26449, 26585),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1409),
+            id: DeclarationId(1411),
             name: Some("go_result_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1031),
@@ -49035,7 +49066,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -49058,7 +49089,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 27271, 27424),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1410),
+            id: DeclarationId(1412),
             name: Some("go_map_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1031),
@@ -49073,7 +49104,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -49094,7 +49125,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 27426, 27566),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1411),
+            id: DeclarationId(1413),
             name: Some("go_is_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -49109,7 +49140,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -49118,7 +49149,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2342),
+                            constructor: DeclarationId(2344),
                             payload: vec![],
                         },
                     ),
@@ -49132,7 +49163,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2327),
+                                    constructor: DeclarationId(2329),
                                     payload: vec![],
                                 },
                             ),
@@ -49149,7 +49180,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 27568, 27756),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1412),
+            id: DeclarationId(1414),
             name: Some("go_fold_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -49164,7 +49195,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -49173,7 +49204,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2343),
+                            constructor: DeclarationId(2345),
                             payload: vec![],
                         },
                     ),
@@ -49188,7 +49219,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![],
                                     },
                                 ),
@@ -49201,7 +49232,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![],
                                     },
                                 ),
@@ -49214,7 +49245,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![],
                                     },
                                 ),
@@ -49232,7 +49263,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 27758, 28015),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1413),
+            id: DeclarationId(1415),
             name: Some("go_map_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -49247,7 +49278,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -49256,7 +49287,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2344),
+                            constructor: DeclarationId(2346),
                             payload: vec![],
                         },
                     ),
@@ -49271,7 +49302,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![],
                                     },
                                 ),
@@ -49284,7 +49315,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![],
                                     },
                                 ),
@@ -49302,7 +49333,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 28017, 28231),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1414),
+            id: DeclarationId(1416),
             name: Some("go_filter_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -49317,7 +49348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -49326,7 +49357,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2345),
+                            constructor: DeclarationId(2347),
                             payload: vec![],
                         },
                     ),
@@ -49341,7 +49372,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![],
                                     },
                                 ),
@@ -49354,7 +49385,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![],
                                     },
                                 ),
@@ -49372,7 +49403,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 28233, 28456),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1415),
+            id: DeclarationId(1417),
             name: Some("go_contains_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -49387,7 +49418,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -49396,7 +49427,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2346),
+                            constructor: DeclarationId(2348),
                             payload: vec![],
                         },
                     ),
@@ -49411,7 +49442,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![],
                                     },
                                 ),
@@ -49424,7 +49455,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![],
                                     },
                                 ),
@@ -49442,7 +49473,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 28458, 28687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1416),
+            id: DeclarationId(1418),
             name: Some("go_list_pattern".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1033),
@@ -49457,7 +49488,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "target".to_string(),
@@ -49466,17 +49497,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2348),
+                            constructor: DeclarationId(2350),
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1814)),
+                        FieldValue::Reference(DeclarationId(1816)),
                     ),
                     (
                         "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1816)),
+                        FieldValue::Reference(DeclarationId(1818)),
                     ),
                     (
                         "scrutinee".to_string(),
@@ -49509,7 +49540,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 28774, 29080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1417),
+            id: DeclarationId(1419),
             name: Some("go_statements".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1035),
@@ -49539,7 +49570,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 29082, 29212),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1418),
+            id: DeclarationId(1420),
             name: Some("go_expressions".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1036),
@@ -49573,7 +49604,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 29214, 29374),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1419),
+            id: DeclarationId(1421),
             name: Some("go_control_flow".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1038),
@@ -49618,7 +49649,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 29376, 29577),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1420),
+            id: DeclarationId(1422),
             name: Some("go_literals".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1039),
@@ -49650,7 +49681,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 29579, 29689),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1421),
+            id: DeclarationId(1423),
             name: Some("go_modules".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1040),
@@ -49672,7 +49703,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 29691, 29748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1422),
+            id: DeclarationId(1424),
             name: Some("go_functions".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1041),
@@ -49718,7 +49749,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 29750, 30035),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1423),
+            id: DeclarationId(1425),
             name: Some("go_type_applications".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1042),
@@ -49740,7 +49771,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 30037, 30116),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1424),
+            id: DeclarationId(1426),
             name: Some("go_type_defs".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1043),
@@ -49784,7 +49815,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 30118, 30341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1425),
+            id: DeclarationId(1427),
             name: Some("go_patterns".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1045),
@@ -49838,7 +49869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 30343, 30635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1426),
+            id: DeclarationId(1428),
             name: Some("go_collection_ops".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1046),
@@ -49922,7 +49953,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 30637, 31402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1427),
+            id: DeclarationId(1429),
             name: Some("go_value_construction".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1047),
@@ -49966,7 +49997,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 31404, 31672),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1428),
+            id: DeclarationId(1430),
             name: Some("go_record_derive_templates".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1044),
@@ -49994,7 +50025,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 32429, 32544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1429),
+            id: DeclarationId(1431),
             name: Some("go_language".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1051),
@@ -50009,51 +50040,51 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "statements".to_string(),
-                        FieldValue::Reference(DeclarationId(1417)),
+                        FieldValue::Reference(DeclarationId(1419)),
                     ),
                     (
                         "expressions".to_string(),
-                        FieldValue::Reference(DeclarationId(1418)),
+                        FieldValue::Reference(DeclarationId(1420)),
                     ),
                     (
                         "control_flow".to_string(),
-                        FieldValue::Reference(DeclarationId(1419)),
+                        FieldValue::Reference(DeclarationId(1421)),
                     ),
                     (
                         "literals".to_string(),
-                        FieldValue::Reference(DeclarationId(1420)),
+                        FieldValue::Reference(DeclarationId(1422)),
                     ),
                     (
                         "modules".to_string(),
-                        FieldValue::Reference(DeclarationId(1421)),
+                        FieldValue::Reference(DeclarationId(1423)),
                     ),
                     (
                         "functions".to_string(),
-                        FieldValue::Reference(DeclarationId(1422)),
+                        FieldValue::Reference(DeclarationId(1424)),
                     ),
                     (
                         "type_applications".to_string(),
-                        FieldValue::Reference(DeclarationId(1423)),
+                        FieldValue::Reference(DeclarationId(1425)),
                     ),
                     (
                         "type_definitions".to_string(),
-                        FieldValue::Reference(DeclarationId(1424)),
+                        FieldValue::Reference(DeclarationId(1426)),
                     ),
                     (
                         "record_derive_templates".to_string(),
-                        FieldValue::Reference(DeclarationId(1428)),
+                        FieldValue::Reference(DeclarationId(1430)),
                     ),
                     (
                         "patterns".to_string(),
-                        FieldValue::Reference(DeclarationId(1425)),
+                        FieldValue::Reference(DeclarationId(1427)),
                     ),
                     (
                         "collection_ops".to_string(),
-                        FieldValue::Reference(DeclarationId(1426)),
+                        FieldValue::Reference(DeclarationId(1428)),
                     ),
                     (
                         "values".to_string(),
-                        FieldValue::Reference(DeclarationId(1427)),
+                        FieldValue::Reference(DeclarationId(1429)),
                     ),
                 ],
             }),
@@ -50062,7 +50093,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 32546, 32965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1430),
+            id: DeclarationId(1432),
             name: Some("go_correction_style".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(930),
@@ -50098,7 +50129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 34632, 34768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1431),
+            id: DeclarationId(1433),
             name: Some("go_clean_emission".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(921),
@@ -50114,55 +50145,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2175),
+                            constructor: DeclarationId(2177),
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2178),
+                            constructor: DeclarationId(2180),
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2181),
+                            constructor: DeclarationId(2183),
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2184),
+                            constructor: DeclarationId(2186),
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2188),
+                            constructor: DeclarationId(2190),
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2190),
+                            constructor: DeclarationId(2192),
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2194),
+                            constructor: DeclarationId(2196),
                             payload: vec![],
                         },
                     ),
                     (
                         "correction_style".to_string(),
-                        FieldValue::Reference(DeclarationId(1430)),
+                        FieldValue::Reference(DeclarationId(1432)),
                     ),
                     (
                         "post_emit_verifier".to_string(),
@@ -50188,7 +50219,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2197),
+                                    constructor: DeclarationId(2199),
                                     payload: vec![],
                                 },
                             ),
@@ -50201,7 +50232,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 34770, 35328),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1432),
+            id: DeclarationId(1434),
             name: Some("go_clean_emission_binding".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(922),
@@ -50216,11 +50247,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "clean_emission".to_string(),
-                        FieldValue::Reference(DeclarationId(1431)),
+                        FieldValue::Reference(DeclarationId(1433)),
                     ),
                 ],
             }),
@@ -50229,7 +50260,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 35330, 35454),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1433),
+            id: DeclarationId(1435),
             name: Some("python_statements".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1035),
@@ -50257,7 +50288,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 2347, 2469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1434),
+            id: DeclarationId(1436),
             name: Some("python_expressions".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1036),
@@ -50291,7 +50322,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 2471, 2624),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1435),
+            id: DeclarationId(1437),
             name: Some("python_control_flow".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1038),
@@ -50336,7 +50367,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 2626, 2841),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1436),
+            id: DeclarationId(1438),
             name: Some("python_literals".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1039),
@@ -50368,7 +50399,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 2843, 2957),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1437),
+            id: DeclarationId(1439),
             name: Some("python_modules".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1040),
@@ -50390,7 +50421,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 2959, 3020),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1438),
+            id: DeclarationId(1440),
             name: Some("python_functions".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1041),
@@ -50436,7 +50467,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 3022, 3329),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1439),
+            id: DeclarationId(1441),
             name: Some("python_type_applications".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1042),
@@ -50460,7 +50491,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 3331, 3430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1440),
+            id: DeclarationId(1442),
             name: Some("python_type_definitions".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1043),
@@ -50508,7 +50539,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 3432, 3763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1441),
+            id: DeclarationId(1443),
             name: Some("python_patterns".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1045),
@@ -50562,7 +50593,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 3765, 4095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1442),
+            id: DeclarationId(1444),
             name: Some("python_collections".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1046),
@@ -50640,7 +50671,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 4097, 4861),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1443),
+            id: DeclarationId(1445),
             name: Some("python_value_construction".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1047),
@@ -50680,7 +50711,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 4863, 5115),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1444),
+            id: DeclarationId(1446),
             name: Some("python_record_derive_templates".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1044),
@@ -50708,7 +50739,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 5318, 5437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1445),
+            id: DeclarationId(1447),
             name: Some("python_language".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1051),
@@ -50723,51 +50754,51 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "statements".to_string(),
-                        FieldValue::Reference(DeclarationId(1433)),
+                        FieldValue::Reference(DeclarationId(1435)),
                     ),
                     (
                         "expressions".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
+                        FieldValue::Reference(DeclarationId(1436)),
                     ),
                     (
                         "control_flow".to_string(),
-                        FieldValue::Reference(DeclarationId(1435)),
+                        FieldValue::Reference(DeclarationId(1437)),
                     ),
                     (
                         "literals".to_string(),
-                        FieldValue::Reference(DeclarationId(1436)),
+                        FieldValue::Reference(DeclarationId(1438)),
                     ),
                     (
                         "modules".to_string(),
-                        FieldValue::Reference(DeclarationId(1437)),
+                        FieldValue::Reference(DeclarationId(1439)),
                     ),
                     (
                         "functions".to_string(),
-                        FieldValue::Reference(DeclarationId(1438)),
+                        FieldValue::Reference(DeclarationId(1440)),
                     ),
                     (
                         "type_applications".to_string(),
-                        FieldValue::Reference(DeclarationId(1439)),
+                        FieldValue::Reference(DeclarationId(1441)),
                     ),
                     (
                         "type_definitions".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1442)),
                     ),
                     (
                         "record_derive_templates".to_string(),
-                        FieldValue::Reference(DeclarationId(1444)),
+                        FieldValue::Reference(DeclarationId(1446)),
                     ),
                     (
                         "patterns".to_string(),
-                        FieldValue::Reference(DeclarationId(1441)),
+                        FieldValue::Reference(DeclarationId(1443)),
                     ),
                     (
                         "collection_ops".to_string(),
-                        FieldValue::Reference(DeclarationId(1442)),
+                        FieldValue::Reference(DeclarationId(1444)),
                     ),
                     (
                         "values".to_string(),
-                        FieldValue::Reference(DeclarationId(1443)),
+                        FieldValue::Reference(DeclarationId(1445)),
                     ),
                 ],
             }),
@@ -50776,7 +50807,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 5439, 5914),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1446),
+            id: DeclarationId(1448),
             name: Some("python_target".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(957),
@@ -50792,14 +50823,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2241),
+                            constructor: DeclarationId(2243),
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2244),
+                            constructor: DeclarationId(2246),
                             payload: vec![],
                         },
                     ),
@@ -50810,7 +50841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 5916, 6013),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1447),
+            id: DeclarationId(1449),
             name: Some("python_source_filtering".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(959),
@@ -50838,7 +50869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 6015, 6151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1448),
+            id: DeclarationId(1450),
             name: Some("python_execution_requirement".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(961),
@@ -50859,7 +50890,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 6153, 6232),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1449),
+            id: DeclarationId(1451),
             name: Some("python_int".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -50874,7 +50905,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -50900,7 +50931,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 6234, 6370),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1450),
+            id: DeclarationId(1452),
             name: Some("python_integer_inhabit_at_i32_program_bound".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1017),
@@ -50915,7 +50946,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -50928,17 +50959,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2322),
+                            constructor: DeclarationId(2324),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1909),
+                                constructor: DeclarationId(1911),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(
                                         "-2147483648".to_string(),
                                     )),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1908),
+                                        constructor: DeclarationId(1910),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1906),
+                                            constructor: DeclarationId(1908),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 "4294967295".to_string(),
                                             ))],
@@ -50950,7 +50981,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1449)),
+                        FieldValue::Reference(DeclarationId(1451)),
                     ),
                 ],
             }),
@@ -50959,7 +50990,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 6463, 6772),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1451),
+            id: DeclarationId(1453),
             name: Some("python_integer_inhabit_unbounded_decl".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1017),
@@ -50974,7 +51005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -50987,16 +51018,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2322),
+                            constructor: DeclarationId(2324),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1910),
+                                constructor: DeclarationId(1912),
                                 payload: vec![],
                             }],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1449)),
+                        FieldValue::Reference(DeclarationId(1451)),
                     ),
                 ],
             }),
@@ -51005,7 +51036,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 6850, 7060),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1452),
+            id: DeclarationId(1454),
             name: Some("python_bool".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -51020,7 +51051,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -51046,7 +51077,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7062, 7201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1453),
+            id: DeclarationId(1455),
             name: Some("python_string".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -51061,7 +51092,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -51087,7 +51118,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7203, 7345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1454),
+            id: DeclarationId(1456),
             name: Some("python_node_id".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -51102,7 +51133,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -51128,7 +51159,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7347, 7493),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1455),
+            id: DeclarationId(1457),
             name: Some("python_port_id".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -51143,7 +51174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -51169,7 +51200,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7495, 7641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1456),
+            id: DeclarationId(1458),
             name: Some("python_declaration_id".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -51184,7 +51215,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -51210,7 +51241,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7643, 7810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1457),
+            id: DeclarationId(1459),
             name: Some("python_declaration_ref".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -51225,11 +51256,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1311)),
+                        FieldValue::Reference(DeclarationId(1313)),
                     ),
                     (
                         "carrier".to_string(),
@@ -51251,7 +51282,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7812, 7981),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1458),
+            id: DeclarationId(1460),
             name: Some("python_source_span".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -51266,7 +51297,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -51292,7 +51323,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7983, 8142),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1459),
+            id: DeclarationId(1461),
             name: Some("python_dag_port".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -51307,7 +51338,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -51333,7 +51364,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 8144, 8294),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1460),
+            id: DeclarationId(1462),
             name: Some("python_branch_path".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -51348,7 +51379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -51374,7 +51405,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 8296, 8455),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1461),
+            id: DeclarationId(1463),
             name: Some("python_value_node".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -51389,7 +51420,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -51415,7 +51446,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 8457, 8613),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1462),
+            id: DeclarationId(1464),
             name: Some("python_transform_node".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -51430,7 +51461,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -51456,7 +51487,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 8615, 8783),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1463),
+            id: DeclarationId(1465),
             name: Some("python_branch_node".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -51471,7 +51502,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -51497,7 +51528,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 8785, 8944),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1464),
+            id: DeclarationId(1466),
             name: Some("python_loop_node".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -51512,7 +51543,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -51538,7 +51569,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 8946, 9099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1465),
+            id: DeclarationId(1467),
             name: Some("python_bind_node".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -51553,7 +51584,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -51579,7 +51610,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 9101, 9254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1466),
+            id: DeclarationId(1468),
             name: Some("python_behavior".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -51594,7 +51625,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -51620,7 +51651,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 9256, 9408),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1467),
+            id: DeclarationId(1469),
             name: Some("python_dag".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -51635,7 +51666,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -51661,7 +51692,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 9410, 9547),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1468),
+            id: DeclarationId(1470),
             name: Some("python_surface_module".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -51676,7 +51707,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -51700,7 +51731,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2324),
+                                    constructor: DeclarationId(2326),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "items".to_string(),
                                     ))],
@@ -51723,7 +51754,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 9621, 9870),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1469),
+            id: DeclarationId(1471),
             name: Some("python_surface_item".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -51738,7 +51769,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -51764,7 +51795,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 9872, 10034),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1470),
+            id: DeclarationId(1472),
             name: Some("python_surface_param".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -51779,7 +51810,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -51804,7 +51835,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -51823,7 +51854,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -51844,7 +51875,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "refinement".to_string(),
                                         ))],
@@ -51868,7 +51899,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 10036, 10442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1471),
+            id: DeclarationId(1473),
             name: Some("python_surface_field".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -51883,7 +51914,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -51908,7 +51939,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -51927,7 +51958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -51951,7 +51982,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 10444, 10761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1472),
+            id: DeclarationId(1474),
             name: Some("python_surface_variant".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -51966,7 +51997,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -51991,7 +52022,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -52010,7 +52041,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -52029,7 +52060,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -52053,7 +52084,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 10763, 11173),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1473),
+            id: DeclarationId(1475),
             name: Some("python_variant_payload".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -52068,7 +52099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -52094,7 +52125,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 11175, 11346),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1474),
+            id: DeclarationId(1476),
             name: Some("python_surface_type".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -52109,7 +52140,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -52135,7 +52166,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 11348, 11510),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1475),
+            id: DeclarationId(1477),
             name: Some("python_surface_record_field".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -52150,7 +52181,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -52175,7 +52206,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -52194,7 +52225,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -52213,7 +52244,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -52237,7 +52268,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 11512, 11931),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1476),
+            id: DeclarationId(1478),
             name: Some("python_surface_map_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -52252,7 +52283,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -52277,7 +52308,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key".to_string(),
                                         ))],
@@ -52298,7 +52329,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key_span".to_string(),
                                         ))],
@@ -52317,7 +52348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -52336,7 +52367,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -52360,7 +52391,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 11933, 12426),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1477),
+            id: DeclarationId(1479),
             name: Some("python_surface_match_arm".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -52375,7 +52406,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -52400,7 +52431,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -52419,7 +52450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -52438,7 +52469,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -52462,7 +52493,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 12428, 12842),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1478),
+            id: DeclarationId(1480),
             name: Some("python_surface_pattern_field".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -52477,7 +52508,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -52502,7 +52533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -52521,7 +52552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -52540,7 +52571,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -52564,7 +52595,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 12844, 13270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1479),
+            id: DeclarationId(1481),
             name: Some("python_surface_pattern".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -52579,7 +52610,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -52605,7 +52636,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 13272, 13443),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1480),
+            id: DeclarationId(1482),
             name: Some("python_surface_literal".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -52620,7 +52651,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -52646,7 +52677,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 13445, 13616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1481),
+            id: DeclarationId(1483),
             name: Some("python_surface_expr".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -52661,7 +52692,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -52687,7 +52718,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 13618, 13780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1482),
+            id: DeclarationId(1484),
             name: Some("python_int_add".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -52702,7 +52733,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -52724,7 +52755,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 13782, 13931),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1483),
+            id: DeclarationId(1485),
             name: Some("python_int_sub".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -52739,7 +52770,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -52761,7 +52792,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 13933, 14082),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1484),
+            id: DeclarationId(1486),
             name: Some("python_int_mul".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -52776,7 +52807,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -52798,7 +52829,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 14084, 14233),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1485),
+            id: DeclarationId(1487),
             name: Some("python_int_div".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -52813,7 +52844,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -52837,7 +52868,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 14235, 14394),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1486),
+            id: DeclarationId(1488),
             name: Some("python_int_eq".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -52852,7 +52883,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -52874,7 +52905,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 14396, 14544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1487),
+            id: DeclarationId(1489),
             name: Some("python_node_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -52889,7 +52920,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -52911,7 +52942,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 14546, 14701),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1488),
+            id: DeclarationId(1490),
             name: Some("python_port_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -52926,7 +52957,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -52948,7 +52979,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 14703, 14858),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1489),
+            id: DeclarationId(1491),
             name: Some("python_declaration_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -52963,7 +52994,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -52985,7 +53016,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 14860, 15029),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1490),
+            id: DeclarationId(1492),
             name: Some("python_int_ne".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -53000,7 +53031,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -53022,7 +53053,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15031, 15179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1491),
+            id: DeclarationId(1493),
             name: Some("python_int_lt".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -53037,7 +53068,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -53059,7 +53090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15181, 15328),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1492),
+            id: DeclarationId(1494),
             name: Some("python_int_le".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -53074,7 +53105,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -53096,7 +53127,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15330, 15478),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1493),
+            id: DeclarationId(1495),
             name: Some("python_int_gt".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -53111,7 +53142,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -53133,7 +53164,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15480, 15627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1494),
+            id: DeclarationId(1496),
             name: Some("python_int_ge".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -53148,7 +53179,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -53170,7 +53201,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15629, 15777),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1495),
+            id: DeclarationId(1497),
             name: Some("python_bool_meet".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -53185,7 +53216,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -53207,7 +53238,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15779, 15937),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1496),
+            id: DeclarationId(1498),
             name: Some("python_bool_join".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -53222,7 +53253,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -53244,7 +53275,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15939, 16096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1497),
+            id: DeclarationId(1499),
             name: Some("python_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -53259,7 +53290,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -53268,7 +53299,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2337),
+                            constructor: DeclarationId(2339),
                             payload: vec![],
                         },
                     ),
@@ -53284,7 +53315,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 16098, 16244),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1498),
+            id: DeclarationId(1500),
             name: Some("python_singleton_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -53299,7 +53330,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -53308,7 +53339,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2338),
+                            constructor: DeclarationId(2340),
                             payload: vec![],
                         },
                     ),
@@ -53322,7 +53353,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2328),
+                                    constructor: DeclarationId(2330),
                                     payload: vec![],
                                 },
                             ),
@@ -53339,7 +53370,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 16246, 16446),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1499),
+            id: DeclarationId(1501),
             name: Some("python_cons_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -53354,7 +53385,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -53363,7 +53394,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2339),
+                            constructor: DeclarationId(2341),
                             payload: vec![],
                         },
                     ),
@@ -53378,7 +53409,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![],
                                     },
                                 ),
@@ -53391,7 +53422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![],
                                     },
                                 ),
@@ -53409,7 +53440,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 16448, 16673),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1500),
+            id: DeclarationId(1502),
             name: Some("python_concat_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -53424,7 +53455,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -53433,7 +53464,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2340),
+                            constructor: DeclarationId(2342),
                             payload: vec![],
                         },
                     ),
@@ -53448,7 +53479,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![],
                                     },
                                 ),
@@ -53461,7 +53492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![],
                                     },
                                 ),
@@ -53479,7 +53510,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 16675, 16906),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1501),
+            id: DeclarationId(1503),
             name: Some("python_length_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -53494,7 +53525,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -53503,7 +53534,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2341),
+                            constructor: DeclarationId(2343),
                             payload: vec![],
                         },
                     ),
@@ -53517,7 +53548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2327),
+                                    constructor: DeclarationId(2329),
                                     payload: vec![],
                                 },
                             ),
@@ -53534,7 +53565,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 16908, 17099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1502),
+            id: DeclarationId(1504),
             name: Some("python_is_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -53549,7 +53580,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -53558,7 +53589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2342),
+                            constructor: DeclarationId(2344),
                             payload: vec![],
                         },
                     ),
@@ -53572,7 +53603,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2327),
+                                    constructor: DeclarationId(2329),
                                     payload: vec![],
                                 },
                             ),
@@ -53589,7 +53620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 17101, 17297),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1503),
+            id: DeclarationId(1505),
             name: Some("python_fold_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -53604,7 +53635,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -53613,7 +53644,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2343),
+                            constructor: DeclarationId(2345),
                             payload: vec![],
                         },
                     ),
@@ -53628,7 +53659,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![],
                                     },
                                 ),
@@ -53641,7 +53672,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![],
                                     },
                                 ),
@@ -53654,7 +53685,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![],
                                     },
                                 ),
@@ -53672,7 +53703,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 17299, 17564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1504),
+            id: DeclarationId(1506),
             name: Some("python_map_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -53687,7 +53718,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -53696,7 +53727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2344),
+                            constructor: DeclarationId(2346),
                             payload: vec![],
                         },
                     ),
@@ -53711,7 +53742,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![],
                                     },
                                 ),
@@ -53724,7 +53755,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![],
                                     },
                                 ),
@@ -53742,7 +53773,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 17566, 17788),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1505),
+            id: DeclarationId(1507),
             name: Some("python_filter_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -53757,7 +53788,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -53766,7 +53797,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2345),
+                            constructor: DeclarationId(2347),
                             payload: vec![],
                         },
                     ),
@@ -53781,7 +53812,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![],
                                     },
                                 ),
@@ -53794,7 +53825,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![],
                                     },
                                 ),
@@ -53812,7 +53843,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 17790, 18021),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1506),
+            id: DeclarationId(1508),
             name: Some("python_contains_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -53827,7 +53858,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -53836,7 +53867,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2346),
+                            constructor: DeclarationId(2348),
                             payload: vec![],
                         },
                     ),
@@ -53851,7 +53882,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![],
                                     },
                                 ),
@@ -53864,7 +53895,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![],
                                     },
                                 ),
@@ -53882,7 +53913,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 18023, 18260),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1507),
+            id: DeclarationId(1509),
             name: Some("python_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1031),
@@ -53897,7 +53928,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -53917,9 +53948,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/spec/python.dag", 18262, 18410),
         });
-        declarations.push(Declaration { id: DeclarationId(1508), name: Some("python_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1031), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1031)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("language".to_string(), FieldValue::Reference(DeclarationId(1445))), ("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".to_string())))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/python.dag", 18526, 18764) });
+        declarations.push(Declaration { id: DeclarationId(1510), name: Some("python_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1031), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1031)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("language".to_string(), FieldValue::Reference(DeclarationId(1447))), ("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".to_string())))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/python.dag", 18526, 18764) });
         declarations.push(Declaration {
-            id: DeclarationId(1509),
+            id: DeclarationId(1511),
             name: Some("python_non_empty_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1031),
@@ -53934,7 +53965,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -53957,7 +53988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 18855, 19029),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1510),
+            id: DeclarationId(1512),
             name: Some("python_non_singleton_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1031),
@@ -53972,7 +54003,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -53995,7 +54026,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 19031, 19217),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1511),
+            id: DeclarationId(1513),
             name: Some("python_list_pattern".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1033),
@@ -54010,7 +54041,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -54019,17 +54050,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2348),
+                            constructor: DeclarationId(2350),
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1814)),
+                        FieldValue::Reference(DeclarationId(1816)),
                     ),
                     (
                         "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1816)),
+                        FieldValue::Reference(DeclarationId(1818)),
                     ),
                     (
                         "scrutinee".to_string(),
@@ -54062,7 +54093,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 19218, 19532),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1512),
+            id: DeclarationId(1514),
             name: Some("python_correction_style".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(930),
@@ -54098,7 +54129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 21597, 21739),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1513),
+            id: DeclarationId(1515),
             name: Some("python_clean_emission".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(921),
@@ -54114,55 +54145,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2175),
+                            constructor: DeclarationId(2177),
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2180),
+                            constructor: DeclarationId(2182),
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2181),
+                            constructor: DeclarationId(2183),
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2184),
+                            constructor: DeclarationId(2186),
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2188),
+                            constructor: DeclarationId(2190),
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2189),
+                            constructor: DeclarationId(2191),
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2194),
+                            constructor: DeclarationId(2196),
                             payload: vec![],
                         },
                     ),
                     (
                         "correction_style".to_string(),
-                        FieldValue::Reference(DeclarationId(1512)),
+                        FieldValue::Reference(DeclarationId(1514)),
                     ),
                     (
                         "post_emit_verifier".to_string(),
@@ -54191,7 +54222,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2196),
+                                    constructor: DeclarationId(2198),
                                     payload: vec![],
                                 },
                             ),
@@ -54204,7 +54235,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 21741, 22321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1514),
+            id: DeclarationId(1516),
             name: Some("python_clean_emission_binding".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(922),
@@ -54219,11 +54250,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "clean_emission".to_string(),
-                        FieldValue::Reference(DeclarationId(1513)),
+                        FieldValue::Reference(DeclarationId(1515)),
                     ),
                 ],
             }),
@@ -54232,7 +54263,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 22323, 22459),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1515),
+            id: DeclarationId(1517),
             name: Some("rust_execution_model".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(957),
@@ -54248,14 +54279,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2243),
+                            constructor: DeclarationId(2245),
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2244),
+                            constructor: DeclarationId(2246),
                             payload: vec![],
                         },
                     ),
@@ -54266,7 +54297,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 5076, 5178),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1516),
+            id: DeclarationId(1518),
             name: Some("rust_source_filtering".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(959),
@@ -54296,7 +54327,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 5180, 5332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1517),
+            id: DeclarationId(1519),
             name: Some("rust_execution_requirement".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(961),
@@ -54317,7 +54348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 5334, 5409),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1518),
+            id: DeclarationId(1520),
             name: Some("rust_int".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -54332,7 +54363,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -54358,7 +54389,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 5860, 5992),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1519),
+            id: DeclarationId(1521),
             name: Some("rust_uint8".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -54373,7 +54404,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -54399,7 +54430,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 5994, 6129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1520),
+            id: DeclarationId(1522),
             name: Some("rust_i32".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -54414,7 +54445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -54440,7 +54471,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 6131, 6265),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1521),
+            id: DeclarationId(1523),
             name: Some("rust_u32".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -54455,7 +54486,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -54481,7 +54512,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 6267, 6402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1522),
+            id: DeclarationId(1524),
             name: Some("rust_i128".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -54496,7 +54527,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -54522,7 +54553,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 6404, 6541),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1523),
+            id: DeclarationId(1525),
             name: Some("rust_u128".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -54537,7 +54568,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -54563,7 +54594,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 6833, 6971),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1524),
+            id: DeclarationId(1526),
             name: Some("rust_isize".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -54578,7 +54609,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -54604,7 +54635,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 7374, 7518),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1525),
+            id: DeclarationId(1527),
             name: Some("rust_usize".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -54619,7 +54650,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -54645,7 +54676,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 7520, 7665),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1526),
+            id: DeclarationId(1528),
             name: Some("rust_integer_inhabit_u32_at_program_bound".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1017),
@@ -54660,7 +54691,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -54673,15 +54704,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2322),
+                            constructor: DeclarationId(2324),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1909),
+                                constructor: DeclarationId(1911),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int("0".to_string())),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1908),
+                                        constructor: DeclarationId(1910),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1906),
+                                            constructor: DeclarationId(1908),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 "4294967295".to_string(),
                                             ))],
@@ -54693,7 +54724,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1521)),
+                        FieldValue::Reference(DeclarationId(1523)),
                     ),
                 ],
             }),
@@ -54702,7 +54733,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 8086, 8385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1527),
+            id: DeclarationId(1529),
             name: Some("rust_integer_inhabit_i32_at_program_bound".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1017),
@@ -54717,7 +54748,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -54730,17 +54761,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2322),
+                            constructor: DeclarationId(2324),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1909),
+                                constructor: DeclarationId(1911),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(
                                         "-2147483648".to_string(),
                                     )),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1908),
+                                        constructor: DeclarationId(1910),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1906),
+                                            constructor: DeclarationId(1908),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 "4294967295".to_string(),
                                             ))],
@@ -54752,7 +54783,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1520)),
+                        FieldValue::Reference(DeclarationId(1522)),
                     ),
                 ],
             }),
@@ -54761,7 +54792,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 8387, 8694),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1528),
+            id: DeclarationId(1530),
             name: Some("rust_integer_inhabit_i32_bound_unspecified".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1017),
@@ -54776,7 +54807,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -54789,13 +54820,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2321),
+                            constructor: DeclarationId(2323),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1520)),
+                        FieldValue::Reference(DeclarationId(1522)),
                     ),
                 ],
             }),
@@ -54804,7 +54835,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 8696, 8901),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1529),
+            id: DeclarationId(1531),
             name: Some("rust_integer_inhabit_int64_bound_unspecified".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1017),
@@ -54819,7 +54850,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -54832,13 +54863,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2321),
+                            constructor: DeclarationId(2323),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1518)),
+                        FieldValue::Reference(DeclarationId(1520)),
                     ),
                 ],
             }),
@@ -54847,7 +54878,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 8903, 9106),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1530),
+            id: DeclarationId(1532),
             name: Some("rust_integer_inhabit_i128_bound_unspecified".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1017),
@@ -54862,7 +54893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -54875,13 +54906,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2321),
+                            constructor: DeclarationId(2323),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1522)),
+                        FieldValue::Reference(DeclarationId(1524)),
                     ),
                 ],
             }),
@@ -54890,7 +54921,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 9108, 9317),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1531),
+            id: DeclarationId(1533),
             name: Some("rust_integer_inhabit_u128_bound_unspecified".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1017),
@@ -54905,7 +54936,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -54918,13 +54949,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2321),
+                            constructor: DeclarationId(2323),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1523)),
+                        FieldValue::Reference(DeclarationId(1525)),
                     ),
                 ],
             }),
@@ -54933,7 +54964,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 9742, 9953),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1532),
+            id: DeclarationId(1534),
             name: Some("rust_integer_inhabit_isize_platform".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1017),
@@ -54948,7 +54979,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -54961,13 +54992,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2323),
+                            constructor: DeclarationId(2325),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1524)),
+                        FieldValue::Reference(DeclarationId(1526)),
                     ),
                 ],
             }),
@@ -54976,7 +55007,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 10316, 10533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1533),
+            id: DeclarationId(1535),
             name: Some("rust_integer_inhabit_usize_platform".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1017),
@@ -54991,7 +55022,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -55004,13 +55035,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2323),
+                            constructor: DeclarationId(2325),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1525)),
+                        FieldValue::Reference(DeclarationId(1527)),
                     ),
                 ],
             }),
@@ -55019,7 +55050,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 10535, 10754),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1534),
+            id: DeclarationId(1536),
             name: Some("rust_bool".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -55034,7 +55065,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -55060,7 +55091,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 10756, 10891),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1535),
+            id: DeclarationId(1537),
             name: Some("rust_string".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -55075,7 +55106,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -55101,7 +55132,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 10893, 11035),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1536),
+            id: DeclarationId(1538),
             name: Some("rust_node_id".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -55116,7 +55147,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -55142,7 +55173,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 11037, 11179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1537),
+            id: DeclarationId(1539),
             name: Some("rust_port_id".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -55157,7 +55188,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -55183,7 +55214,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 11181, 11323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1538),
+            id: DeclarationId(1540),
             name: Some("rust_declaration_id".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -55198,7 +55229,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -55224,7 +55255,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 11325, 11488),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1539),
+            id: DeclarationId(1541),
             name: Some("rust_cluster_id".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -55239,7 +55270,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -55265,7 +55296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 11490, 11641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1540),
+            id: DeclarationId(1542),
             name: Some("rust_type_shape".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -55280,7 +55311,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -55304,7 +55335,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2324),
+                                    constructor: DeclarationId(2326),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "declaration".to_string(),
                                     ))],
@@ -55327,7 +55358,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 11643, 11888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1541),
+            id: DeclarationId(1543),
             name: Some("rust_port_state".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -55342,7 +55373,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -55368,7 +55399,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 11890, 12042),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1542),
+            id: DeclarationId(1544),
             name: Some("rust_port".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -55383,7 +55414,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -55408,7 +55439,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2325),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -55427,7 +55458,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2325),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "state_value".to_string(),
                                         ))],
@@ -55448,7 +55479,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "produced_by".to_string(),
                                         ))],
@@ -55472,7 +55503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 12044, 12440),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1543),
+            id: DeclarationId(1545),
             name: Some("rust_source_span".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -55487,7 +55518,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -55512,7 +55543,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "file".to_string(),
                                         ))],
@@ -55531,7 +55562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_start".to_string(),
                                         ))],
@@ -55550,7 +55581,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_end".to_string(),
                                         ))],
@@ -55574,7 +55605,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 12442, 12840),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1544),
+            id: DeclarationId(1546),
             name: Some("rust_literal_bits".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -55589,7 +55620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -55615,7 +55646,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 12842, 13000),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1545),
+            id: DeclarationId(1547),
             name: Some("rust_atom_payload".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -55630,7 +55661,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -55656,7 +55687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 13002, 13160),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1546),
+            id: DeclarationId(1548),
             name: Some("rust_cardinality_bound".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -55671,7 +55702,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -55697,7 +55728,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 13162, 13335),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1547),
+            id: DeclarationId(1549),
             name: Some("rust_interval".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -55712,7 +55743,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -55738,7 +55769,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 13337, 13485),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1548),
+            id: DeclarationId(1550),
             name: Some("rust_positive_interval_width".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -55753,7 +55784,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -55781,7 +55812,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 13487, 13676),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1549),
+            id: DeclarationId(1551),
             name: Some("rust_interval_width".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -55796,7 +55827,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -55822,7 +55853,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 13678, 13842),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1550),
+            id: DeclarationId(1552),
             name: Some("rust_conj_field".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -55837,7 +55868,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -55862,7 +55893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -55881,7 +55912,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -55905,7 +55936,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 13844, 14146),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1551),
+            id: DeclarationId(1553),
             name: Some("rust_template_argument".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -55920,7 +55951,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -55947,7 +55978,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -55966,7 +55997,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -55990,7 +56021,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 14148, 14489),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1552),
+            id: DeclarationId(1554),
             name: Some("rust_phantom_parameter".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -56005,7 +56036,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -56032,7 +56063,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -56051,7 +56082,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "algebra".to_string(),
                                         ))],
@@ -56075,7 +56106,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 14491, 14836),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1553),
+            id: DeclarationId(1555),
             name: Some("rust_nominal_opacity".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -56090,7 +56121,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -56116,7 +56147,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2324),
+                                    constructor: DeclarationId(2326),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "permitted_accessors".to_string(),
                                     ))],
@@ -56139,7 +56170,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 14838, 15114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1554),
+            id: DeclarationId(1556),
             name: Some("rust_field_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -56154,7 +56185,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -56181,7 +56212,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "0".to_string(),
                                         ))],
@@ -56200,7 +56231,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "1".to_string(),
                                         ))],
@@ -56224,7 +56255,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 15116, 15433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1555),
+            id: DeclarationId(1557),
             name: Some("rust_non_empty_list".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -56239,7 +56270,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -56264,7 +56295,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -56283,7 +56314,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -56307,7 +56338,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 15435, 15755),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1556),
+            id: DeclarationId(1558),
             name: Some("rust_non_singleton_list".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -56322,7 +56353,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -56347,7 +56378,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -56366,7 +56397,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "second".to_string(),
                                         ))],
@@ -56385,7 +56416,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -56409,7 +56440,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 15757, 16170),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1557),
+            id: DeclarationId(1559),
             name: Some("rust_element_ref".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -56424,7 +56455,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -56448,7 +56479,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2325),
+                                    constructor: DeclarationId(2327),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "index_of".to_string(),
                                     ))],
@@ -56471,7 +56502,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 16172, 16413),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1558),
+            id: DeclarationId(1560),
             name: Some("rust_param_ref".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -56486,7 +56517,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -56511,7 +56542,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2325),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "member_of".to_string(),
                                         ))],
@@ -56530,7 +56561,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2325),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "slot_of".to_string(),
                                         ))],
@@ -56554,7 +56585,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 16415, 16735),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1559),
+            id: DeclarationId(1561),
             name: Some("rust_transform_ref".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -56569,7 +56600,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -56593,7 +56624,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2325),
+                                    constructor: DeclarationId(2327),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "node_id".to_string(),
                                     ))],
@@ -56616,7 +56647,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 16737, 16982),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1560),
+            id: DeclarationId(1562),
             name: Some("rust_member_descent".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -56631,7 +56662,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -56655,7 +56686,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2324),
+                                    constructor: DeclarationId(2326),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "param".to_string(),
                                     ))],
@@ -56678,7 +56709,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 16984, 17229),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1561),
+            id: DeclarationId(1563),
             name: Some("rust_intra_cluster_call".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -56693,7 +56724,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -56717,7 +56748,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2324),
+                                    constructor: DeclarationId(2326),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "transform".to_string(),
                                     ))],
@@ -56740,7 +56771,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 17231, 17494),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1562),
+            id: DeclarationId(1564),
             name: Some("rust_cluster".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -56755,7 +56786,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -56780,7 +56811,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "members".to_string(),
                                         ))],
@@ -56801,7 +56832,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "intra_cluster_calls".to_string(),
                                         ))],
@@ -56825,7 +56856,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 17496, 17833),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1563),
+            id: DeclarationId(1565),
             name: Some("rust_field_value".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -56840,7 +56871,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -56866,7 +56897,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 17835, 17990),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1564),
+            id: DeclarationId(1566),
             name: Some("rust_value_body".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -56881,7 +56912,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -56907,7 +56938,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 17992, 18144),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1565),
+            id: DeclarationId(1567),
             name: Some("rust_arrow_body".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -56922,7 +56953,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -56948,7 +56979,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 18146, 18298),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1566),
+            id: DeclarationId(1568),
             name: Some("rust_type_connective".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -56963,7 +56994,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -56989,7 +57020,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 18300, 18467),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1567),
+            id: DeclarationId(1569),
             name: Some("rust_declaration".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -57004,7 +57035,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -57029,7 +57060,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -57048,7 +57079,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -57069,7 +57100,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "connective".to_string(),
                                         ))],
@@ -57090,7 +57121,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "type_params".to_string(),
                                         ))],
@@ -57111,7 +57142,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "phantom_params".to_string(),
                                         ))],
@@ -57132,7 +57163,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "meta_tag".to_string(),
                                         ))],
@@ -57153,7 +57184,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inhabits".to_string(),
                                         ))],
@@ -57174,7 +57205,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value_body".to_string(),
                                         ))],
@@ -57195,7 +57226,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nominal_opacity".to_string(),
                                         ))],
@@ -57214,7 +57245,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -57238,7 +57269,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 18469, 19490),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1568),
+            id: DeclarationId(1570),
             name: Some("rust_arithmetic_op".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -57253,7 +57284,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -57279,7 +57310,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 19492, 19653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1569),
+            id: DeclarationId(1571),
             name: Some("rust_comparison_op".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -57294,7 +57325,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -57320,7 +57351,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 19655, 19816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1570),
+            id: DeclarationId(1572),
             name: Some("rust_logical_op".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -57335,7 +57366,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -57361,7 +57392,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 19818, 19970),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1571),
+            id: DeclarationId(1573),
             name: Some("rust_operator_kind".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -57376,7 +57407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -57402,7 +57433,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 19972, 20133),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1572),
+            id: DeclarationId(1574),
             name: Some("rust_transform_target".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -57417,7 +57448,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -57443,7 +57474,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 20135, 20305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1573),
+            id: DeclarationId(1575),
             name: Some("rust_branch_pattern".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -57458,7 +57489,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -57484,7 +57515,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 20307, 20471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1574),
+            id: DeclarationId(1576),
             name: Some("rust_payload_binding".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -57499,7 +57530,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -57526,7 +57557,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding_name".to_string(),
                                         ))],
@@ -57547,7 +57578,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload_port".to_string(),
                                         ))],
@@ -57571,7 +57602,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 20473, 20828),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1575),
+            id: DeclarationId(1577),
             name: Some("rust_branch_path".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -57586,7 +57617,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -57611,7 +57642,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -57632,7 +57663,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2325),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -57651,7 +57682,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -57670,7 +57701,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -57694,7 +57725,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 20830, 21318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1576),
+            id: DeclarationId(1578),
             name: Some("rust_loop_bound".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -57709,7 +57740,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -57735,7 +57766,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 21320, 21472),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1577),
+            id: DeclarationId(1579),
             name: Some("rust_value_node".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -57750,7 +57781,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -57775,7 +57806,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -57794,7 +57825,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "data".to_string(),
                                         ))],
@@ -57815,7 +57846,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2325),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -57834,7 +57865,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -57855,7 +57886,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2325),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "lane2_workflow".to_string(),
                                         ))],
@@ -57879,7 +57910,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 21474, 22247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1578),
+            id: DeclarationId(1580),
             name: Some("rust_transform_node".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -57894,7 +57925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -57919,7 +57950,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -57938,7 +57969,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "target".to_string(),
                                         ))],
@@ -57957,7 +57988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inputs".to_string(),
                                         ))],
@@ -57978,7 +58009,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2325),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -57997,7 +58028,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -58021,7 +58052,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 22249, 22821),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1579),
+            id: DeclarationId(1581),
             name: Some("rust_branch_node".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -58036,7 +58067,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -58061,7 +58092,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -58080,7 +58111,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "input".to_string(),
                                         ))],
@@ -58099,7 +58130,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "paths".to_string(),
                                         ))],
@@ -58120,7 +58151,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2325),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -58139,7 +58170,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -58160,7 +58191,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2325),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -58184,7 +58215,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 22823, 23490),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1580),
+            id: DeclarationId(1582),
             name: Some("rust_loop_node".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -58199,7 +58230,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -58224,7 +58255,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -58243,7 +58274,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "source".to_string(),
                                         ))],
@@ -58262,7 +58293,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "init".to_string(),
                                         ))],
@@ -58281,7 +58312,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -58300,7 +58331,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "bound".to_string(),
                                         ))],
@@ -58321,7 +58352,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2325),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -58340,7 +58371,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -58364,7 +58395,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 23492, 24201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1581),
+            id: DeclarationId(1583),
             name: Some("rust_bind_node".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -58379,7 +58410,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -58404,7 +58435,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -58423,7 +58454,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -58444,7 +58475,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2325),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -58463,7 +58494,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "params".to_string(),
                                         ))],
@@ -58482,7 +58513,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -58503,7 +58534,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2325),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "lane2_workflow".to_string(),
                                         ))],
@@ -58524,7 +58555,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2325),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -58548,7 +58579,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 24203, 24963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1582),
+            id: DeclarationId(1584),
             name: Some("rust_behavior".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -58563,7 +58594,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -58589,7 +58620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 24965, 25113),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1583),
+            id: DeclarationId(1585),
             name: Some("rust_dag".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -58604,7 +58635,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -58631,7 +58662,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2325),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "declarations".to_string(),
                                         ))],
@@ -58650,7 +58681,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2325),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nodes".to_string(),
                                         ))],
@@ -58669,7 +58700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2325),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ports".to_string(),
                                         ))],
@@ -58690,7 +58721,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2325),
+                                        constructor: DeclarationId(2327),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "clusters".to_string(),
                                         ))],
@@ -58714,7 +58745,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 25115, 25595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1584),
+            id: DeclarationId(1586),
             name: Some("rust_surface_module".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -58729,7 +58760,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -58755,7 +58786,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2324),
+                                    constructor: DeclarationId(2326),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "items".to_string(),
                                     ))],
@@ -58778,7 +58809,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 25808, 26068),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1585),
+            id: DeclarationId(1587),
             name: Some("rust_surface_item".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -58793,7 +58824,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -58821,7 +58852,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 26070, 26243),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1586),
+            id: DeclarationId(1588),
             name: Some("rust_surface_param".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -58836,7 +58867,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -58863,7 +58894,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -58882,7 +58913,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -58903,7 +58934,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "refinement".to_string(),
                                         ))],
@@ -58927,7 +58958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 26245, 26662),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1587),
+            id: DeclarationId(1589),
             name: Some("rust_surface_field".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -58942,7 +58973,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -58969,7 +59000,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -58988,7 +59019,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -59012,7 +59043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 26664, 26992),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1588),
+            id: DeclarationId(1590),
             name: Some("rust_surface_variant".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -59027,7 +59058,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -59054,7 +59085,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -59073,7 +59104,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -59092,7 +59123,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -59116,7 +59147,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 26994, 27415),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1589),
+            id: DeclarationId(1591),
             name: Some("rust_variant_payload".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -59131,7 +59162,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -59159,7 +59190,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 27417, 27599),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1590),
+            id: DeclarationId(1592),
             name: Some("rust_surface_type".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -59174,7 +59205,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -59202,7 +59233,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 27601, 27774),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1591),
+            id: DeclarationId(1593),
             name: Some("rust_surface_record_field".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -59217,7 +59248,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -59244,7 +59275,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -59263,7 +59294,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -59282,7 +59313,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -59306,7 +59337,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 27776, 28206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1592),
+            id: DeclarationId(1594),
             name: Some("rust_surface_map_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -59321,7 +59352,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -59348,7 +59379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key".to_string(),
                                         ))],
@@ -59369,7 +59400,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key_span".to_string(),
                                         ))],
@@ -59388,7 +59419,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -59407,7 +59438,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -59431,7 +59462,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 28208, 28712),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1593),
+            id: DeclarationId(1595),
             name: Some("rust_surface_match_arm".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -59446,7 +59477,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -59473,7 +59504,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -59492,7 +59523,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -59511,7 +59542,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -59535,7 +59566,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 28714, 29139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1594),
+            id: DeclarationId(1596),
             name: Some("rust_surface_pattern_field".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -59550,7 +59581,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -59577,7 +59608,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -59596,7 +59627,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -59615,7 +59646,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2324),
+                                        constructor: DeclarationId(2326),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -59639,7 +59670,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 29141, 29578),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1595),
+            id: DeclarationId(1597),
             name: Some("rust_surface_pattern".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -59654,7 +59685,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -59682,7 +59713,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 29580, 29762),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1596),
+            id: DeclarationId(1598),
             name: Some("rust_surface_literal".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -59697,7 +59728,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -59725,7 +59756,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 29764, 29946),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1597),
+            id: DeclarationId(1599),
             name: Some("rust_surface_expr".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -59740,7 +59771,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -59768,7 +59799,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 29948, 30121),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1598),
+            id: DeclarationId(1600),
             name: Some("rust_int_add".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -59783,7 +59814,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -59805,7 +59836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 30976, 31121),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1599),
+            id: DeclarationId(1601),
             name: Some("rust_int_sub".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -59820,7 +59851,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -59842,7 +59873,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 31123, 31268),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1600),
+            id: DeclarationId(1602),
             name: Some("rust_int_mul".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -59857,7 +59888,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -59879,7 +59910,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 31270, 31415),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1601),
+            id: DeclarationId(1603),
             name: Some("rust_int_div".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -59894,7 +59925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -59918,7 +59949,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 31417, 31575),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1602),
+            id: DeclarationId(1604),
             name: Some("rust_int_eq".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -59933,7 +59964,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -59955,7 +59986,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 32025, 32169),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1603),
+            id: DeclarationId(1605),
             name: Some("rust_node_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -59970,7 +60001,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -59992,7 +60023,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 32171, 32322),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1604),
+            id: DeclarationId(1606),
             name: Some("rust_port_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -60007,7 +60038,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -60029,7 +60060,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 32324, 32475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1605),
+            id: DeclarationId(1607),
             name: Some("rust_declaration_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -60044,7 +60075,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -60066,7 +60097,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 32477, 32642),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1606),
+            id: DeclarationId(1608),
             name: Some("rust_string_eq".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -60081,7 +60112,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -60103,7 +60134,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 32835, 32985),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1607),
+            id: DeclarationId(1609),
             name: Some("rust_int_ne".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -60118,7 +60149,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -60140,7 +60171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 32987, 33131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1608),
+            id: DeclarationId(1610),
             name: Some("rust_node_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -60155,7 +60186,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -60177,7 +60208,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 33133, 33284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1609),
+            id: DeclarationId(1611),
             name: Some("rust_port_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -60192,7 +60223,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -60214,7 +60245,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 33286, 33437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1610),
+            id: DeclarationId(1612),
             name: Some("rust_declaration_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -60229,7 +60260,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -60251,7 +60282,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 33439, 33604),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1611),
+            id: DeclarationId(1613),
             name: Some("rust_int_lt".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -60266,7 +60297,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -60288,7 +60319,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 33606, 33749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1612),
+            id: DeclarationId(1614),
             name: Some("rust_int_le".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -60303,7 +60334,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -60325,7 +60356,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 33751, 33895),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1613),
+            id: DeclarationId(1615),
             name: Some("rust_int_gt".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -60340,7 +60371,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -60362,7 +60393,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 33897, 34040),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1614),
+            id: DeclarationId(1616),
             name: Some("rust_int_ge".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -60377,7 +60408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -60399,7 +60430,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 34042, 34186),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1615),
+            id: DeclarationId(1617),
             name: Some("rust_bool_meet".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -60414,7 +60445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -60436,7 +60467,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 34188, 34341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1616),
+            id: DeclarationId(1618),
             name: Some("rust_bool_join".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1021),
@@ -60451,7 +60482,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -60473,7 +60504,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 34343, 34496),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1617),
+            id: DeclarationId(1619),
             name: Some("rust_let_stmt".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1022),
@@ -60488,11 +60519,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1309)),
+                        FieldValue::Reference(DeclarationId(1311)),
                     ),
                     (
                         "carrier".to_string(),
@@ -60511,7 +60542,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 35246, 35385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1618),
+            id: DeclarationId(1620),
             name: Some("rust_if_expr".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1022),
@@ -60526,11 +60557,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1307)),
+                        FieldValue::Reference(DeclarationId(1309)),
                     ),
                     (
                         "carrier".to_string(),
@@ -60549,7 +60580,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 35387, 35534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1619),
+            id: DeclarationId(1621),
             name: Some("rust_main_wrap".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1022),
@@ -60564,11 +60595,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1310)),
+                        FieldValue::Reference(DeclarationId(1312)),
                     ),
                     (
                         "carrier".to_string(),
@@ -60588,7 +60619,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 35536, 35706),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1620),
+            id: DeclarationId(1622),
             name: Some("rust_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -60603,7 +60634,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -60612,7 +60643,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2337),
+                            constructor: DeclarationId(2339),
                             payload: vec![],
                         },
                     ),
@@ -60628,7 +60659,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 37083, 37225),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1621),
+            id: DeclarationId(1623),
             name: Some("rust_singleton_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -60643,7 +60674,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -60652,7 +60683,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2338),
+                            constructor: DeclarationId(2340),
                             payload: vec![],
                         },
                     ),
@@ -60666,7 +60697,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2328),
+                                    constructor: DeclarationId(2330),
                                     payload: vec![],
                                 },
                             ),
@@ -60683,7 +60714,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 37227, 37423),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1622),
+            id: DeclarationId(1624),
             name: Some("rust_cons_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -60698,7 +60729,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -60707,7 +60738,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2339),
+                            constructor: DeclarationId(2341),
                             payload: vec![],
                         },
                     ),
@@ -60722,7 +60753,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![],
                                     },
                                 ),
@@ -60735,7 +60766,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![],
                                     },
                                 ),
@@ -60753,7 +60784,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 37425, 37646),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1623),
+            id: DeclarationId(1625),
             name: Some("rust_concat_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -60768,7 +60799,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -60777,7 +60808,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2340),
+                            constructor: DeclarationId(2342),
                             payload: vec![],
                         },
                     ),
@@ -60792,7 +60823,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![],
                                     },
                                 ),
@@ -60805,7 +60836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![],
                                     },
                                 ),
@@ -60823,7 +60854,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 37648, 37875),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1624),
+            id: DeclarationId(1626),
             name: Some("rust_length_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -60838,7 +60869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -60847,7 +60878,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2341),
+                            constructor: DeclarationId(2343),
                             payload: vec![],
                         },
                     ),
@@ -60861,7 +60892,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2327),
+                                    constructor: DeclarationId(2329),
                                     payload: vec![],
                                 },
                             ),
@@ -60878,7 +60909,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 37877, 38064),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1625),
+            id: DeclarationId(1627),
             name: Some("rust_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1031),
@@ -60893,7 +60924,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -60914,7 +60945,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 38066, 38209),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1626),
+            id: DeclarationId(1628),
             name: Some("rust_result_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1031),
@@ -60929,7 +60960,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -60952,7 +60983,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 38488, 38659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1627),
+            id: DeclarationId(1629),
             name: Some("rust_lookup_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1031),
@@ -60967,7 +60998,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -60988,7 +61019,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 38661, 38811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1628),
+            id: DeclarationId(1630),
             name: Some("rust_witness_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1031),
@@ -61003,7 +61034,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -61024,7 +61055,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 38813, 38966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1629),
+            id: DeclarationId(1631),
             name: Some("rust_lens_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1031),
@@ -61039,7 +61070,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -61060,7 +61091,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 38968, 39112),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1630),
+            id: DeclarationId(1632),
             name: Some("rust_monoid_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1031),
@@ -61075,7 +61106,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -61096,7 +61127,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 39114, 39264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1631),
+            id: DeclarationId(1633),
             name: Some("rust_lens_enforcement_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1031),
@@ -61111,7 +61142,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -61134,7 +61165,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 39266, 39449),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1632),
+            id: DeclarationId(1634),
             name: Some("rust_enforceable_lens_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1031),
@@ -61149,7 +61180,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -61172,7 +61203,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 39451, 39634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1633),
+            id: DeclarationId(1635),
             name: Some("rust_map_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1031),
@@ -61187,7 +61218,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -61210,7 +61241,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 39636, 39786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1634),
+            id: DeclarationId(1636),
             name: Some("rust_is_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -61225,7 +61256,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -61234,7 +61265,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2342),
+                            constructor: DeclarationId(2344),
                             payload: vec![],
                         },
                     ),
@@ -61248,7 +61279,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2327),
+                                    constructor: DeclarationId(2329),
                                     payload: vec![],
                                 },
                             ),
@@ -61265,7 +61296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 39788, 39980),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1635),
+            id: DeclarationId(1637),
             name: Some("rust_fold_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -61280,7 +61311,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -61289,7 +61320,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2343),
+                            constructor: DeclarationId(2345),
                             payload: vec![],
                         },
                     ),
@@ -61304,7 +61335,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![],
                                     },
                                 ),
@@ -61317,7 +61348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![],
                                     },
                                 ),
@@ -61330,7 +61361,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![],
                                     },
                                 ),
@@ -61348,7 +61379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 39982, 40243),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1636),
+            id: DeclarationId(1638),
             name: Some("rust_map_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -61363,7 +61394,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -61372,7 +61403,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2344),
+                            constructor: DeclarationId(2346),
                             payload: vec![],
                         },
                     ),
@@ -61387,7 +61418,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![],
                                     },
                                 ),
@@ -61400,7 +61431,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![],
                                     },
                                 ),
@@ -61418,7 +61449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 40245, 40463),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1637),
+            id: DeclarationId(1639),
             name: Some("rust_filter_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -61433,7 +61464,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -61442,7 +61473,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2345),
+                            constructor: DeclarationId(2347),
                             payload: vec![],
                         },
                     ),
@@ -61457,7 +61488,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![],
                                     },
                                 ),
@@ -61470,7 +61501,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![],
                                     },
                                 ),
@@ -61488,7 +61519,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 40465, 40692),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1638),
+            id: DeclarationId(1640),
             name: Some("rust_contains_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -61503,7 +61534,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -61512,7 +61543,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2346),
+                            constructor: DeclarationId(2348),
                             payload: vec![],
                         },
                     ),
@@ -61527,7 +61558,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![],
                                     },
                                 ),
@@ -61540,7 +61571,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2327),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![],
                                     },
                                 ),
@@ -61558,7 +61589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 40694, 40927),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1639),
+            id: DeclarationId(1641),
             name: Some("rust_list_pattern".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1033),
@@ -61573,7 +61604,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -61582,17 +61613,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2348),
+                            constructor: DeclarationId(2350),
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1814)),
+                        FieldValue::Reference(DeclarationId(1816)),
                     ),
                     (
                         "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1816)),
+                        FieldValue::Reference(DeclarationId(1818)),
                     ),
                     (
                         "scrutinee".to_string(),
@@ -61627,7 +61658,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 41155, 41459),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1640),
+            id: DeclarationId(1642),
             name: Some("rust_statements".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1035),
@@ -61659,7 +61690,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 41461, 41599),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1641),
+            id: DeclarationId(1643),
             name: Some("rust_expressions".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1036),
@@ -61693,7 +61724,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 41601, 41754),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1642),
+            id: DeclarationId(1644),
             name: Some("rust_control_flow".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1038),
@@ -61738,7 +61769,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 41756, 41946),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1643),
+            id: DeclarationId(1645),
             name: Some("rust_literals".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1039),
@@ -61770,7 +61801,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 41948, 42060),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1644),
+            id: DeclarationId(1646),
             name: Some("rust_modules".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1040),
@@ -61792,7 +61823,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 42062, 42122),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1645),
+            id: DeclarationId(1647),
             name: Some("rust_functions".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1041),
@@ -61838,7 +61869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 42124, 42402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1646),
+            id: DeclarationId(1648),
             name: Some("rust_type_applications".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1042),
@@ -61860,7 +61891,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 42404, 42492),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1647),
+            id: DeclarationId(1649),
             name: Some("rust_type_defs".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1043),
@@ -61906,7 +61937,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 42494, 42796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1648),
+            id: DeclarationId(1650),
             name: Some("rust_record_derive_templates".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1044),
@@ -61938,7 +61969,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 42798, 43011),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1649),
+            id: DeclarationId(1651),
             name: Some("rust_patterns".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1045),
@@ -61996,7 +62027,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 43013, 43348),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1650),
+            id: DeclarationId(1652),
             name: Some("rust_language_spec_free_monoid_concat_contract".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1054),
@@ -62026,7 +62057,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{ let mut __left = {left}; __left.extend({right}); __left }"
                                     .to_string(),
@@ -62040,7 +62071,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -62051,7 +62082,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 43350, 43720),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1651),
+            id: DeclarationId(1653),
             name: Some("rust_language_spec_free_monoid_length_contract".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1054),
@@ -62080,7 +62111,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).len() as i64".to_string(),
                             ))],
@@ -62093,7 +62124,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -62104,7 +62135,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 43722, 44016),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1652),
+            id: DeclarationId(1654),
             name: Some("rust_language_spec_free_monoid_emptiness_contract".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1054),
@@ -62131,7 +62162,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).is_empty()".to_string(),
                             ))],
@@ -62144,7 +62175,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -62155,7 +62186,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 44187, 44482),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1653),
+            id: DeclarationId(1655),
             name: Some("rust_language_spec_free_monoid_fold_contract".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1054),
@@ -62184,7 +62215,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).iter().fold({init}, {body})".to_string(),
                             ))],
@@ -62197,7 +62228,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -62208,7 +62239,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 44484, 44804),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1654),
+            id: DeclarationId(1656),
             name: Some("rust_language_spec_map_contract".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1054),
@@ -62237,7 +62268,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2357),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).iter().map({body}).collect::<Vec<_>>()".to_string(),
                             ))],
@@ -62250,7 +62281,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -62260,9 +62291,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/spec/rust.dag", 44806, 45134),
         });
-        declarations.push(Declaration { id: DeclarationId(1655), name: Some("rust_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("concat_contract".to_string(), FieldValue::Reference(DeclarationId(1650))), ("length_contract".to_string(), FieldValue::Reference(DeclarationId(1651))), ("is_empty_contract".to_string(), FieldValue::Reference(DeclarationId(1652))), ("fold_contract".to_string(), FieldValue::Reference(DeclarationId(1653))), ("filter_contract".to_string(), FieldValue::Reference(DeclarationId(1185))), ("flat_map_contract".to_string(), FieldValue::Reference(DeclarationId(1188))), ("any_contract".to_string(), FieldValue::Reference(DeclarationId(1186))), ("all_contract".to_string(), FieldValue::Reference(DeclarationId(1187))), ("map_contract".to_string(), FieldValue::Reference(DeclarationId(1654))), ("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", 45136, 46012) });
+        declarations.push(Declaration { id: DeclarationId(1657), name: Some("rust_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("concat_contract".to_string(), FieldValue::Reference(DeclarationId(1652))), ("length_contract".to_string(), FieldValue::Reference(DeclarationId(1653))), ("is_empty_contract".to_string(), FieldValue::Reference(DeclarationId(1654))), ("fold_contract".to_string(), FieldValue::Reference(DeclarationId(1655))), ("filter_contract".to_string(), FieldValue::Reference(DeclarationId(1185))), ("flat_map_contract".to_string(), FieldValue::Reference(DeclarationId(1188))), ("any_contract".to_string(), FieldValue::Reference(DeclarationId(1186))), ("all_contract".to_string(), FieldValue::Reference(DeclarationId(1187))), ("map_contract".to_string(), FieldValue::Reference(DeclarationId(1656))), ("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", 45136, 46012) });
         declarations.push(Declaration {
-            id: DeclarationId(1656),
+            id: DeclarationId(1658),
             name: Some("rust_value_construction".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1047),
@@ -62306,7 +62337,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 46014, 46286),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1657),
+            id: DeclarationId(1659),
             name: Some("rust_rendering".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1048),
@@ -62322,14 +62353,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "read".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2349),
+                            constructor: DeclarationId(2351),
                             payload: vec![],
                         },
                     ),
                     (
                         "construct".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2351),
+                            constructor: DeclarationId(2353),
                             payload: vec![],
                         },
                     ),
@@ -62340,7 +62371,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 46288, 46369),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1658),
+            id: DeclarationId(1660),
             name: Some("rust_language".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1051),
@@ -62355,51 +62386,51 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "statements".to_string(),
-                        FieldValue::Reference(DeclarationId(1640)),
+                        FieldValue::Reference(DeclarationId(1642)),
                     ),
                     (
                         "expressions".to_string(),
-                        FieldValue::Reference(DeclarationId(1641)),
+                        FieldValue::Reference(DeclarationId(1643)),
                     ),
                     (
                         "control_flow".to_string(),
-                        FieldValue::Reference(DeclarationId(1642)),
+                        FieldValue::Reference(DeclarationId(1644)),
                     ),
                     (
                         "literals".to_string(),
-                        FieldValue::Reference(DeclarationId(1643)),
+                        FieldValue::Reference(DeclarationId(1645)),
                     ),
                     (
                         "modules".to_string(),
-                        FieldValue::Reference(DeclarationId(1644)),
+                        FieldValue::Reference(DeclarationId(1646)),
                     ),
                     (
                         "functions".to_string(),
-                        FieldValue::Reference(DeclarationId(1645)),
+                        FieldValue::Reference(DeclarationId(1647)),
                     ),
                     (
                         "type_applications".to_string(),
-                        FieldValue::Reference(DeclarationId(1646)),
+                        FieldValue::Reference(DeclarationId(1648)),
                     ),
                     (
                         "type_definitions".to_string(),
-                        FieldValue::Reference(DeclarationId(1647)),
+                        FieldValue::Reference(DeclarationId(1649)),
                     ),
                     (
                         "record_derive_templates".to_string(),
-                        FieldValue::Reference(DeclarationId(1648)),
+                        FieldValue::Reference(DeclarationId(1650)),
                     ),
                     (
                         "patterns".to_string(),
-                        FieldValue::Reference(DeclarationId(1649)),
+                        FieldValue::Reference(DeclarationId(1651)),
                     ),
                     (
                         "collection_ops".to_string(),
-                        FieldValue::Reference(DeclarationId(1655)),
+                        FieldValue::Reference(DeclarationId(1657)),
                     ),
                     (
                         "values".to_string(),
-                        FieldValue::Reference(DeclarationId(1656)),
+                        FieldValue::Reference(DeclarationId(1658)),
                     ),
                 ],
             }),
@@ -62408,7 +62439,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 46371, 46816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1659),
+            id: DeclarationId(1661),
             name: Some("rust_correction_style".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(930),
@@ -62444,7 +62475,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 48240, 48379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1660),
+            id: DeclarationId(1662),
             name: Some("rust_clean_emission".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(921),
@@ -62460,55 +62491,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2175),
+                            constructor: DeclarationId(2177),
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2178),
+                            constructor: DeclarationId(2180),
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2182),
+                            constructor: DeclarationId(2184),
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2184),
+                            constructor: DeclarationId(2186),
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2187),
+                            constructor: DeclarationId(2189),
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2190),
+                            constructor: DeclarationId(2192),
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2193),
+                            constructor: DeclarationId(2195),
                             payload: vec![],
                         },
                     ),
                     (
                         "correction_style".to_string(),
-                        FieldValue::Reference(DeclarationId(1659)),
+                        FieldValue::Reference(DeclarationId(1661)),
                     ),
                     (
                         "post_emit_verifier".to_string(),
@@ -62540,7 +62571,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2196),
+                                    constructor: DeclarationId(2198),
                                     payload: vec![],
                                 },
                             ),
@@ -62553,7 +62584,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 48381, 48994),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1661),
+            id: DeclarationId(1663),
             name: Some("rust_clean_emission_binding".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(922),
@@ -62568,11 +62599,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "clean_emission".to_string(),
-                        FieldValue::Reference(DeclarationId(1660)),
+                        FieldValue::Reference(DeclarationId(1662)),
                     ),
                 ],
             }),
@@ -62581,7 +62612,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 48996, 49126),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1662),
+            id: DeclarationId(1664),
             name: Some("rust_port_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(829),
@@ -62605,7 +62636,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 50228, 50331),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1663),
+            id: DeclarationId(1665),
             name: Some("rust_node_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(829),
@@ -62629,7 +62660,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 50333, 50436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1664),
+            id: DeclarationId(1666),
             name: Some("rust_resolve_producer_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(829),
@@ -62653,7 +62684,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 50438, 50565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1665),
+            id: DeclarationId(1667),
             name: Some("port_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(830),
@@ -62672,11 +62703,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1662)),
+                        FieldValue::Reference(DeclarationId(1664)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                 ],
             }),
@@ -62685,7 +62716,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 50567, 50698),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1666),
+            id: DeclarationId(1668),
             name: Some("node_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(830),
@@ -62704,11 +62735,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
+                        FieldValue::Reference(DeclarationId(1665)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                 ],
             }),
@@ -62717,7 +62748,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 50700, 50831),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1667),
+            id: DeclarationId(1669),
             name: Some("resolve_producer_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(830),
@@ -62736,11 +62767,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1664)),
+                        FieldValue::Reference(DeclarationId(1666)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                 ],
             }),
@@ -62749,7 +62780,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 50833, 51000),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1668),
+            id: DeclarationId(1670),
             name: Some("rust_lane2_workflow_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(829),
@@ -62773,7 +62804,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 51511, 51640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1669),
+            id: DeclarationId(1671),
             name: Some("lane2_workflow_at_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(830),
@@ -62792,11 +62823,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1668)),
+                        FieldValue::Reference(DeclarationId(1670)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                 ],
             }),
@@ -62805,7 +62836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 51642, 51809),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1670),
+            id: DeclarationId(1672),
             name: Some("rust_workflow_root_port_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(829),
@@ -62829,7 +62860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 52504, 52618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1671),
+            id: DeclarationId(1673),
             name: Some("workflow_root_port_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(830),
@@ -62848,11 +62879,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1670)),
+                        FieldValue::Reference(DeclarationId(1672)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                 ],
             }),
@@ -62861,7 +62892,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 52620, 52793),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1672),
+            id: DeclarationId(1674),
             name: Some("rust_workflow_root".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1016),
@@ -62876,7 +62907,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                     (
                         "target".to_string(),
@@ -62902,7 +62933,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 53205, 53366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1673),
+            id: DeclarationId(1675),
             name: Some("rust_declaration_by_id_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(829),
@@ -62926,7 +62957,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 53693, 53816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1674),
+            id: DeclarationId(1676),
             name: Some("declaration_by_id_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(830),
@@ -62945,11 +62976,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1673)),
+                        FieldValue::Reference(DeclarationId(1675)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                 ],
             }),
@@ -62958,7 +62989,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 53818, 53988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1675),
+            id: DeclarationId(1677),
             name: Some("rust_declaration_by_name_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(829),
@@ -62982,7 +63013,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 54335, 54464),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1676),
+            id: DeclarationId(1678),
             name: Some("declaration_by_name_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(830),
@@ -63001,11 +63032,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1675)),
+                        FieldValue::Reference(DeclarationId(1677)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                 ],
             }),
@@ -63014,7 +63045,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 54466, 54642),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1677),
+            id: DeclarationId(1679),
             name: Some("rust_per_call_pattern_at_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(829),
@@ -63038,7 +63069,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 54862, 54982),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1678),
+            id: DeclarationId(1680),
             name: Some("per_call_pattern_at_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(830),
@@ -63057,11 +63088,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1677)),
+                        FieldValue::Reference(DeclarationId(1679)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                 ],
             }),
@@ -63070,7 +63101,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 54984, 55160),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1679),
+            id: DeclarationId(1681),
             name: Some("rust_per_call_descent_operand_port_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(829),
@@ -63094,7 +63125,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 55346, 55486),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1680),
+            id: DeclarationId(1682),
             name: Some("per_call_descent_operand_port_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(830),
@@ -63113,11 +63144,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1679)),
+                        FieldValue::Reference(DeclarationId(1681)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1658)),
+                        FieldValue::Reference(DeclarationId(1660)),
                     ),
                 ],
             }),
@@ -63126,7 +63157,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 55488, 55694),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1681),
+            id: DeclarationId(1683),
             name: Some("CompilerHostRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63145,21 +63176,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 453, 502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1682),
+            id: DeclarationId(1684),
             name: Some("PipelineSnapshotKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "SnapshotSurface".to_string(),
-                        ty: DeclarationId(2760),
+                        ty: DeclarationId(2762),
                     },
                     Field {
                         label: "SnapshotDag".to_string(),
-                        ty: DeclarationId(2761),
+                        ty: DeclarationId(2763),
                     },
                     Field {
                         label: "SnapshotText".to_string(),
-                        ty: DeclarationId(2762),
+                        ty: DeclarationId(2764),
                     },
                 ],
             },
@@ -63174,21 +63205,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 504, 576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1683),
+            id: DeclarationId(1685),
             name: Some("PipelineStageBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "stage".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "realization".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "snapshot".to_string(),
-                        ty: DeclarationId(1682),
+                        ty: DeclarationId(1684),
                     },
                 ],
             },
@@ -63203,7 +63234,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 578, 694),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1684),
+            id: DeclarationId(1686),
             name: Some("parse_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63213,7 +63244,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1681)),
+            meta_tag: Some(DeclarationId(1683)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -63227,7 +63258,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 696, 780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1685),
+            id: DeclarationId(1687),
             name: Some("lower_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63237,7 +63268,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1681)),
+            meta_tag: Some(DeclarationId(1683)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -63251,7 +63282,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 782, 866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1686),
+            id: DeclarationId(1688),
             name: Some("infer_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63261,7 +63292,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1681)),
+            meta_tag: Some(DeclarationId(1683)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -63275,7 +63306,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 868, 952),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1687),
+            id: DeclarationId(1689),
             name: Some("compute_ownership_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63285,7 +63316,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1681)),
+            meta_tag: Some(DeclarationId(1683)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -63301,7 +63332,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 954, 1062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1688),
+            id: DeclarationId(1690),
             name: Some("emit_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63311,7 +63342,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1681)),
+            meta_tag: Some(DeclarationId(1683)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -63325,7 +63356,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1064, 1146),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1689),
+            id: DeclarationId(1691),
             name: Some("lens_complexity_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63335,7 +63366,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1681)),
+            meta_tag: Some(DeclarationId(1683)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -63351,31 +63382,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1148, 1252),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1690),
+            id: DeclarationId(1692),
             name: Some("parse_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1683),
+                template: DeclarationId(1685),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1683)),
+            meta_tag: Some(DeclarationId(1685)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1696)),
+                        FieldValue::Reference(DeclarationId(1698)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1684)),
+                        FieldValue::Reference(DeclarationId(1686)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2760),
+                            constructor: DeclarationId(2762),
                             payload: vec![],
                         },
                     ),
@@ -63386,31 +63417,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1254, 1382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1691),
+            id: DeclarationId(1693),
             name: Some("lower_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1683),
+                template: DeclarationId(1685),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1683)),
+            meta_tag: Some(DeclarationId(1685)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1697)),
+                        FieldValue::Reference(DeclarationId(1699)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1685)),
+                        FieldValue::Reference(DeclarationId(1687)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2761),
+                            constructor: DeclarationId(2763),
                             payload: vec![],
                         },
                     ),
@@ -63421,31 +63452,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1384, 1508),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1692),
+            id: DeclarationId(1694),
             name: Some("infer_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1683),
+                template: DeclarationId(1685),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1683)),
+            meta_tag: Some(DeclarationId(1685)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1698)),
+                        FieldValue::Reference(DeclarationId(1700)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1686)),
+                        FieldValue::Reference(DeclarationId(1688)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2761),
+                            constructor: DeclarationId(2763),
                             payload: vec![],
                         },
                     ),
@@ -63456,31 +63487,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1510, 1634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1693),
+            id: DeclarationId(1695),
             name: Some("compute_ownership_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1683),
+                template: DeclarationId(1685),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1683)),
+            meta_tag: Some(DeclarationId(1685)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1699)),
+                        FieldValue::Reference(DeclarationId(1701)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1687)),
+                        FieldValue::Reference(DeclarationId(1689)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2761),
+                            constructor: DeclarationId(2763),
                             payload: vec![],
                         },
                     ),
@@ -63491,31 +63522,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1636, 1796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1694),
+            id: DeclarationId(1696),
             name: Some("lens_complexity_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1683),
+                template: DeclarationId(1685),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1683)),
+            meta_tag: Some(DeclarationId(1685)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1700)),
+                        FieldValue::Reference(DeclarationId(1702)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1689)),
+                        FieldValue::Reference(DeclarationId(1691)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2761),
+                            constructor: DeclarationId(2763),
                             payload: vec![],
                         },
                     ),
@@ -63526,31 +63557,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1798, 1952),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1695),
+            id: DeclarationId(1697),
             name: Some("emit_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1683),
+                template: DeclarationId(1685),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1683)),
+            meta_tag: Some(DeclarationId(1685)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1701)),
+                        FieldValue::Reference(DeclarationId(1703)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1688)),
+                        FieldValue::Reference(DeclarationId(1690)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2762),
+                            constructor: DeclarationId(2764),
                             payload: vec![],
                         },
                     ),
@@ -63561,12 +63592,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1954, 2076),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1696),
+            id: DeclarationId(1698),
             name: Some("parse".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230), DeclarationId(230)],
                 output: DeclarationId(828),
-                body: ArrowBody::ExternalRealization(DeclarationId(1684)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1686)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -63579,12 +63610,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2078, 2140),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1697),
+            id: DeclarationId(1699),
             name: Some("lower".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828)],
                 output: DeclarationId(828),
-                body: ArrowBody::ExternalRealization(DeclarationId(1685)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1687)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -63597,12 +63628,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2142, 2184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1698),
+            id: DeclarationId(1700),
             name: Some("infer".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828)],
                 output: DeclarationId(828),
-                body: ArrowBody::ExternalRealization(DeclarationId(1686)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1688)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -63615,12 +63646,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2186, 2228),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1699),
+            id: DeclarationId(1701),
             name: Some("compute_ownership".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828)],
                 output: DeclarationId(828),
-                body: ArrowBody::ExternalRealization(DeclarationId(1687)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1689)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -63633,12 +63664,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2230, 2288),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1700),
+            id: DeclarationId(1702),
             name: Some("lens_complexity".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828)],
                 output: DeclarationId(828),
-                body: ArrowBody::ExternalRealization(DeclarationId(1689)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1691)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -63651,7 +63682,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2290, 2347),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1701),
+            id: DeclarationId(1703),
             name: Some("emit".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
@@ -63661,7 +63692,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     DeclarationId(1051),
                 ],
                 output: DeclarationId(230),
-                body: ArrowBody::ExternalRealization(DeclarationId(1688)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1690)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -63674,7 +63705,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2349, 2460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1702),
+            id: DeclarationId(1704),
             name: Some("compile".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230), DeclarationId(230), DeclarationId(1051)],
@@ -63696,11 +63727,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2462, 2605),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1703),
+            id: DeclarationId(1705),
             name: Some("from_symbol".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230)],
-                output: DeclarationId(2763),
+                output: DeclarationId(2765),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/compiler/operators.dag",
                     156,
@@ -63718,7 +63749,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 108, 771),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1704),
+            id: DeclarationId(1706),
             name: Some("symbol".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(806)],
@@ -63736,7 +63767,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 773, 1214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1705),
+            id: DeclarationId(1707),
             name: Some("algebra_field_name".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(806)],
@@ -63754,7 +63785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1216, 2017),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1706),
+            id: DeclarationId(1708),
             name: Some("LensRegistryEntry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -63783,15 +63814,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2117, 2212),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1707),
+            id: DeclarationId(1709),
             name: Some("lens_cost_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1706),
+                template: DeclarationId(1708),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1706)),
+            meta_tag: Some(DeclarationId(1708)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -63819,15 +63850,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2214, 2387),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1708),
+            id: DeclarationId(1710),
             name: Some("lens_cost_symbolic_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1706),
+                template: DeclarationId(1708),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1706)),
+            meta_tag: Some(DeclarationId(1708)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -63855,15 +63886,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2389, 2577),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1709),
+            id: DeclarationId(1711),
             name: Some("lens_cost_target_realization_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1706),
+                template: DeclarationId(1708),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1706)),
+            meta_tag: Some(DeclarationId(1708)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -63894,15 +63925,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2579, 2816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1710),
+            id: DeclarationId(1712),
             name: Some("lens_effect_enumeration_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1706),
+                template: DeclarationId(1708),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1706)),
+            meta_tag: Some(DeclarationId(1708)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -63930,15 +63961,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2818, 3035),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1711),
+            id: DeclarationId(1713),
             name: Some("lens_parallelism_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1706),
+                template: DeclarationId(1708),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1706)),
+            meta_tag: Some(DeclarationId(1708)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -63966,15 +63997,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 3037, 3226),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1712),
+            id: DeclarationId(1714),
             name: Some("lens_provenance_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1706),
+                template: DeclarationId(1708),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1706)),
+            meta_tag: Some(DeclarationId(1708)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -64002,15 +64033,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 3228, 3413),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1713),
+            id: DeclarationId(1715),
             name: Some("lens_structural_resolution_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1706),
+                template: DeclarationId(1708),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1706)),
+            meta_tag: Some(DeclarationId(1708)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -64041,15 +64072,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 3415, 3644),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1714),
+            id: DeclarationId(1716),
             name: Some("lens_unused_parameters_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1706),
+                template: DeclarationId(1708),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1706)),
+            meta_tag: Some(DeclarationId(1708)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -64077,15 +64108,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 3646, 3859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1715),
+            id: DeclarationId(1717),
             name: Some("lens_infer_helpers_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1706),
+                template: DeclarationId(1708),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1706)),
+            meta_tag: Some(DeclarationId(1708)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -64113,15 +64144,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 4486, 4678),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1716),
+            id: DeclarationId(1718),
             name: Some("lens_variant_payload_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1706),
+                template: DeclarationId(1708),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1706)),
+            meta_tag: Some(DeclarationId(1708)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -64149,15 +64180,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 4680, 4880),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1717),
+            id: DeclarationId(1719),
             name: Some("lens_lower_helpers_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1706),
+                template: DeclarationId(1708),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1706)),
+            meta_tag: Some(DeclarationId(1708)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -64185,17 +64216,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 5130, 5322),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1718),
+            id: DeclarationId(1720),
             name: Some("IntegerAlgebra".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "OrderedRingAlgebra".to_string(),
-                        ty: DeclarationId(2764),
+                        ty: DeclarationId(2766),
                     },
                     Field {
                         label: "SemiringAlgebra".to_string(),
-                        ty: DeclarationId(2765),
+                        ty: DeclarationId(2767),
                     },
                 ],
             },
@@ -64210,21 +64241,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6404, 6466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1719),
+            id: DeclarationId(1721),
             name: Some("NonIntegerAlgebra".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ApproximateFieldAlgebra".to_string(),
-                        ty: DeclarationId(2766),
+                        ty: DeclarationId(2768),
                     },
                     Field {
                         label: "BooleanAlgebraAlgebra".to_string(),
-                        ty: DeclarationId(2767),
+                        ty: DeclarationId(2769),
                     },
                     Field {
                         label: "TerminalAlgebra".to_string(),
-                        ty: DeclarationId(2768),
+                        ty: DeclarationId(2770),
                     },
                 ],
             },
@@ -64239,37 +64270,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6468, 6564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1720),
+            id: DeclarationId(1722),
             name: Some("TargetCarrier".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BitCarrier".to_string(),
-                        ty: DeclarationId(2769),
+                        ty: DeclarationId(2771),
                     },
                     Field {
                         label: "ByteCarrier".to_string(),
-                        ty: DeclarationId(2770),
+                        ty: DeclarationId(2772),
                     },
                     Field {
                         label: "Word16Carrier".to_string(),
-                        ty: DeclarationId(2771),
+                        ty: DeclarationId(2773),
                     },
                     Field {
                         label: "Word32Carrier".to_string(),
-                        ty: DeclarationId(2772),
+                        ty: DeclarationId(2774),
                     },
                     Field {
                         label: "Word64Carrier".to_string(),
-                        ty: DeclarationId(2773),
+                        ty: DeclarationId(2775),
                     },
                     Field {
                         label: "Word128Carrier".to_string(),
-                        ty: DeclarationId(2774),
+                        ty: DeclarationId(2776),
                     },
                     Field {
                         label: "TerminalCarrier".to_string(),
-                        ty: DeclarationId(2775),
+                        ty: DeclarationId(2777),
                     },
                 ],
             },
@@ -64284,21 +64315,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8154, 8296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1721),
+            id: DeclarationId(1723),
             name: Some("IntegerOverflow".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TwoComplementWrap".to_string(),
-                        ty: DeclarationId(2776),
+                        ty: DeclarationId(2778),
                     },
                     Field {
                         label: "Saturating".to_string(),
-                        ty: DeclarationId(2777),
+                        ty: DeclarationId(2779),
                     },
                     Field {
                         label: "Trap".to_string(),
-                        ty: DeclarationId(2778),
+                        ty: DeclarationId(2780),
                     },
                 ],
             },
@@ -64313,17 +64344,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9013, 9079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1722),
+            id: DeclarationId(1724),
             name: Some("RustPrimitive".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IntegerPrimitive".to_string(),
-                        ty: DeclarationId(2779),
+                        ty: DeclarationId(2781),
                     },
                     Field {
                         label: "NonIntegerPrimitive".to_string(),
-                        ty: DeclarationId(2780),
+                        ty: DeclarationId(2782),
                     },
                 ],
             },
@@ -64338,94 +64369,94 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9834, 10616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1723),
+            id: DeclarationId(1725),
             name: Some("rust_pilot_primitives".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1722),
+                    value: DeclarationId(1724),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2781)),
+            meta_tag: Some(DeclarationId(2783)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
                 FieldValue::Variant {
-                    constructor: DeclarationId(2779),
+                    constructor: DeclarationId(2781),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2764),
+                            constructor: DeclarationId(2766),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2770),
+                            constructor: DeclarationId(2772),
                             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(2776),
+                            constructor: DeclarationId(2778),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2779),
+                    constructor: DeclarationId(2781),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2764),
+                            constructor: DeclarationId(2766),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2771),
+                            constructor: DeclarationId(2773),
                             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(2776),
+                            constructor: DeclarationId(2778),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2779),
+                    constructor: DeclarationId(2781),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2764),
+                            constructor: DeclarationId(2766),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2772),
+                            constructor: DeclarationId(2774),
                             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(2776),
+                            constructor: DeclarationId(2778),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2779),
+                    constructor: DeclarationId(2781),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2764),
+                            constructor: DeclarationId(2766),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2773),
+                            constructor: DeclarationId(2775),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -64434,21 +64465,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         FieldValue::Literal(LiteralBits::String("9223372036854775807".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2776),
+                            constructor: DeclarationId(2778),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2779),
+                    constructor: DeclarationId(2781),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i128".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2764),
+                            constructor: DeclarationId(2766),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2774),
+                            constructor: DeclarationId(2776),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -64459,84 +64490,84 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2776),
+                            constructor: DeclarationId(2778),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2779),
+                    constructor: DeclarationId(2781),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2765),
+                            constructor: DeclarationId(2767),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2770),
+                            constructor: DeclarationId(2772),
                             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(2776),
+                            constructor: DeclarationId(2778),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2779),
+                    constructor: DeclarationId(2781),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2765),
+                            constructor: DeclarationId(2767),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2771),
+                            constructor: DeclarationId(2773),
                             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(2776),
+                            constructor: DeclarationId(2778),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2779),
+                    constructor: DeclarationId(2781),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2765),
+                            constructor: DeclarationId(2767),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2772),
+                            constructor: DeclarationId(2774),
                             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(2776),
+                            constructor: DeclarationId(2778),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2779),
+                    constructor: DeclarationId(2781),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2765),
+                            constructor: DeclarationId(2767),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2773),
+                            constructor: DeclarationId(2775),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
@@ -64545,21 +64576,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2776),
+                            constructor: DeclarationId(2778),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2779),
+                    constructor: DeclarationId(2781),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u128".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2765),
+                            constructor: DeclarationId(2767),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2774),
+                            constructor: DeclarationId(2776),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
@@ -64568,66 +64599,66 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2776),
+                            constructor: DeclarationId(2778),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2780),
+                    constructor: DeclarationId(2782),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("f32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2766),
+                            constructor: DeclarationId(2768),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2772),
+                            constructor: DeclarationId(2774),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2780),
+                    constructor: DeclarationId(2782),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("f64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2766),
+                            constructor: DeclarationId(2768),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2773),
+                            constructor: DeclarationId(2775),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2780),
+                    constructor: DeclarationId(2782),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("bool".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2767),
+                            constructor: DeclarationId(2769),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2769),
+                            constructor: DeclarationId(2771),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2780),
+                    constructor: DeclarationId(2782),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("()".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2768),
+                            constructor: DeclarationId(2770),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2775),
+                            constructor: DeclarationId(2777),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
@@ -64639,29 +64670,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10937, 15660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1724),
+            id: DeclarationId(1726),
             name: Some("CronField".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Wildcard".to_string(),
-                        ty: DeclarationId(2782),
+                        ty: DeclarationId(2784),
                     },
                     Field {
                         label: "Exact".to_string(),
-                        ty: DeclarationId(2783),
+                        ty: DeclarationId(2785),
                     },
                     Field {
                         label: "Listed".to_string(),
-                        ty: DeclarationId(2785),
+                        ty: DeclarationId(2787),
                     },
                     Field {
                         label: "Ranged".to_string(),
-                        ty: DeclarationId(2786),
+                        ty: DeclarationId(2788),
                     },
                     Field {
                         label: "Step".to_string(),
-                        ty: DeclarationId(2787),
+                        ty: DeclarationId(2789),
                     },
                 ],
             },
@@ -64676,29 +64707,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4214, 4433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1725),
+            id: DeclarationId(1727),
             name: Some("CronSchedule".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "minute".to_string(),
-                        ty: DeclarationId(1724),
+                        ty: DeclarationId(1726),
                     },
                     Field {
                         label: "hour".to_string(),
-                        ty: DeclarationId(1724),
+                        ty: DeclarationId(1726),
                     },
                     Field {
                         label: "day_of_month".to_string(),
-                        ty: DeclarationId(1724),
+                        ty: DeclarationId(1726),
                     },
                     Field {
                         label: "month".to_string(),
-                        ty: DeclarationId(1724),
+                        ty: DeclarationId(1726),
                     },
                     Field {
                         label: "day_of_week".to_string(),
-                        ty: DeclarationId(1724),
+                        ty: DeclarationId(1726),
                     },
                 ],
             },
@@ -64713,7 +64744,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4435, 4564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1726),
+            id: DeclarationId(1728),
             name: Some("CronEntry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64723,7 +64754,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "schedule".to_string(),
-                        ty: DeclarationId(1725),
+                        ty: DeclarationId(1727),
                     },
                     Field {
                         label: "command".to_string(),
@@ -64742,10 +64773,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4566, 4641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1727),
+            id: DeclarationId(1729),
             name: Some("render_cron_field".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1724)],
+                inputs: vec![DeclarationId(1726)],
                 output: DeclarationId(230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "dsl/extdeps/cron_schedule_model.dag",
@@ -64764,10 +64795,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4643, 4963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1728),
+            id: DeclarationId(1730),
             name: Some("render_cron_schedule".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1725)],
+                inputs: vec![DeclarationId(1727)],
                 output: DeclarationId(230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "dsl/extdeps/cron_schedule_model.dag",
@@ -64786,7 +64817,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4965, 5253),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1729),
+            id: DeclarationId(1731),
             name: Some("wire_contract".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(312),
@@ -64807,21 +64838,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 684, 758),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1730),
+            id: DeclarationId(1732),
             name: Some("UserType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "User".to_string(),
-                        ty: DeclarationId(2788),
+                        ty: DeclarationId(2790),
                     },
                     Field {
                         label: "Bot".to_string(),
-                        ty: DeclarationId(2789),
+                        ty: DeclarationId(2791),
                     },
                     Field {
                         label: "Organization".to_string(),
-                        ty: DeclarationId(2790),
+                        ty: DeclarationId(2792),
                     },
                 ],
             },
@@ -64836,7 +64867,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 831, 872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1731),
+            id: DeclarationId(1733),
             name: Some("GitHubUser".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64850,7 +64881,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type".to_string(),
-                        ty: DeclarationId(1730),
+                        ty: DeclarationId(1732),
                     },
                 ],
             },
@@ -64865,7 +64896,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 874, 936),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1732),
+            id: DeclarationId(1734),
             name: Some("Repository".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64902,7 +64933,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1009, 1120),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1733),
+            id: DeclarationId(1735),
             name: Some("GitHubAuthToken".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64912,11 +64943,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "scopes".to_string(),
-                        ty: DeclarationId(2791),
+                        ty: DeclarationId(2793),
                     },
                     Field {
                         label: "expires_at".to_string(),
-                        ty: DeclarationId(2792),
+                        ty: DeclarationId(2794),
                     },
                 ],
             },
@@ -64931,29 +64962,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1193, 1286),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1734),
+            id: DeclarationId(1736),
             name: Some("GitHubScope".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ScopeRepo".to_string(),
-                        ty: DeclarationId(2793),
+                        ty: DeclarationId(2795),
                     },
                     Field {
                         label: "ScopeGist".to_string(),
-                        ty: DeclarationId(2794),
+                        ty: DeclarationId(2796),
                     },
                     Field {
                         label: "ScopeWorkflow".to_string(),
-                        ty: DeclarationId(2795),
+                        ty: DeclarationId(2797),
                     },
                     Field {
                         label: "ScopeReadOrg".to_string(),
-                        ty: DeclarationId(2796),
+                        ty: DeclarationId(2798),
                     },
                     Field {
                         label: "ScopeReadUser".to_string(),
-                        ty: DeclarationId(2797),
+                        ty: DeclarationId(2799),
                     },
                 ],
             },
@@ -64968,7 +64999,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1288, 1385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1735),
+            id: DeclarationId(1737),
             name: Some("Pagination".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64978,7 +65009,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "cursor".to_string(),
-                        ty: DeclarationId(2798),
+                        ty: DeclarationId(2800),
                     },
                     Field {
                         label: "has_next".to_string(),
@@ -64997,21 +65028,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1510, 1580),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1736),
+            id: DeclarationId(1738),
             name: Some("GitHubPermission".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PermRead".to_string(),
-                        ty: DeclarationId(2799),
+                        ty: DeclarationId(2801),
                     },
                     Field {
                         label: "PermWrite".to_string(),
-                        ty: DeclarationId(2800),
+                        ty: DeclarationId(2802),
                     },
                     Field {
                         label: "PermAdmin".to_string(),
-                        ty: DeclarationId(2801),
+                        ty: DeclarationId(2803),
                     },
                 ],
             },
@@ -65026,7 +65057,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1653, 1709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1737),
+            id: DeclarationId(1739),
             name: Some("default_api_base".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65045,7 +65076,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1782, 1838),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1738),
+            id: DeclarationId(1740),
             name: Some("default_per_page".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -65062,7 +65093,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1840, 1871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1739),
+            id: DeclarationId(1741),
             name: Some("max_per_page".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -65079,7 +65110,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1873, 1901),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1740),
+            id: DeclarationId(1742),
             name: Some("Workflow".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65089,23 +65120,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "on".to_string(),
-                        ty: DeclarationId(2802),
+                        ty: DeclarationId(2804),
                     },
                     Field {
                         label: "concurrency".to_string(),
-                        ty: DeclarationId(2803),
+                        ty: DeclarationId(2805),
                     },
                     Field {
                         label: "jobs".to_string(),
-                        ty: DeclarationId(2804),
+                        ty: DeclarationId(2806),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(2806),
+                        ty: DeclarationId(2808),
                     },
                     Field {
                         label: "permissions".to_string(),
-                        ty: DeclarationId(2807),
+                        ty: DeclarationId(2809),
                     },
                 ],
             },
@@ -65120,25 +65151,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1484, 1748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1741),
+            id: DeclarationId(1743),
             name: Some("WorkflowPermissions".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "contents".to_string(),
-                        ty: DeclarationId(1742),
+                        ty: DeclarationId(1744),
                     },
                     Field {
                         label: "pull_requests".to_string(),
-                        ty: DeclarationId(1742),
+                        ty: DeclarationId(1744),
                     },
                     Field {
                         label: "issues".to_string(),
-                        ty: DeclarationId(1742),
+                        ty: DeclarationId(1744),
                     },
                     Field {
                         label: "actions".to_string(),
-                        ty: DeclarationId(1742),
+                        ty: DeclarationId(1744),
                     },
                 ],
             },
@@ -65153,21 +65184,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1750, 1892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1742),
+            id: DeclarationId(1744),
             name: Some("PermissionLevel".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PermRead".to_string(),
-                        ty: DeclarationId(2808),
+                        ty: DeclarationId(2810),
                     },
                     Field {
                         label: "PermWrite".to_string(),
-                        ty: DeclarationId(2809),
+                        ty: DeclarationId(2811),
                     },
                     Field {
                         label: "PermNone".to_string(),
-                        ty: DeclarationId(2810),
+                        ty: DeclarationId(2812),
                     },
                 ],
             },
@@ -65182,29 +65213,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1894, 1948),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1743),
+            id: DeclarationId(1745),
             name: Some("WorkflowTrigger".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Push".to_string(),
-                        ty: DeclarationId(2813),
+                        ty: DeclarationId(2815),
                     },
                     Field {
                         label: "PullRequest".to_string(),
-                        ty: DeclarationId(2816),
+                        ty: DeclarationId(2818),
                     },
                     Field {
                         label: "Schedule".to_string(),
-                        ty: DeclarationId(2817),
+                        ty: DeclarationId(2819),
                     },
                     Field {
                         label: "WorkflowDispatch".to_string(),
-                        ty: DeclarationId(2819),
+                        ty: DeclarationId(2821),
                     },
                     Field {
                         label: "WorkflowCall".to_string(),
-                        ty: DeclarationId(2821),
+                        ty: DeclarationId(2823),
                     },
                 ],
             },
@@ -65219,29 +65250,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2064, 2356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1744),
+            id: DeclarationId(1746),
             name: Some("PullRequestActivity".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Opened".to_string(),
-                        ty: DeclarationId(2822),
+                        ty: DeclarationId(2824),
                     },
                     Field {
                         label: "Synchronize".to_string(),
-                        ty: DeclarationId(2823),
+                        ty: DeclarationId(2825),
                     },
                     Field {
                         label: "Reopened".to_string(),
-                        ty: DeclarationId(2824),
+                        ty: DeclarationId(2826),
                     },
                     Field {
                         label: "ReadyForReview".to_string(),
-                        ty: DeclarationId(2825),
+                        ty: DeclarationId(2827),
                     },
                     Field {
                         label: "Closed".to_string(),
-                        ty: DeclarationId(2826),
+                        ty: DeclarationId(2828),
                     },
                 ],
             },
@@ -65256,7 +65287,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2358, 2452),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1745),
+            id: DeclarationId(1747),
             name: Some("DispatchInput".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65266,7 +65297,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "description".to_string(),
-                        ty: DeclarationId(2827),
+                        ty: DeclarationId(2829),
                     },
                     Field {
                         label: "required".to_string(),
@@ -65274,11 +65305,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "default".to_string(),
-                        ty: DeclarationId(2828),
+                        ty: DeclarationId(2830),
                     },
                     Field {
                         label: "type".to_string(),
-                        ty: DeclarationId(1746),
+                        ty: DeclarationId(1748),
                     },
                 ],
             },
@@ -65293,25 +65324,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2454, 2576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1746),
+            id: DeclarationId(1748),
             name: Some("DispatchInputType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "InputString".to_string(),
-                        ty: DeclarationId(2829),
+                        ty: DeclarationId(2831),
                     },
                     Field {
                         label: "InputBoolean".to_string(),
-                        ty: DeclarationId(2830),
+                        ty: DeclarationId(2832),
                     },
                     Field {
                         label: "InputChoice".to_string(),
-                        ty: DeclarationId(2831),
+                        ty: DeclarationId(2833),
                     },
                     Field {
                         label: "InputEnvironment".to_string(),
-                        ty: DeclarationId(2832),
+                        ty: DeclarationId(2834),
                     },
                 ],
             },
@@ -65326,21 +65357,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2578, 2662),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1747),
+            id: DeclarationId(1749),
             name: Some("SecretScope".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "StepScope".to_string(),
-                        ty: DeclarationId(2833),
+                        ty: DeclarationId(2835),
                     },
                     Field {
                         label: "JobScope".to_string(),
-                        ty: DeclarationId(2834),
+                        ty: DeclarationId(2836),
                     },
                     Field {
                         label: "WorkflowScope".to_string(),
-                        ty: DeclarationId(2835),
+                        ty: DeclarationId(2837),
                     },
                 ],
             },
@@ -65355,7 +65386,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4765, 4820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1748),
+            id: DeclarationId(1750),
             name: Some("WorkflowSecret".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65365,7 +65396,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "scope".to_string(),
-                        ty: DeclarationId(1747),
+                        ty: DeclarationId(1749),
                     },
                 ],
             },
@@ -65380,7 +65411,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5095, 5158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1749),
+            id: DeclarationId(1751),
             name: Some("Job".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65390,39 +65421,39 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(2836),
+                        ty: DeclarationId(2838),
                     },
                     Field {
                         label: "runner".to_string(),
-                        ty: DeclarationId(1753),
+                        ty: DeclarationId(1755),
                     },
                     Field {
                         label: "steps".to_string(),
-                        ty: DeclarationId(2837),
+                        ty: DeclarationId(2839),
                     },
                     Field {
                         label: "needs".to_string(),
-                        ty: DeclarationId(2838),
+                        ty: DeclarationId(2840),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(2840),
+                        ty: DeclarationId(2842),
                     },
                     Field {
                         label: "outputs".to_string(),
-                        ty: DeclarationId(2842),
+                        ty: DeclarationId(2844),
                     },
                     Field {
                         label: "if_condition".to_string(),
-                        ty: DeclarationId(2843),
+                        ty: DeclarationId(2845),
                     },
                     Field {
                         label: "strategy".to_string(),
-                        ty: DeclarationId(2844),
+                        ty: DeclarationId(2846),
                     },
                     Field {
                         label: "timeout_minutes".to_string(),
-                        ty: DeclarationId(2845),
+                        ty: DeclarationId(2847),
                     },
                     Field {
                         label: "continue_on_error".to_string(),
@@ -65430,7 +65461,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "concurrency".to_string(),
-                        ty: DeclarationId(2846),
+                        ty: DeclarationId(2848),
                     },
                 ],
             },
@@ -65445,17 +65476,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5302, 5771),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1750),
+            id: DeclarationId(1752),
             name: Some("CancelInProgressSpec".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "CancelInProgressBool".to_string(),
-                        ty: DeclarationId(2847),
+                        ty: DeclarationId(2849),
                     },
                     Field {
                         label: "CancelInProgressExpression".to_string(),
-                        ty: DeclarationId(2848),
+                        ty: DeclarationId(2850),
                     },
                 ],
             },
@@ -65470,17 +65501,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6589, 6709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1751),
+            id: DeclarationId(1753),
             name: Some("CancelInProgressWhenQueueMax".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "QueueMaxCancelInProgressFalse".to_string(),
-                        ty: DeclarationId(2849),
+                        ty: DeclarationId(2851),
                     },
                     Field {
                         label: "QueueMaxCancelInProgressExpression".to_string(),
-                        ty: DeclarationId(2850),
+                        ty: DeclarationId(2852),
                     },
                 ],
             },
@@ -65495,21 +65526,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7517, 7646),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1752),
+            id: DeclarationId(1754),
             name: Some("ConcurrencySpec".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ConcurrencyScalar".to_string(),
-                        ty: DeclarationId(2851),
+                        ty: DeclarationId(2853),
                     },
                     Field {
                         label: "ConcurrencyMappingQueueMax".to_string(),
-                        ty: DeclarationId(2853),
+                        ty: DeclarationId(2855),
                     },
                     Field {
                         label: "ConcurrencyMappingQueueNotMax".to_string(),
-                        ty: DeclarationId(2856),
+                        ty: DeclarationId(2858),
                     },
                 ],
             },
@@ -65524,21 +65555,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8199, 8845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1753),
+            id: DeclarationId(1755),
             name: Some("RunnerSpec".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "HostedRunner".to_string(),
-                        ty: DeclarationId(2857),
+                        ty: DeclarationId(2859),
                     },
                     Field {
                         label: "SelfHosted".to_string(),
-                        ty: DeclarationId(2859),
+                        ty: DeclarationId(2861),
                     },
                     Field {
                         label: "RunsOnExpression".to_string(),
-                        ty: DeclarationId(2860),
+                        ty: DeclarationId(2862),
                     },
                 ],
             },
@@ -65553,33 +65584,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10017, 10240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1754),
+            id: DeclarationId(1756),
             name: Some("RunnerLabel".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "UbuntuLatest".to_string(),
-                        ty: DeclarationId(2861),
+                        ty: DeclarationId(2863),
                     },
                     Field {
                         label: "Ubuntu2404".to_string(),
-                        ty: DeclarationId(2862),
+                        ty: DeclarationId(2864),
                     },
                     Field {
                         label: "Ubuntu2204".to_string(),
-                        ty: DeclarationId(2863),
+                        ty: DeclarationId(2865),
                     },
                     Field {
                         label: "MacosLatest".to_string(),
-                        ty: DeclarationId(2864),
+                        ty: DeclarationId(2866),
                     },
                     Field {
                         label: "Macos14".to_string(),
-                        ty: DeclarationId(2865),
+                        ty: DeclarationId(2867),
                     },
                     Field {
                         label: "WindowsLatest".to_string(),
-                        ty: DeclarationId(2866),
+                        ty: DeclarationId(2868),
                     },
                 ],
             },
@@ -65594,17 +65625,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10242, 10351),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1755),
+            id: DeclarationId(1757),
             name: Some("Step".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "RunStep".to_string(),
-                        ty: DeclarationId(2874),
+                        ty: DeclarationId(2876),
                     },
                     Field {
                         label: "UsesStep".to_string(),
-                        ty: DeclarationId(2883),
+                        ty: DeclarationId(2885),
                     },
                 ],
             },
@@ -65619,29 +65650,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10496, 11091),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1756),
+            id: DeclarationId(1758),
             name: Some("ShellType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Bash".to_string(),
-                        ty: DeclarationId(2884),
+                        ty: DeclarationId(2886),
                     },
                     Field {
                         label: "Sh".to_string(),
-                        ty: DeclarationId(2885),
+                        ty: DeclarationId(2887),
                     },
                     Field {
                         label: "Pwsh".to_string(),
-                        ty: DeclarationId(2886),
+                        ty: DeclarationId(2888),
                     },
                     Field {
                         label: "Python".to_string(),
-                        ty: DeclarationId(2887),
+                        ty: DeclarationId(2889),
                     },
                     Field {
                         label: "Cmd".to_string(),
-                        ty: DeclarationId(2888),
+                        ty: DeclarationId(2890),
                     },
                 ],
             },
@@ -65656,7 +65687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11093, 11141),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1757),
+            id: DeclarationId(1759),
             name: Some("ActionRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65685,41 +65716,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11143, 11206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1758),
+            id: DeclarationId(1760),
             name: Some("LogAnnotation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "AnnotationError".to_string(),
-                        ty: DeclarationId(2892),
+                        ty: DeclarationId(2894),
                     },
                     Field {
                         label: "AnnotationWarning".to_string(),
-                        ty: DeclarationId(2896),
+                        ty: DeclarationId(2898),
                     },
                     Field {
                         label: "AnnotationNotice".to_string(),
-                        ty: DeclarationId(2900),
+                        ty: DeclarationId(2902),
                     },
                     Field {
                         label: "AnnotationGroup".to_string(),
-                        ty: DeclarationId(2901),
+                        ty: DeclarationId(2903),
                     },
                     Field {
                         label: "AnnotationEndGroup".to_string(),
-                        ty: DeclarationId(2902),
+                        ty: DeclarationId(2904),
                     },
                     Field {
                         label: "SetOutput".to_string(),
-                        ty: DeclarationId(2903),
+                        ty: DeclarationId(2905),
                     },
                     Field {
                         label: "AddMask".to_string(),
-                        ty: DeclarationId(2904),
+                        ty: DeclarationId(2906),
                     },
                     Field {
                         label: "StopCommands".to_string(),
-                        ty: DeclarationId(2905),
+                        ty: DeclarationId(2907),
                     },
                 ],
             },
@@ -65734,7 +65765,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11440, 11867),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1759),
+            id: DeclarationId(1761),
             name: Some("annotation_error_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65753,7 +65784,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11933, 11982),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1760),
+            id: DeclarationId(1762),
             name: Some("annotation_warning_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65772,7 +65803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11983, 12036),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1761),
+            id: DeclarationId(1763),
             name: Some("annotation_notice_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65791,7 +65822,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12037, 12088),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1762),
+            id: DeclarationId(1764),
             name: Some("annotation_group_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65810,7 +65841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12089, 12139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1763),
+            id: DeclarationId(1765),
             name: Some("annotation_endgroup".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65829,7 +65860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12140, 12189),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1764),
+            id: DeclarationId(1766),
             name: Some("annotation_set_output_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65848,7 +65879,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12190, 12254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1765),
+            id: DeclarationId(1767),
             name: Some("annotation_add_mask_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65867,7 +65898,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12255, 12311),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1766),
+            id: DeclarationId(1768),
             name: Some("annotation_stop_commands_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65886,17 +65917,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12312, 12378),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1767),
+            id: DeclarationId(1769),
             name: Some("ArtifactOp".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Upload".to_string(),
-                        ty: DeclarationId(2907),
+                        ty: DeclarationId(2909),
                     },
                     Field {
                         label: "Download".to_string(),
-                        ty: DeclarationId(2909),
+                        ty: DeclarationId(2911),
                     },
                 ],
             },
@@ -65911,21 +65942,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12600, 12765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1768),
+            id: DeclarationId(1770),
             name: Some("MissingFilesBehavior".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Warn".to_string(),
-                        ty: DeclarationId(2910),
+                        ty: DeclarationId(2912),
                     },
                     Field {
                         label: "ErrorOut".to_string(),
-                        ty: DeclarationId(2911),
+                        ty: DeclarationId(2913),
                     },
                     Field {
                         label: "Ignore".to_string(),
-                        ty: DeclarationId(2912),
+                        ty: DeclarationId(2914),
                     },
                 ],
             },
@@ -65940,15 +65971,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12767, 12819),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1769),
+            id: DeclarationId(1771),
             name: Some("upload_artifact_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1757),
+                template: DeclarationId(1759),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1757)),
+            meta_tag: Some(DeclarationId(1759)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -65961,15 +65992,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12870, 12979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1770),
+            id: DeclarationId(1772),
             name: Some("download_artifact_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1757),
+                template: DeclarationId(1759),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1757)),
+            meta_tag: Some(DeclarationId(1759)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -65982,21 +66013,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12981, 13094),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1771),
+            id: DeclarationId(1773),
             name: Some("MatrixStrategy".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "dimensions".to_string(),
-                        ty: DeclarationId(2914),
+                        ty: DeclarationId(2916),
                     },
                     Field {
                         label: "include".to_string(),
-                        ty: DeclarationId(2916),
+                        ty: DeclarationId(2918),
                     },
                     Field {
                         label: "exclude".to_string(),
-                        ty: DeclarationId(2918),
+                        ty: DeclarationId(2920),
                     },
                     Field {
                         label: "fail_fast".to_string(),
@@ -66004,7 +66035,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "max_parallel".to_string(),
-                        ty: DeclarationId(2919),
+                        ty: DeclarationId(2921),
                     },
                 ],
             },
@@ -66019,33 +66050,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13233, 13409),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1772),
+            id: DeclarationId(1774),
             name: Some("CheckConclusion".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Success".to_string(),
-                        ty: DeclarationId(2920),
+                        ty: DeclarationId(2922),
                     },
                     Field {
                         label: "Failure".to_string(),
-                        ty: DeclarationId(2921),
+                        ty: DeclarationId(2923),
                     },
                     Field {
                         label: "Cancelled".to_string(),
-                        ty: DeclarationId(2922),
+                        ty: DeclarationId(2924),
                     },
                     Field {
                         label: "Skipped".to_string(),
-                        ty: DeclarationId(2923),
+                        ty: DeclarationId(2925),
                     },
                     Field {
                         label: "TimedOut".to_string(),
-                        ty: DeclarationId(2924),
+                        ty: DeclarationId(2926),
                     },
                     Field {
                         label: "ActionRequired".to_string(),
-                        ty: DeclarationId(2925),
+                        ty: DeclarationId(2927),
                     },
                 ],
             },
@@ -66060,15 +66091,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13538, 13640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1773),
+            id: DeclarationId(1775),
             name: Some("checkout_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1757),
+                template: DeclarationId(1759),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1757)),
+            meta_tag: Some(DeclarationId(1759)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -66081,15 +66112,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13766, 13861),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1774),
+            id: DeclarationId(1776),
             name: Some("setup_rust_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1757),
+                template: DeclarationId(1759),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1757)),
+            meta_tag: Some(DeclarationId(1759)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -66102,15 +66133,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13863, 13987),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1775),
+            id: DeclarationId(1777),
             name: Some("cache_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1757),
+                template: DeclarationId(1759),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1757)),
+            meta_tag: Some(DeclarationId(1759)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -66123,7 +66154,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13989, 14078),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1776),
+            id: DeclarationId(1778),
             name: Some("max_job_timeout_minutes".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -66140,7 +66171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14154, 14193),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1777),
+            id: DeclarationId(1779),
             name: Some("default_job_timeout_minutes".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -66157,7 +66188,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14195, 14238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1778),
+            id: DeclarationId(1780),
             name: Some("max_matrix_combinations".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -66174,7 +66205,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14240, 14279),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1779),
+            id: DeclarationId(1781),
             name: Some("github_actions_workflows_dir".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -66193,17 +66224,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1207, 1270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1780),
+            id: DeclarationId(1782),
             name: Some("GitHubActionsWorkflowExtension".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "GitHubActionsWorkflowYml".to_string(),
-                        ty: DeclarationId(2926),
+                        ty: DeclarationId(2928),
                     },
                     Field {
                         label: "GitHubActionsWorkflowYaml".to_string(),
-                        ty: DeclarationId(2927),
+                        ty: DeclarationId(2929),
                     },
                 ],
             },
@@ -66218,7 +66249,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1895, 1989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1781),
+            id: DeclarationId(1783),
             name: Some("GitHubActionsWorkflowStemSegment".to_string()),
             connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
@@ -66227,17 +66258,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(2928)),
+            refinement: Some(DeclarationId(2930)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2615, 2714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1782),
+            id: DeclarationId(1784),
             name: Some("GitHubActionsWorkflowStem".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "segment".to_string(),
-                    ty: DeclarationId(1781),
+                    ty: DeclarationId(1783),
                 }],
             },
             type_params: vec![],
@@ -66251,17 +66282,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2916, 2994),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1783),
+            id: DeclarationId(1785),
             name: Some("GitHubActionsWorkflowFileRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "stem".to_string(),
-                        ty: DeclarationId(1782),
+                        ty: DeclarationId(1784),
                     },
                     Field {
                         label: "extension".to_string(),
-                        ty: DeclarationId(1780),
+                        ty: DeclarationId(1782),
                     },
                 ],
             },
@@ -66276,7 +66307,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 3398, 3513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1784),
+            id: DeclarationId(1786),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66296,7 +66327,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3259, 3272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1785),
+            id: DeclarationId(1787),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66316,7 +66347,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3421, 3434),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1786),
+            id: DeclarationId(1788),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66336,7 +66367,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3439, 3452),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1787),
+            id: DeclarationId(1789),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66356,7 +66387,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3556, 3569),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1788),
+            id: DeclarationId(1790),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66376,7 +66407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4162, 4169),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1789),
+            id: DeclarationId(1791),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(695), DeclarationId(694)],
@@ -66394,7 +66425,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1790),
+            id: DeclarationId(1792),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66414,7 +66445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4617, 4624),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1791),
+            id: DeclarationId(1793),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(697), DeclarationId(698)],
@@ -66432,7 +66463,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4638, 4651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1792),
+            id: DeclarationId(1794),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66452,7 +66483,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5336, 5349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1793),
+            id: DeclarationId(1795),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66472,7 +66503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5354, 5367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1794),
+            id: DeclarationId(1796),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66492,7 +66523,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5372, 5385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1795),
+            id: DeclarationId(1797),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66512,7 +66543,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5686, 5693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1796),
+            id: DeclarationId(1798),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(702)],
@@ -66530,7 +66561,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5698, 5708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1797),
+            id: DeclarationId(1799),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66550,7 +66581,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5713, 5720),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1798),
+            id: DeclarationId(1800),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66570,7 +66601,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5867, 5874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1799),
+            id: DeclarationId(1801),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(705)],
@@ -66588,7 +66619,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1800),
+            id: DeclarationId(1802),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66608,7 +66639,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5897, 5904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1801),
+            id: DeclarationId(1803),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66628,7 +66659,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6130, 6137),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1802),
+            id: DeclarationId(1804),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66648,11 +66679,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6151, 6158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1803),
+            id: DeclarationId(1805),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(707)],
-                output: DeclarationId(1802),
+                output: DeclarationId(1804),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -66666,7 +66697,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6142, 6158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1804),
+            id: DeclarationId(1806),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66686,7 +66717,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6163, 6170),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1805),
+            id: DeclarationId(1807),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66706,7 +66737,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6356, 6363),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1806),
+            id: DeclarationId(1808),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66726,7 +66757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6588, 6595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1807),
+            id: DeclarationId(1809),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66746,7 +66777,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7202, 7209),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1808),
+            id: DeclarationId(1810),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(713),
@@ -66766,13 +66797,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7219, 7236),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1809),
+            id: DeclarationId(1811),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1808),
+                    value: DeclarationId(1810),
                 }],
             },
             type_params: vec![],
@@ -66786,7 +66817,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7214, 7237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1810),
+            id: DeclarationId(1812),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66806,7 +66837,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7415, 7422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1811),
+            id: DeclarationId(1813),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(713),
@@ -66826,13 +66857,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7444, 7461),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1812),
+            id: DeclarationId(1814),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1811),
+                    value: DeclarationId(1813),
                 }],
             },
             type_params: vec![],
@@ -66846,7 +66877,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7439, 7462),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1813),
+            id: DeclarationId(1815),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66866,7 +66897,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 8177, 8184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1814),
+            id: DeclarationId(1816),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66880,7 +66911,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 2106, 2111),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1815),
+            id: DeclarationId(1817),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66900,7 +66931,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 2144, 2157),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1816),
+            id: DeclarationId(1818),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -66910,7 +66941,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "tail".to_string(),
-                        ty: DeclarationId(1815),
+                        ty: DeclarationId(1817),
                     },
                 ],
             },
@@ -66925,7 +66956,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 2116, 2159),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1817),
+            id: DeclarationId(1819),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66945,7 +66976,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1477, 1490),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1818),
+            id: DeclarationId(1820),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66965,7 +66996,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1570, 1583),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1819),
+            id: DeclarationId(1821),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -66984,7 +67015,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1820),
+            id: DeclarationId(1822),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -67004,7 +67035,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20914, 20941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1821),
+            id: DeclarationId(1823),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(713),
@@ -67024,7 +67055,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20993, 21024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1822),
+            id: DeclarationId(1824),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -67044,11 +67075,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21056),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1823),
+            id: DeclarationId(1825),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1822),
+                    DeclarationId(1824),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -67063,7 +67094,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1824),
+            id: DeclarationId(1826),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67083,7 +67114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21183, 21204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1825),
+            id: DeclarationId(1827),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -67103,11 +67134,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21236),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1826),
+            id: DeclarationId(1828),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1825),
+                    DeclarationId(1827),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -67122,7 +67153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1827),
+            id: DeclarationId(1829),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67142,7 +67173,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 22266, 22287),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1828),
+            id: DeclarationId(1830),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -67161,7 +67192,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1829),
+            id: DeclarationId(1831),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -67180,7 +67211,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1830),
+            id: DeclarationId(1832),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -67199,7 +67230,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30660, 30667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1831),
+            id: DeclarationId(1833),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67219,7 +67250,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 36579, 36600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1832),
+            id: DeclarationId(1834),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67239,7 +67270,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 36606, 36637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1833),
+            id: DeclarationId(1835),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67258,7 +67289,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 7532, 7561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1834),
+            id: DeclarationId(1836),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67277,7 +67308,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 7566, 7595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1835),
+            id: DeclarationId(1837),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67297,7 +67328,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 7627, 7645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1836),
+            id: DeclarationId(1838),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67317,12 +67348,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8066, 8084),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1837),
+            id: DeclarationId(1839),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tokens".to_string(),
-                    ty: DeclarationId(1836),
+                    ty: DeclarationId(1838),
                 }],
             },
             type_params: vec![],
@@ -67336,7 +67367,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8036, 8086),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1838),
+            id: DeclarationId(1840),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -67361,7 +67392,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8091, 8147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1839),
+            id: DeclarationId(1841),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67380,7 +67411,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8510, 8555),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1840),
+            id: DeclarationId(1842),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -67409,7 +67440,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8560, 8630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1841),
+            id: DeclarationId(1843),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67423,7 +67454,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 14353, 14363),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1842),
+            id: DeclarationId(1844),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67442,7 +67473,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 14368, 14406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1843),
+            id: DeclarationId(1845),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67461,7 +67492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 14411, 14449),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1844),
+            id: DeclarationId(1846),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67480,7 +67511,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 14695, 14730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1845),
+            id: DeclarationId(1847),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67494,7 +67525,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 14735, 14747),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1846),
+            id: DeclarationId(1848),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67513,7 +67544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 15169, 15198),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1847),
+            id: DeclarationId(1849),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67532,7 +67563,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 15203, 15228),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1848),
+            id: DeclarationId(1850),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67546,7 +67577,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 15741, 15751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1849),
+            id: DeclarationId(1851),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67565,7 +67596,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 15756, 15794),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1850),
+            id: DeclarationId(1852),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67584,7 +67615,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 16499, 16526),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1851),
+            id: DeclarationId(1853),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67603,7 +67634,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 16531, 16559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1852),
+            id: DeclarationId(1854),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67623,12 +67654,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 16587, 16599),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1853),
+            id: DeclarationId(1855),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "fields".to_string(),
-                    ty: DeclarationId(1852),
+                    ty: DeclarationId(1854),
                 }],
             },
             type_params: vec![],
@@ -67642,7 +67673,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 16564, 16601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1854),
+            id: DeclarationId(1856),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67656,7 +67687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 17278, 17291),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1855),
+            id: DeclarationId(1857),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67670,7 +67701,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 17296, 17310),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1856),
+            id: DeclarationId(1858),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67689,7 +67720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 17315, 17347),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1857),
+            id: DeclarationId(1859),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67708,7 +67739,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 19517, 19558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1858),
+            id: DeclarationId(1860),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -67733,7 +67764,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 19563, 19632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1859),
+            id: DeclarationId(1861),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -67770,7 +67801,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 19637, 19787),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1860),
+            id: DeclarationId(1862),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67784,7 +67815,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20536, 20557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1861),
+            id: DeclarationId(1863),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -67804,12 +67835,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20588, 20615),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1862),
+            id: DeclarationId(1864),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "first_breaker".to_string(),
-                    ty: DeclarationId(1861),
+                    ty: DeclarationId(1863),
                 }],
             },
             type_params: vec![],
@@ -67823,7 +67854,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20562, 20617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1863),
+            id: DeclarationId(1865),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67843,12 +67874,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24541, 24562),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1864),
+            id: DeclarationId(1866),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "ops".to_string(),
-                    ty: DeclarationId(1863),
+                    ty: DeclarationId(1865),
                 }],
             },
             type_params: vec![],
@@ -67862,7 +67893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24521, 24564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1865),
+            id: DeclarationId(1867),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -67882,12 +67913,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24590, 24617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1866),
+            id: DeclarationId(1868),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "arms".to_string(),
-                    ty: DeclarationId(1865),
+                    ty: DeclarationId(1867),
                 }],
             },
             type_params: vec![],
@@ -67901,7 +67932,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24569, 24619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1867),
+            id: DeclarationId(1869),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67920,7 +67951,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24624, 24659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1868),
+            id: DeclarationId(1870),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -67940,12 +67971,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24691, 24723),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1869),
+            id: DeclarationId(1871),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "branches".to_string(),
-                    ty: DeclarationId(1868),
+                    ty: DeclarationId(1870),
                 }],
             },
             type_params: vec![],
@@ -67959,7 +67990,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24664, 24725),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1870),
+            id: DeclarationId(1872),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67978,7 +68009,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 25362, 25408),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1871),
+            id: DeclarationId(1873),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67997,7 +68028,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 25413, 25465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1872),
+            id: DeclarationId(1874),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68011,7 +68042,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 25962, 25982),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1873),
+            id: DeclarationId(1875),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68025,7 +68056,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 25987, 26008),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1874),
+            id: DeclarationId(1876),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68039,7 +68070,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26013, 26036),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1875),
+            id: DeclarationId(1877),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68053,7 +68084,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26041, 26059),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1876),
+            id: DeclarationId(1878),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68067,7 +68098,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26064, 26082),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1877),
+            id: DeclarationId(1879),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68086,7 +68117,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26399, 26445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1878),
+            id: DeclarationId(1880),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68105,7 +68136,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26450, 26502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1879),
+            id: DeclarationId(1881),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68119,7 +68150,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 32456, 32462),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1880),
+            id: DeclarationId(1882),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68138,7 +68169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 32467, 32504),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1881),
+            id: DeclarationId(1883),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68157,7 +68188,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 32509, 32546),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1882),
+            id: DeclarationId(1884),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68171,7 +68202,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 33020, 33039),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1883),
+            id: DeclarationId(1885),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68190,7 +68221,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 33044, 33093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1884),
+            id: DeclarationId(1886),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68209,7 +68240,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1885),
+            id: DeclarationId(1887),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68228,7 +68259,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1886),
+            id: DeclarationId(1888),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68247,7 +68278,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1887),
+            id: DeclarationId(1889),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68266,7 +68297,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1888),
+            id: DeclarationId(1890),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68285,7 +68316,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1889),
+            id: DeclarationId(1891),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68304,7 +68335,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1890),
+            id: DeclarationId(1892),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -68324,7 +68355,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 28003, 28024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1891),
+            id: DeclarationId(1893),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -68344,7 +68375,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 28088, 28109),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1892),
+            id: DeclarationId(1894),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68358,7 +68389,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 754, 764),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1893),
+            id: DeclarationId(1895),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68377,7 +68408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 769, 788),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1894),
+            id: DeclarationId(1896),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68391,7 +68422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 793, 803),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1895),
+            id: DeclarationId(1897),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68410,7 +68441,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1896),
+            id: DeclarationId(1898),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68429,7 +68460,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 1379, 1393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1897),
+            id: DeclarationId(1899),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68448,7 +68479,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 1398, 1411),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1898),
+            id: DeclarationId(1900),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68467,7 +68498,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 1416, 1433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1899),
+            id: DeclarationId(1901),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68486,7 +68517,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3566, 3586),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1900),
+            id: DeclarationId(1902),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68505,7 +68536,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3591, 3619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1901),
+            id: DeclarationId(1903),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68524,7 +68555,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3624, 3658),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1902),
+            id: DeclarationId(1904),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68543,7 +68574,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3663, 3692),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1903),
+            id: DeclarationId(1905),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68562,7 +68593,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3697, 3714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1904),
+            id: DeclarationId(1906),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68576,7 +68607,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 4338, 4345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1905),
+            id: DeclarationId(1907),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68595,7 +68626,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 4350, 4400),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1906),
+            id: DeclarationId(1908),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68614,7 +68645,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 5964, 5988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1907),
+            id: DeclarationId(1909),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68628,7 +68659,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6013, 6022),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1908),
+            id: DeclarationId(1910),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68647,7 +68678,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6027, 6063),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1909),
+            id: DeclarationId(1911),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -68672,7 +68703,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6375, 6425),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1910),
+            id: DeclarationId(1912),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68686,7 +68717,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6430, 6439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1911),
+            id: DeclarationId(1913),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(786),
@@ -68706,12 +68737,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7015, 7028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1912),
+            id: DeclarationId(1914),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1911),
+                    ty: DeclarationId(1913),
                 }],
             },
             type_params: vec![],
@@ -68725,7 +68756,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7003, 7029),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1913),
+            id: DeclarationId(1915),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68739,7 +68770,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7034, 7051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1914),
+            id: DeclarationId(1916),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68758,7 +68789,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7302, 7312),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1915),
+            id: DeclarationId(1917),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68772,7 +68803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7317, 7326),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1916),
+            id: DeclarationId(1918),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68786,7 +68817,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7331, 7340),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1917),
+            id: DeclarationId(1919),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68805,7 +68836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7767, 7787),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1918),
+            id: DeclarationId(1920),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68824,7 +68855,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7792, 7816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1919),
+            id: DeclarationId(1921),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -68844,12 +68875,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7828, 7844),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1920),
+            id: DeclarationId(1922),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1919),
+                    ty: DeclarationId(1921),
                 }],
             },
             type_params: vec![],
@@ -68863,7 +68894,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7821, 7845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1921),
+            id: DeclarationId(1923),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -68883,12 +68914,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7855, 7871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1922),
+            id: DeclarationId(1924),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1921),
+                    ty: DeclarationId(1923),
                 }],
             },
             type_params: vec![],
@@ -68902,7 +68933,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7850, 7872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1923),
+            id: DeclarationId(1925),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -68922,12 +68953,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7881, 7897),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1924),
+            id: DeclarationId(1926),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1923),
+                    ty: DeclarationId(1925),
                 }],
             },
             type_params: vec![],
@@ -68941,7 +68972,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7877, 7898),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1925),
+            id: DeclarationId(1927),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -68961,7 +68992,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7961, 7977),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1926),
+            id: DeclarationId(1928),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -68971,7 +69002,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "payload".to_string(),
-                        ty: DeclarationId(1925),
+                        ty: DeclarationId(1927),
                     },
                 ],
             },
@@ -68986,7 +69017,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7903, 7983),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1927),
+            id: DeclarationId(1929),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69005,7 +69036,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9596, 9625),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1928),
+            id: DeclarationId(1930),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69025,12 +69056,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9660, 9676),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1929),
+            id: DeclarationId(1931),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "fields".to_string(),
-                    ty: DeclarationId(1928),
+                    ty: DeclarationId(1930),
                 }],
             },
             type_params: vec![],
@@ -69044,7 +69075,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9630, 9678),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1930),
+            id: DeclarationId(1932),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69063,7 +69094,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9683, 9711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1931),
+            id: DeclarationId(1933),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69083,12 +69114,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9730, 9746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1932),
+            id: DeclarationId(1934),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1931),
+                    ty: DeclarationId(1933),
                 }],
             },
             type_params: vec![],
@@ -69102,7 +69133,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9716, 9747),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1933),
+            id: DeclarationId(1935),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69122,12 +69153,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9765, 9781),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1934),
+            id: DeclarationId(1936),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1933),
+                    ty: DeclarationId(1935),
                 }],
             },
             type_params: vec![],
@@ -69141,7 +69172,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9752, 9782),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1935),
+            id: DeclarationId(1937),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69160,7 +69191,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11036, 11059),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1936),
+            id: DeclarationId(1938),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69179,7 +69210,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11064, 11098),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1937),
+            id: DeclarationId(1939),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69193,7 +69224,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11103, 11110),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1938),
+            id: DeclarationId(1940),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69207,7 +69238,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11115, 11121),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1939),
+            id: DeclarationId(1941),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69226,7 +69257,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11126, 11146),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1940),
+            id: DeclarationId(1942),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69245,7 +69276,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11375, 11392),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1941),
+            id: DeclarationId(1943),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69265,12 +69296,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11414, 11429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1942),
+            id: DeclarationId(1944),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "children".to_string(),
-                    ty: DeclarationId(1941),
+                    ty: DeclarationId(1943),
                 }],
             },
             type_params: vec![],
@@ -69284,7 +69315,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11397, 11431),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1943),
+            id: DeclarationId(1945),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69304,12 +69335,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11453, 11468),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1944),
+            id: DeclarationId(1946),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "variants".to_string(),
-                    ty: DeclarationId(1943),
+                    ty: DeclarationId(1945),
                 }],
             },
             type_params: vec![],
@@ -69323,7 +69354,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11436, 11470),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1945),
+            id: DeclarationId(1947),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69343,13 +69374,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11497, 11516),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1946),
+            id: DeclarationId(1948),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(1945),
+                        ty: DeclarationId(1947),
                     },
                     Field {
                         label: "output".to_string(),
@@ -69372,7 +69403,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11475, 11572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1947),
+            id: DeclarationId(1949),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -69397,7 +69428,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11577, 11655),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1948),
+            id: DeclarationId(1950),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69417,7 +69448,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11723, 11745),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1949),
+            id: DeclarationId(1951),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -69427,7 +69458,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "arguments".to_string(),
-                        ty: DeclarationId(1948),
+                        ty: DeclarationId(1950),
                     },
                 ],
             },
@@ -69442,7 +69473,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11660, 11751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1950),
+            id: DeclarationId(1952),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -69461,7 +69492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1951),
+            id: DeclarationId(1953),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69481,7 +69512,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11852, 11871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1952),
+            id: DeclarationId(1954),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69501,7 +69532,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11890, 11912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1953),
+            id: DeclarationId(1955),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -69520,7 +69551,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1954),
+            id: DeclarationId(1956),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -69539,7 +69570,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1955),
+            id: DeclarationId(1957),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -69558,7 +69589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1956),
+            id: DeclarationId(1958),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -69577,7 +69608,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1957),
+            id: DeclarationId(1959),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69597,7 +69628,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13149, 13168),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1958),
+            id: DeclarationId(1960),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69611,7 +69642,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13449, 13452),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1959),
+            id: DeclarationId(1961),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69625,7 +69656,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13457, 13460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1960),
+            id: DeclarationId(1962),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69639,7 +69670,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13465, 13468),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1961),
+            id: DeclarationId(1963),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69653,7 +69684,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13473, 13476),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1962),
+            id: DeclarationId(1964),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69667,7 +69698,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13600, 13602),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1963),
+            id: DeclarationId(1965),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69681,7 +69712,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13607, 13609),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1964),
+            id: DeclarationId(1966),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69695,7 +69726,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13614, 13616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1965),
+            id: DeclarationId(1967),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69709,7 +69740,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13621, 13623),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1966),
+            id: DeclarationId(1968),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69723,7 +69754,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13628, 13630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1967),
+            id: DeclarationId(1969),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69737,7 +69768,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13635, 13637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1968),
+            id: DeclarationId(1970),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69751,7 +69782,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14414, 14417),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1969),
+            id: DeclarationId(1971),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69765,7 +69796,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14422, 14424),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1970),
+            id: DeclarationId(1972),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69784,7 +69815,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14660, 14684),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1971),
+            id: DeclarationId(1973),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69803,7 +69834,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14689, 14713),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1972),
+            id: DeclarationId(1974),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69822,7 +69853,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14718, 14736),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1973),
+            id: DeclarationId(1975),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69841,7 +69872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14923, 14946),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1974),
+            id: DeclarationId(1976),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69860,7 +69891,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14951, 15007),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1975),
+            id: DeclarationId(1977),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69879,7 +69910,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15012, 15066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1976),
+            id: DeclarationId(1978),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69898,7 +69929,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15071, 15093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1977),
+            id: DeclarationId(1979),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -69923,7 +69954,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15218, 15270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1978),
+            id: DeclarationId(1980),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69942,7 +69973,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15275, 15305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1979),
+            id: DeclarationId(1981),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -69961,7 +69992,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1980),
+            id: DeclarationId(1982),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -69981,7 +70012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 17460, 17491),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1981),
+            id: DeclarationId(1983),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(725),
@@ -70001,7 +70032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 17515, 17545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1982),
+            id: DeclarationId(1984),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70020,7 +70051,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18168, 18197),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1983),
+            id: DeclarationId(1985),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -70045,7 +70076,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18202, 18249),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1984),
+            id: DeclarationId(1986),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -70064,7 +70095,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1985),
+            id: DeclarationId(1987),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70084,7 +70115,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18607, 18619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1986),
+            id: DeclarationId(1988),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70098,7 +70129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18860, 18869),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1987),
+            id: DeclarationId(1989),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70118,7 +70149,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18927, 18943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1988),
+            id: DeclarationId(1990),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -70137,7 +70168,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1989),
+            id: DeclarationId(1991),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70151,7 +70182,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19445, 19457),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1990),
+            id: DeclarationId(1992),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70171,7 +70202,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19535, 19547),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1991),
+            id: DeclarationId(1993),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -70190,7 +70221,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1992),
+            id: DeclarationId(1994),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -70209,7 +70240,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1993),
+            id: DeclarationId(1995),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70228,7 +70259,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19737, 19753),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1994),
+            id: DeclarationId(1996),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70247,7 +70278,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19758, 19782),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1995),
+            id: DeclarationId(1997),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70266,7 +70297,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19787, 19805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1996),
+            id: DeclarationId(1998),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70285,7 +70316,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19810, 19824),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1997),
+            id: DeclarationId(1999),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70304,7 +70335,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19829, 19843),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1998),
+            id: DeclarationId(2000),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70324,7 +70355,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19872, 19889),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1999),
+            id: DeclarationId(2001),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70344,7 +70375,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19899, 19913),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2000),
+            id: DeclarationId(2002),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70364,7 +70395,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19923, 19936),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2001),
+            id: DeclarationId(2003),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70384,7 +70415,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19949, 19962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2002),
+            id: DeclarationId(2004),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70403,7 +70434,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 26045, 26063),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2003),
+            id: DeclarationId(2005),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70417,7 +70448,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 26068, 26074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2004),
+            id: DeclarationId(2006),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -70437,12 +70468,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 26107, 26131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2005),
+            id: DeclarationId(2007),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "candidates".to_string(),
-                    ty: DeclarationId(2004),
+                    ty: DeclarationId(2006),
                 }],
             },
             type_params: vec![],
@@ -70456,7 +70487,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 26079, 26133),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2006),
+            id: DeclarationId(2008),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -70476,7 +70507,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 10942, 10962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2007),
+            id: DeclarationId(2009),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -70496,7 +70527,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11026, 11046),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2008),
+            id: DeclarationId(2010),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -70516,7 +70547,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11114, 11144),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2009),
+            id: DeclarationId(2011),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70536,7 +70567,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11611, 11629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2010),
+            id: DeclarationId(2012),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -70556,7 +70587,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11635, 11665),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2011),
+            id: DeclarationId(2013),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70576,7 +70607,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 14162, 14180),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2012),
+            id: DeclarationId(2014),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -70596,7 +70627,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22217, 22247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2013),
+            id: DeclarationId(2015),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70616,7 +70647,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22252, 22270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2014),
+            id: DeclarationId(2016),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70636,7 +70667,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22530, 22548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2015),
+            id: DeclarationId(2017),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70656,7 +70687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22553, 22571),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2016),
+            id: DeclarationId(2018),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70676,7 +70707,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23044, 23062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2017),
+            id: DeclarationId(2019),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70696,7 +70727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23067, 23085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2018),
+            id: DeclarationId(2020),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70716,7 +70747,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23186, 23204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2019),
+            id: DeclarationId(2021),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70736,7 +70767,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23524, 23542),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2020),
+            id: DeclarationId(2022),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70756,7 +70787,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23547, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2021),
+            id: DeclarationId(2023),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70776,7 +70807,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 25113, 25131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2022),
+            id: DeclarationId(2024),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70796,7 +70827,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 25384, 25402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2023),
+            id: DeclarationId(2025),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70816,7 +70847,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 25850, 25868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2024),
+            id: DeclarationId(2026),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70836,7 +70867,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 27885, 27903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2025),
+            id: DeclarationId(2027),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70856,7 +70887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 27933, 27951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2026),
+            id: DeclarationId(2028),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70876,7 +70907,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28238, 28256),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2027),
+            id: DeclarationId(2029),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70896,7 +70927,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28284, 28302),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2028),
+            id: DeclarationId(2030),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70916,7 +70947,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28662, 28680),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2029),
+            id: DeclarationId(2031),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70936,7 +70967,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28685, 28703),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2030),
+            id: DeclarationId(2032),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70950,7 +70981,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 4953, 4965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2031),
+            id: DeclarationId(2033),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70964,7 +70995,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 4970, 4986),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2032),
+            id: DeclarationId(2034),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70978,7 +71009,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 4991, 5005),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2033),
+            id: DeclarationId(2035),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70992,7 +71023,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 5855, 5868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2034),
+            id: DeclarationId(2036),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71006,7 +71037,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 5873, 5888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2035),
+            id: DeclarationId(2037),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71020,7 +71051,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 5893, 5909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2036),
+            id: DeclarationId(2038),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71034,7 +71065,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 5914, 5927),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2037),
+            id: DeclarationId(2039),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -71053,7 +71084,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2038),
+            id: DeclarationId(2040),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -71072,7 +71103,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2039),
+            id: DeclarationId(2041),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -71091,7 +71122,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2040),
+            id: DeclarationId(2042),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -71110,7 +71141,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2041),
+            id: DeclarationId(2043),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71124,7 +71155,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 8405, 8414),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2042),
+            id: DeclarationId(2044),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71143,7 +71174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 8419, 8465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2043),
+            id: DeclarationId(2045),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71162,7 +71193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9506, 9523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2044),
+            id: DeclarationId(2046),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71181,7 +71212,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9528, 9552),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2045),
+            id: DeclarationId(2047),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -71206,7 +71237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9557, 9619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2046),
+            id: DeclarationId(2048),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -71226,12 +71257,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9636, 9666),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2047),
+            id: DeclarationId(2049),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2046),
+                    ty: DeclarationId(2048),
                 }],
             },
             type_params: vec![],
@@ -71245,7 +71276,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9624, 9667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2048),
+            id: DeclarationId(2050),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -71265,12 +71296,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9680, 9710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2049),
+            id: DeclarationId(2051),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2048),
+                    ty: DeclarationId(2050),
                 }],
             },
             type_params: vec![],
@@ -71284,7 +71315,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9672, 9711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2050),
+            id: DeclarationId(2052),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71303,7 +71334,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9716, 9737),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2051),
+            id: DeclarationId(2053),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71322,7 +71353,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9742, 9761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2052),
+            id: DeclarationId(2054),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(31),
@@ -71342,7 +71373,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9479, 9501),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2053),
+            id: DeclarationId(2055),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71356,7 +71387,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18143, 18156),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2054),
+            id: DeclarationId(2056),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71370,7 +71401,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18161, 18169),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2055),
+            id: DeclarationId(2057),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71384,7 +71415,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18174, 18185),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2056),
+            id: DeclarationId(2058),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71398,7 +71429,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18190, 18207),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2057),
+            id: DeclarationId(2059),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71412,7 +71443,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18212, 18226),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2058),
+            id: DeclarationId(2060),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71431,7 +71462,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18231, 18280),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2059),
+            id: DeclarationId(2061),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71445,7 +71476,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18285, 18301),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2060),
+            id: DeclarationId(2062),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71459,7 +71490,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18306, 18318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2061),
+            id: DeclarationId(2063),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(43),
@@ -71479,7 +71510,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18107, 18138),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2062),
+            id: DeclarationId(2064),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(691),
@@ -71499,7 +71530,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11495, 11507),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2063),
+            id: DeclarationId(2065),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(728)],
@@ -71517,7 +71548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2064),
+            id: DeclarationId(2066),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(704),
@@ -71527,7 +71558,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         value: DeclarationId(849),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1799),
+                        parameter: DeclarationId(1801),
                         value: DeclarationId(856),
                     },
                 ],
@@ -71543,7 +71574,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11488, 11535),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2065),
+            id: DeclarationId(2067),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(691),
@@ -71563,7 +71594,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11795, 11810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2066),
+            id: DeclarationId(2068),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(849), DeclarationId(849)],
@@ -71581,7 +71612,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2067),
+            id: DeclarationId(2069),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
@@ -71595,7 +71626,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         value: DeclarationId(849),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1789),
+                        parameter: DeclarationId(1791),
                         value: DeclarationId(860),
                     },
                 ],
@@ -71611,7 +71642,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 14202, 14245),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2068),
+            id: DeclarationId(2070),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(850), DeclarationId(694)],
@@ -71629,7 +71660,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2069),
+            id: DeclarationId(2071),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
@@ -71639,7 +71670,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         value: DeclarationId(850),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1789),
+                        parameter: DeclarationId(1791),
                         value: DeclarationId(886),
                     },
                     TemplateArgument {
@@ -71659,7 +71690,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 16911, 17021),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2070),
+            id: DeclarationId(2072),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(850), DeclarationId(694)],
@@ -71677,7 +71708,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2071),
+            id: DeclarationId(2073),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
@@ -71687,7 +71718,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         value: DeclarationId(850),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1789),
+                        parameter: DeclarationId(1791),
                         value: DeclarationId(886),
                     },
                     TemplateArgument {
@@ -71707,7 +71738,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 17076, 17186),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2072),
+            id: DeclarationId(2074),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -71727,7 +71758,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22293, 22323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2073),
+            id: DeclarationId(2075),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -71747,7 +71778,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22275, 22324),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2074),
+            id: DeclarationId(2076),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -71767,7 +71798,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22603, 22610),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2075),
+            id: DeclarationId(2077),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -71787,7 +71818,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22737, 22789),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2076),
+            id: DeclarationId(2078),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -71807,7 +71838,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23140, 23147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2077),
+            id: DeclarationId(2079),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -71827,7 +71858,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23118, 23148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2078),
+            id: DeclarationId(2080),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -71847,7 +71878,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23597, 23604),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2079),
+            id: DeclarationId(2081),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -71867,7 +71898,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23735, 23792),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2080),
+            id: DeclarationId(2082),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -71887,7 +71918,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 25317, 25349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2081),
+            id: DeclarationId(2083),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -71907,7 +71938,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 27988, 27995),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2082),
+            id: DeclarationId(2084),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -71927,7 +71958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28136, 28201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2083),
+            id: DeclarationId(2085),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(850), DeclarationId(849)],
@@ -71945,7 +71976,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2084),
+            id: DeclarationId(2086),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
@@ -71959,7 +71990,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         value: DeclarationId(849),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1789),
+                        parameter: DeclarationId(1791),
                         value: DeclarationId(886),
                     },
                 ],
@@ -71975,7 +72006,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28319, 28377),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2085),
+            id: DeclarationId(2087),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -71995,7 +72026,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28403, 28449),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2086),
+            id: DeclarationId(2088),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -72015,11 +72046,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28720, 28727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2087),
+            id: DeclarationId(2089),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2029), DeclarationId(849)],
-                output: DeclarationId(2029),
+                inputs: vec![DeclarationId(2031), DeclarationId(849)],
+                output: DeclarationId(2031),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -72033,21 +72064,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2088),
+            id: DeclarationId(2090),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
                 arguments: vec![
                     TemplateArgument {
                         parameter: DeclarationId(695),
-                        value: DeclarationId(2029),
+                        value: DeclarationId(2031),
                     },
                     TemplateArgument {
                         parameter: DeclarationId(694),
                         value: DeclarationId(849),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1789),
+                        parameter: DeclarationId(1791),
                         value: DeclarationId(889),
                     },
                 ],
@@ -72063,7 +72094,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28708, 28749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2089),
+            id: DeclarationId(2091),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -72083,7 +72114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4503, 4529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2090),
+            id: DeclarationId(2092),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72102,7 +72133,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2091),
+            id: DeclarationId(2093),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72121,7 +72152,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2092),
+            id: DeclarationId(2094),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -72141,7 +72172,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_operations.dag", 6546, 6561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2093),
+            id: DeclarationId(2095),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -72161,12 +72192,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2718, 2749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2094),
+            id: DeclarationId(2096),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "content".to_string(),
-                    ty: DeclarationId(2093),
+                    ty: DeclarationId(2095),
                 }],
             },
             type_params: vec![],
@@ -72180,7 +72211,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2690, 2751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2095),
+            id: DeclarationId(2097),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -72200,12 +72231,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2784, 2820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2096),
+            id: DeclarationId(2098),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "content".to_string(),
-                    ty: DeclarationId(2095),
+                    ty: DeclarationId(2097),
                 }],
             },
             type_params: vec![],
@@ -72219,7 +72250,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2756, 2822),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2097),
+            id: DeclarationId(2099),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72244,7 +72275,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3211, 3276),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2098),
+            id: DeclarationId(2100),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72263,7 +72294,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3281, 3305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2099),
+            id: DeclarationId(2101),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72282,7 +72313,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3568, 3596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2100),
+            id: DeclarationId(2102),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72301,7 +72332,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3601, 3637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2101),
+            id: DeclarationId(2103),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72320,7 +72351,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4332, 4354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2102),
+            id: DeclarationId(2104),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -72340,12 +72371,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4376, 4406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2103),
+            id: DeclarationId(2105),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2102),
+                    ty: DeclarationId(2104),
                 }],
             },
             type_params: vec![],
@@ -72359,7 +72390,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4359, 4407),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2104),
+            id: DeclarationId(2106),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72373,7 +72404,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5616, 5623),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2105),
+            id: DeclarationId(2107),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72387,7 +72418,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5749, 5761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2106),
+            id: DeclarationId(2108),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72406,7 +72437,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5979, 6014),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2107),
+            id: DeclarationId(2109),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72425,7 +72456,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6019, 6062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2108),
+            id: DeclarationId(2110),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72444,7 +72475,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6067, 6144),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2109),
+            id: DeclarationId(2111),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -72464,7 +72495,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6234, 6268),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2110),
+            id: DeclarationId(2112),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72483,7 +72514,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2111),
+            id: DeclarationId(2113),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72502,7 +72533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2112),
+            id: DeclarationId(2114),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72516,15 +72547,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(2109),
+                        ty: DeclarationId(2111),
                     },
                     Field {
                         label: "citations".to_string(),
-                        ty: DeclarationId(2110),
+                        ty: DeclarationId(2112),
                     },
                     Field {
                         label: "cache_control".to_string(),
-                        ty: DeclarationId(2111),
+                        ty: DeclarationId(2113),
                     },
                 ],
             },
@@ -72539,7 +72570,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6149, 6364),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2113),
+            id: DeclarationId(2115),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72558,7 +72589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6369, 6418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2114),
+            id: DeclarationId(2116),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72577,7 +72608,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6926, 6962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2115),
+            id: DeclarationId(2117),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72596,7 +72627,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2116),
+            id: DeclarationId(2118),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72615,7 +72646,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2117),
+            id: DeclarationId(2119),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72625,11 +72656,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(2115),
+                        ty: DeclarationId(2117),
                     },
                     Field {
                         label: "is_error".to_string(),
-                        ty: DeclarationId(2116),
+                        ty: DeclarationId(2118),
                     },
                 ],
             },
@@ -72644,7 +72675,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6967, 7085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2118),
+            id: DeclarationId(2120),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72663,7 +72694,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7532, 7570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2119),
+            id: DeclarationId(2121),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72692,7 +72723,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7575, 7658),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2120),
+            id: DeclarationId(2122),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72706,7 +72737,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8016, 8023),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2121),
+            id: DeclarationId(2123),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72720,7 +72751,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8028, 8037),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2122),
+            id: DeclarationId(2124),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72734,7 +72765,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8042, 8054),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2123),
+            id: DeclarationId(2125),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72748,7 +72779,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8059, 8066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2124),
+            id: DeclarationId(2126),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72762,7 +72793,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8071, 8080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2125),
+            id: DeclarationId(2127),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72776,7 +72807,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8085, 8092),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2126),
+            id: DeclarationId(2128),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72790,7 +72821,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8097, 8123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2127),
+            id: DeclarationId(2129),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72809,7 +72840,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2128),
+            id: DeclarationId(2130),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72828,7 +72859,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2129),
+            id: DeclarationId(2131),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72842,11 +72873,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "document_title".to_string(),
-                        ty: DeclarationId(2127),
+                        ty: DeclarationId(2129),
                     },
                     Field {
                         label: "file_id".to_string(),
-                        ty: DeclarationId(2128),
+                        ty: DeclarationId(2130),
                     },
                     Field {
                         label: "start_char_index".to_string(),
@@ -72869,7 +72900,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8363, 8506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2130),
+            id: DeclarationId(2132),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72888,7 +72919,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2131),
+            id: DeclarationId(2133),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72907,7 +72938,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2132),
+            id: DeclarationId(2134),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72921,11 +72952,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "document_title".to_string(),
-                        ty: DeclarationId(2130),
+                        ty: DeclarationId(2132),
                     },
                     Field {
                         label: "file_id".to_string(),
-                        ty: DeclarationId(2131),
+                        ty: DeclarationId(2133),
                     },
                     Field {
                         label: "start_page_number".to_string(),
@@ -72948,7 +72979,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8511, 8656),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2133),
+            id: DeclarationId(2135),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72967,7 +72998,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2134),
+            id: DeclarationId(2136),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72986,7 +73017,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2135),
+            id: DeclarationId(2137),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73000,11 +73031,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "document_title".to_string(),
-                        ty: DeclarationId(2133),
+                        ty: DeclarationId(2135),
                     },
                     Field {
                         label: "file_id".to_string(),
-                        ty: DeclarationId(2134),
+                        ty: DeclarationId(2136),
                     },
                     Field {
                         label: "start_block_index".to_string(),
@@ -73027,7 +73058,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8661, 8814),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2136),
+            id: DeclarationId(2138),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73046,7 +73077,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2137),
+            id: DeclarationId(2139),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73060,7 +73091,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "title".to_string(),
-                        ty: DeclarationId(2136),
+                        ty: DeclarationId(2138),
                     },
                     Field {
                         label: "url".to_string(),
@@ -73079,7 +73110,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8819, 8919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2138),
+            id: DeclarationId(2140),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73098,7 +73129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2139),
+            id: DeclarationId(2141),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73112,7 +73143,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "title".to_string(),
-                        ty: DeclarationId(2138),
+                        ty: DeclarationId(2140),
                     },
                     Field {
                         label: "search_result_index".to_string(),
@@ -73139,7 +73170,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8924, 9071),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2140),
+            id: DeclarationId(2142),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -73159,11 +73190,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2141),
+            id: DeclarationId(2143),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2140),
+                    DeclarationId(2142),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -73178,7 +73209,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2142),
+            id: DeclarationId(2144),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73188,7 +73219,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "citations".to_string(),
-                        ty: DeclarationId(2141),
+                        ty: DeclarationId(2143),
                     },
                 ],
             },
@@ -73203,7 +73234,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9650, 9732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2143),
+            id: DeclarationId(2145),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73228,7 +73259,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9737, 9798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2144),
+            id: DeclarationId(2146),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -73247,7 +73278,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9803, 9858),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2145),
+            id: DeclarationId(2147),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73266,7 +73297,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2146),
+            id: DeclarationId(2148),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73284,7 +73315,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "caller".to_string(),
-                        ty: DeclarationId(2145),
+                        ty: DeclarationId(2147),
                     },
                 ],
             },
@@ -73299,7 +73330,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9863, 9940),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2147),
+            id: DeclarationId(2149),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73318,7 +73349,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2148),
+            id: DeclarationId(2150),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73336,7 +73367,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "caller".to_string(),
-                        ty: DeclarationId(2147),
+                        ty: DeclarationId(2149),
                     },
                 ],
             },
@@ -73351,7 +73382,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9945, 10045),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2149),
+            id: DeclarationId(2151),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73370,7 +73401,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2150),
+            id: DeclarationId(2152),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73384,7 +73415,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "caller".to_string(),
-                        ty: DeclarationId(2149),
+                        ty: DeclarationId(2151),
                     },
                 ],
             },
@@ -73399,7 +73430,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10050, 10136),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2151),
+            id: DeclarationId(2153),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73413,7 +73444,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10357, 10366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2152),
+            id: DeclarationId(2154),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73427,7 +73458,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10371, 10379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2153),
+            id: DeclarationId(2155),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73441,7 +73472,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10384, 10397),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2154),
+            id: DeclarationId(2156),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73455,7 +73486,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10402, 10419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2155),
+            id: DeclarationId(2157),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73469,7 +73500,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10424, 10447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2156),
+            id: DeclarationId(2158),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73483,7 +73514,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10452, 10471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2157),
+            id: DeclarationId(2159),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73497,7 +73528,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10476, 10494),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2158),
+            id: DeclarationId(2160),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73511,7 +73542,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10499, 10506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2159),
+            id: DeclarationId(2161),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73530,7 +73561,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2160),
+            id: DeclarationId(2162),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73549,7 +73580,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2161),
+            id: DeclarationId(2163),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73568,7 +73599,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2162),
+            id: DeclarationId(2164),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73582,7 +73613,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11192, 11201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2163),
+            id: DeclarationId(2165),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -73602,7 +73633,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11687, 11725),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2164),
+            id: DeclarationId(2166),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73621,7 +73652,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2165),
+            id: DeclarationId(2167),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73640,7 +73671,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2166),
+            id: DeclarationId(2168),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73654,7 +73685,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1013, 1025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2167),
+            id: DeclarationId(2169),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73668,7 +73699,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1030, 1044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2168),
+            id: DeclarationId(2170),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73682,7 +73713,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1049, 1064),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2169),
+            id: DeclarationId(2171),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73696,7 +73727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1069, 1086),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2170),
+            id: DeclarationId(2172),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73710,7 +73741,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1091, 1114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2171),
+            id: DeclarationId(2173),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73724,7 +73755,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4719, 4726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2172),
+            id: DeclarationId(2174),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73738,7 +73769,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4731, 4735),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2173),
+            id: DeclarationId(2175),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -73758,7 +73789,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6983, 7004),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2174),
+            id: DeclarationId(2176),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73772,7 +73803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2224, 2238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2175),
+            id: DeclarationId(2177),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73786,7 +73817,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2243, 2268),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2176),
+            id: DeclarationId(2178),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73800,7 +73831,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2273, 2283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2177),
+            id: DeclarationId(2179),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73814,7 +73845,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2548, 2565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2178),
+            id: DeclarationId(2180),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73828,7 +73859,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2570, 2594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2179),
+            id: DeclarationId(2181),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73842,7 +73873,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2599, 2631),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2180),
+            id: DeclarationId(2182),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73856,7 +73887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2636, 2663),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2181),
+            id: DeclarationId(2183),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73870,7 +73901,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3369, 3393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2182),
+            id: DeclarationId(2184),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73884,7 +73915,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3398, 3430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2183),
+            id: DeclarationId(2185),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73898,7 +73929,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3564, 3588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2184),
+            id: DeclarationId(2186),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73912,7 +73943,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3593, 3614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2185),
+            id: DeclarationId(2187),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73926,7 +73957,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3619, 3637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2186),
+            id: DeclarationId(2188),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73940,7 +73971,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3781, 3796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2187),
+            id: DeclarationId(2189),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73954,7 +73985,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3801, 3831),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2188),
+            id: DeclarationId(2190),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73968,7 +73999,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3836, 3857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2189),
+            id: DeclarationId(2191),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73982,7 +74013,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4024, 4044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2190),
+            id: DeclarationId(2192),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73996,7 +74027,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4049, 4076),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2191),
+            id: DeclarationId(2193),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74010,7 +74041,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4081, 4095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2192),
+            id: DeclarationId(2194),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74024,7 +74055,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4354, 4362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2193),
+            id: DeclarationId(2195),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74038,7 +74069,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4367, 4393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2194),
+            id: DeclarationId(2196),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74052,7 +74083,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4398, 4423),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2195),
+            id: DeclarationId(2197),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -74072,7 +74103,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5320, 5332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2196),
+            id: DeclarationId(2198),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74086,7 +74117,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5693, 5713),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2197),
+            id: DeclarationId(2199),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74100,7 +74131,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5718, 5736),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2198),
+            id: DeclarationId(2200),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74114,7 +74145,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5741, 5759),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2199),
+            id: DeclarationId(2201),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74128,7 +74159,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5764, 5791),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2200),
+            id: DeclarationId(2202),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -74147,7 +74178,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2201),
+            id: DeclarationId(2203),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -74166,7 +74197,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2202),
+            id: DeclarationId(2204),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -74185,7 +74216,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2203),
+            id: DeclarationId(2205),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -74204,7 +74235,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2204),
+            id: DeclarationId(2206),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -74223,7 +74254,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2205),
+            id: DeclarationId(2207),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -74242,7 +74273,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2206),
+            id: DeclarationId(2208),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74261,7 +74292,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1430, 1462),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2207),
+            id: DeclarationId(2209),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74280,7 +74311,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1467, 1503),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2208),
+            id: DeclarationId(2210),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74299,7 +74330,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1508, 1545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2209),
+            id: DeclarationId(2211),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74318,7 +74349,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1550, 1576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2210),
+            id: DeclarationId(2212),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74337,7 +74368,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1581, 1614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2211),
+            id: DeclarationId(2213),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74351,7 +74382,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1619, 1636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2212),
+            id: DeclarationId(2214),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74370,7 +74401,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1641, 1695),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2213),
+            id: DeclarationId(2215),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74384,7 +74415,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1700, 1707),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2214),
+            id: DeclarationId(2216),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74403,7 +74434,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2059, 2097),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2215),
+            id: DeclarationId(2217),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -74428,7 +74459,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2102, 2176),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2216),
+            id: DeclarationId(2218),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -74453,7 +74484,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2181, 2256),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2217),
+            id: DeclarationId(2219),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -74478,7 +74509,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2261, 2334),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2218),
+            id: DeclarationId(2220),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74497,7 +74528,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2339, 2376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2219),
+            id: DeclarationId(2221),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74516,7 +74547,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2381, 2418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2220),
+            id: DeclarationId(2222),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74535,7 +74566,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2423, 2464),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2221),
+            id: DeclarationId(2223),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74549,7 +74580,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2469, 2485),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2222),
+            id: DeclarationId(2224),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74563,7 +74594,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3221, 3231),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2223),
+            id: DeclarationId(2225),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74582,7 +74613,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3236, 3283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2224),
+            id: DeclarationId(2226),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74601,7 +74632,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3288, 3339),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2225),
+            id: DeclarationId(2227),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74615,7 +74646,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3529, 3533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2226),
+            id: DeclarationId(2228),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74629,7 +74660,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3538, 3545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2227),
+            id: DeclarationId(2229),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74643,7 +74674,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3550, 3556),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2228),
+            id: DeclarationId(2230),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -74662,7 +74693,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2229),
+            id: DeclarationId(2231),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74676,7 +74707,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7493, 7504),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2230),
+            id: DeclarationId(2232),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74690,7 +74721,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7553, 7567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2231),
+            id: DeclarationId(2233),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74704,7 +74735,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7632, 7648),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2232),
+            id: DeclarationId(2234),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74718,7 +74749,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 360, 369),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2233),
+            id: DeclarationId(2235),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74732,7 +74763,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 374, 381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2234),
+            id: DeclarationId(2236),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74746,7 +74777,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 614, 618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2235),
+            id: DeclarationId(2237),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74760,7 +74791,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 623, 632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2236),
+            id: DeclarationId(2238),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74774,7 +74805,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 910, 921),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2237),
+            id: DeclarationId(2239),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74788,7 +74819,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 926, 935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2238),
+            id: DeclarationId(2240),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74802,7 +74833,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 1166, 1173),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2239),
+            id: DeclarationId(2241),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74816,7 +74847,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 1178, 1187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2240),
+            id: DeclarationId(2242),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74830,7 +74861,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2035, 2044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2241),
+            id: DeclarationId(2243),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74844,7 +74875,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2049, 2065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2242),
+            id: DeclarationId(2244),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74858,7 +74889,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2070, 2080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2243),
+            id: DeclarationId(2245),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74872,7 +74903,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2085, 2099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2244),
+            id: DeclarationId(2246),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74886,7 +74917,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2385, 2399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2245),
+            id: DeclarationId(2247),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74900,7 +74931,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2404, 2418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2246),
+            id: DeclarationId(2248),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -74920,7 +74951,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2818, 2830),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2247),
+            id: DeclarationId(2249),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -74940,7 +74971,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3210, 3222),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2248),
+            id: DeclarationId(2250),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74954,7 +74985,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3694, 3708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2249),
+            id: DeclarationId(2251),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74968,7 +74999,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3713, 3729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2250),
+            id: DeclarationId(2252),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74987,7 +75018,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 6759, 6786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2251),
+            id: DeclarationId(2253),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75001,7 +75032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7611, 7616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2252),
+            id: DeclarationId(2254),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75015,7 +75046,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7621, 7630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2253),
+            id: DeclarationId(2255),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -75041,7 +75072,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 9513, 9555),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2254),
+            id: DeclarationId(2256),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75055,7 +75086,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3853, 3857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2255),
+            id: DeclarationId(2257),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75069,7 +75100,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3860, 3864),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2256),
+            id: DeclarationId(2258),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75083,7 +75114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3867, 3871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2257),
+            id: DeclarationId(2259),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75097,7 +75128,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3874, 3879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2258),
+            id: DeclarationId(2260),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75111,7 +75142,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3882, 3893),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2259),
+            id: DeclarationId(2261),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75125,7 +75156,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3896, 3909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2260),
+            id: DeclarationId(2262),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75139,7 +75170,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4489, 4494),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2261),
+            id: DeclarationId(2263),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75153,7 +75184,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4497, 4506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2262),
+            id: DeclarationId(2264),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75167,7 +75198,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4509, 4515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2263),
+            id: DeclarationId(2265),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75181,7 +75212,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4518, 4522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2264),
+            id: DeclarationId(2266),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75195,7 +75226,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4525, 4529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2265),
+            id: DeclarationId(2267),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75215,7 +75246,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5923, 5941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2266),
+            id: DeclarationId(2268),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75235,7 +75266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6396, 6424),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2267),
+            id: DeclarationId(2269),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75249,7 +75280,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1099, 1113),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2268),
+            id: DeclarationId(2270),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75263,7 +75294,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1118, 1128),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2269),
+            id: DeclarationId(2271),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75277,7 +75308,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1133, 1145),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2270),
+            id: DeclarationId(2272),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75291,7 +75322,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1150, 1163),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2271),
+            id: DeclarationId(2273),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75305,7 +75336,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1168, 1180),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2272),
+            id: DeclarationId(2274),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75319,7 +75350,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1185, 1197),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2273),
+            id: DeclarationId(2275),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75333,7 +75364,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1202, 1224),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2274),
+            id: DeclarationId(2276),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75347,7 +75378,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1229, 1248),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2275),
+            id: DeclarationId(2277),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75361,7 +75392,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1253, 1278),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2276),
+            id: DeclarationId(2278),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75375,7 +75406,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1283, 1306),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2277),
+            id: DeclarationId(2279),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -75394,7 +75425,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5506, 5542),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2278),
+            id: DeclarationId(2280),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -75413,7 +75444,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5547, 5588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2279),
+            id: DeclarationId(2281),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75433,7 +75464,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 6047, 6063),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2280),
+            id: DeclarationId(2282),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -75452,7 +75483,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9175, 9216),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2281),
+            id: DeclarationId(2283),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75466,7 +75497,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9513, 9525),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2282),
+            id: DeclarationId(2284),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75486,7 +75517,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9795, 9807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2283),
+            id: DeclarationId(2285),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -75496,7 +75527,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "sites".to_string(),
-                        ty: DeclarationId(2282),
+                        ty: DeclarationId(2284),
                     },
                 ],
             },
@@ -75511,7 +75542,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9752, 9809),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2284),
+            id: DeclarationId(2286),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -75530,7 +75561,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10119, 10153),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2285),
+            id: DeclarationId(2287),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -75549,7 +75580,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10556, 10607),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2286),
+            id: DeclarationId(2288),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75563,7 +75594,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10950, 10968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2287),
+            id: DeclarationId(2289),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -75592,7 +75623,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 11357, 11469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2288),
+            id: DeclarationId(2290),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -75612,7 +75643,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4846, 4866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2289),
+            id: DeclarationId(2291),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -75638,7 +75669,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4876, 4900),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2290),
+            id: DeclarationId(2292),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -75664,7 +75695,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4911, 4935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2291),
+            id: DeclarationId(2293),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -75690,7 +75721,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4941, 4965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2292),
+            id: DeclarationId(2294),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -75710,7 +75741,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5042, 5062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2293),
+            id: DeclarationId(2295),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -75736,7 +75767,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5072, 5096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2294),
+            id: DeclarationId(2296),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -75762,7 +75793,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5107, 5131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2295),
+            id: DeclarationId(2297),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -75788,7 +75819,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5137, 5161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2296),
+            id: DeclarationId(2298),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -75808,7 +75839,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5245, 5265),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2297),
+            id: DeclarationId(2299),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -75834,7 +75865,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5276, 5300),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2298),
+            id: DeclarationId(2300),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -75860,7 +75891,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5325, 5349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2299),
+            id: DeclarationId(2301),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -75880,7 +75911,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5440, 5460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2300),
+            id: DeclarationId(2302),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -75906,7 +75937,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5471, 5495),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2301),
+            id: DeclarationId(2303),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -75932,7 +75963,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5520, 5544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2302),
+            id: DeclarationId(2304),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -75951,7 +75982,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1634, 1651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2303),
+            id: DeclarationId(2305),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -75976,7 +76007,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1656, 1697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2304),
+            id: DeclarationId(2306),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75990,7 +76021,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1879, 1891),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2305),
+            id: DeclarationId(2307),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -76009,7 +76040,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1896, 1932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2306),
+            id: DeclarationId(2308),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -76029,13 +76060,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2414, 2430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2307),
+            id: DeclarationId(2309),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2306),
+                    value: DeclarationId(2308),
                 }],
             },
             type_params: vec![],
@@ -76049,7 +76080,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2409, 2431),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2308),
+            id: DeclarationId(2310),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -76063,7 +76094,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "witnesses".to_string(),
-                        ty: DeclarationId(2307),
+                        ty: DeclarationId(2309),
                     },
                 ],
             },
@@ -76078,7 +76109,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2325, 2437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2309),
+            id: DeclarationId(2311),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -76098,7 +76129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2505, 2521),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2310),
+            id: DeclarationId(2312),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -76118,13 +76149,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2544, 2560),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2311),
+            id: DeclarationId(2313),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2310),
+                    value: DeclarationId(2312),
                 }],
             },
             type_params: vec![],
@@ -76138,7 +76169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2539, 2561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2312),
+            id: DeclarationId(2314),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -76148,11 +76179,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "violations".to_string(),
-                        ty: DeclarationId(2309),
+                        ty: DeclarationId(2311),
                     },
                     Field {
                         label: "witnesses".to_string(),
-                        ty: DeclarationId(2311),
+                        ty: DeclarationId(2313),
                     },
                 ],
             },
@@ -76167,7 +76198,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2442, 2567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2313),
+            id: DeclarationId(2315),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -76187,11 +76218,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3902, 3918),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2314),
+            id: DeclarationId(2316),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2313),
+                output: DeclarationId(2315),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -76205,7 +76236,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3881, 3918),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2315),
+            id: DeclarationId(2317),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
@@ -76225,7 +76256,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3930, 3945),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2316),
+            id: DeclarationId(2318),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(827), DeclarationId(990)],
@@ -76243,7 +76274,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3966, 4009),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2317),
+            id: DeclarationId(2319),
             name: Some("DimensionUnitAbelianGroup".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(25),
@@ -76263,7 +76294,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2318),
+            id: DeclarationId(2320),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76277,7 +76308,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3709, 3721),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2319),
+            id: DeclarationId(2321),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -76296,7 +76327,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3726, 3762),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2320),
+            id: DeclarationId(2322),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -76316,7 +76347,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 855, 873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2321),
+            id: DeclarationId(2323),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76330,7 +76361,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4373, 4389),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2322),
+            id: DeclarationId(2324),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -76349,7 +76380,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4394, 4422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2323),
+            id: DeclarationId(2325),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76363,7 +76394,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4665, 4686),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2324),
+            id: DeclarationId(2326),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -76382,7 +76413,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5176, 5195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2325),
+            id: DeclarationId(2327),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -76401,7 +76432,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5200, 5222),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2326),
+            id: DeclarationId(2328),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -76421,7 +76452,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5591, 5614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2327),
+            id: DeclarationId(2329),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76435,7 +76466,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6611, 6619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2328),
+            id: DeclarationId(2330),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76449,7 +76480,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6624, 6632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2329),
+            id: DeclarationId(2331),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76463,7 +76494,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7073, 7078),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2330),
+            id: DeclarationId(2332),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76477,7 +76508,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7083, 7091),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2331),
+            id: DeclarationId(2333),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76491,7 +76522,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7427, 7440),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2332),
+            id: DeclarationId(2334),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76505,7 +76536,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7445, 7451),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2333),
+            id: DeclarationId(2335),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76519,7 +76550,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7709, 7717),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2334),
+            id: DeclarationId(2336),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76533,7 +76564,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7722, 7727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2335),
+            id: DeclarationId(2337),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76547,7 +76578,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7732, 7745),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2336),
+            id: DeclarationId(2338),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76561,7 +76592,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8082, 8100),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2337),
+            id: DeclarationId(2339),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76575,7 +76606,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9475, 9484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2338),
+            id: DeclarationId(2340),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76589,7 +76620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9489, 9502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2339),
+            id: DeclarationId(2341),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76603,7 +76634,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9507, 9515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2340),
+            id: DeclarationId(2342),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76617,7 +76648,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9520, 9530),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2341),
+            id: DeclarationId(2343),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76631,7 +76662,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9535, 9545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2342),
+            id: DeclarationId(2344),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76645,7 +76676,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9550, 9561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2343),
+            id: DeclarationId(2345),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76659,7 +76690,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9566, 9574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2344),
+            id: DeclarationId(2346),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76673,7 +76704,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9579, 9586),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2345),
+            id: DeclarationId(2347),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76687,7 +76718,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9591, 9601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2346),
+            id: DeclarationId(2348),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76701,7 +76732,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9606, 9618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2347),
+            id: DeclarationId(2349),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76715,7 +76746,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12311, 12337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2348),
+            id: DeclarationId(2350),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76729,7 +76760,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12342, 12352),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2349),
+            id: DeclarationId(2351),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76743,7 +76774,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17117, 17123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2350),
+            id: DeclarationId(2352),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76757,7 +76788,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17128, 17139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2351),
+            id: DeclarationId(2353),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76771,7 +76802,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17459, 17470),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2352),
+            id: DeclarationId(2354),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76785,7 +76816,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17475, 17486),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2353),
+            id: DeclarationId(2355),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76799,7 +76830,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 19419, 19430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2354),
+            id: DeclarationId(2356),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76813,7 +76844,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 19435, 19443),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2355),
+            id: DeclarationId(2357),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -76832,7 +76863,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 20606, 20641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2356),
+            id: DeclarationId(2358),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -76857,7 +76888,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 20646, 20734),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2357),
+            id: DeclarationId(2359),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -76877,7 +76908,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6894, 6922),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2358),
+            id: DeclarationId(2360),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -76896,7 +76927,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2359),
+            id: DeclarationId(2361),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -76915,7 +76946,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2360),
+            id: DeclarationId(2362),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -76935,7 +76966,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27850, 27865),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2361),
+            id: DeclarationId(2363),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -76955,7 +76986,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 29879, 29895),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2362),
+            id: DeclarationId(2364),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -76975,7 +77006,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 29988, 30004),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2363),
+            id: DeclarationId(2365),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -76995,13 +77026,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 30102, 30118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2364),
+            id: DeclarationId(2366),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2363),
+                    value: DeclarationId(2365),
                 }],
             },
             type_params: vec![],
@@ -77015,7 +77046,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 30097, 30119),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2365),
+            id: DeclarationId(2367),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -77034,7 +77065,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2366),
+            id: DeclarationId(2368),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -77053,7 +77084,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2367),
+            id: DeclarationId(2369),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -77072,7 +77103,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2368),
+            id: DeclarationId(2370),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -77091,7 +77122,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2369),
+            id: DeclarationId(2371),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -77110,7 +77141,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2370),
+            id: DeclarationId(2372),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -77129,7 +77160,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2371),
+            id: DeclarationId(2373),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77143,7 +77174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5629, 5644),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2372),
+            id: DeclarationId(2374),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77157,7 +77188,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5684, 5697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2373),
+            id: DeclarationId(2375),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77171,7 +77202,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5745, 5762),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2374),
+            id: DeclarationId(2376),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77185,7 +77216,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5801, 5813),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2375),
+            id: DeclarationId(2377),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77199,7 +77230,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5861, 5878),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2376),
+            id: DeclarationId(2378),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -77224,7 +77255,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 9971, 10033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2377),
+            id: DeclarationId(2379),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77243,7 +77274,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10038, 10080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2378),
+            id: DeclarationId(2380),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -77268,7 +77299,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10085, 10142),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2379),
+            id: DeclarationId(2381),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77282,7 +77313,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10147, 10161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2380),
+            id: DeclarationId(2382),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77296,7 +77327,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10166, 10181),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2381),
+            id: DeclarationId(2383),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77310,7 +77341,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24135, 24149),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2382),
+            id: DeclarationId(2384),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77329,7 +77360,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24154, 24201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2383),
+            id: DeclarationId(2385),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -77354,7 +77385,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24206, 24283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2384),
+            id: DeclarationId(2386),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -77379,7 +77410,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24288, 24362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2385),
+            id: DeclarationId(2387),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -77404,7 +77435,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24982, 25038),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2386),
+            id: DeclarationId(2388),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77423,7 +77454,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 25054, 25079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2387),
+            id: DeclarationId(2389),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77437,7 +77468,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26728, 26741),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2388),
+            id: DeclarationId(2390),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77456,7 +77487,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26785, 26817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2389),
+            id: DeclarationId(2391),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -77476,12 +77507,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26880, 26896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2390),
+            id: DeclarationId(2392),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "factors".to_string(),
-                    ty: DeclarationId(2389),
+                    ty: DeclarationId(2391),
                 }],
             },
             type_params: vec![],
@@ -77495,7 +77526,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26856, 26898),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2391),
+            id: DeclarationId(2393),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -77515,13 +77546,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26960, 26976),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2392),
+            id: DeclarationId(2394),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2391),
+                    value: DeclarationId(2393),
                 }],
             },
             type_params: vec![],
@@ -77535,12 +77566,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26955, 26977),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2393),
+            id: DeclarationId(2395),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-                    ty: DeclarationId(2392),
+                    ty: DeclarationId(2394),
                 }],
             },
             type_params: vec![],
@@ -77554,7 +77585,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26927, 26979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2394),
+            id: DeclarationId(2396),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -77574,12 +77605,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27277, 27292),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2395),
+            id: DeclarationId(2397),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-                    ty: DeclarationId(2394),
+                    ty: DeclarationId(2396),
                 }],
             },
             type_params: vec![],
@@ -77593,7 +77624,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27259, 27294),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2396),
+            id: DeclarationId(2398),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77607,7 +77638,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27377, 27389),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2397),
+            id: DeclarationId(2399),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77621,13 +77652,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27459, 27469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2398),
+            id: DeclarationId(2400),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1311),
+                    value: DeclarationId(1313),
                 }],
             },
             type_params: vec![],
@@ -77641,13 +77672,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(2399),
+            id: DeclarationId(2401),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1311),
+                    value: DeclarationId(1313),
                 }],
             },
             type_params: vec![],
@@ -77661,7 +77692,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(2400),
+            id: DeclarationId(2402),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -77681,11 +77712,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4180, 4190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2401),
+            id: DeclarationId(2403),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2400),
+                output: DeclarationId(2402),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -77699,7 +77730,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4159, 4190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2402),
+            id: DeclarationId(2404),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
@@ -77719,7 +77750,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4205, 4214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2403),
+            id: DeclarationId(2405),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1129), DeclarationId(1129)],
@@ -77737,7 +77768,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4225, 4238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2404),
+            id: DeclarationId(2406),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1129), DeclarationId(818)],
@@ -77755,7 +77786,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4250, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2405),
+            id: DeclarationId(2407),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(1129)],
@@ -77773,7 +77804,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4284, 4316),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2406),
+            id: DeclarationId(2408),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77792,7 +77823,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 3305, 3352),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2407),
+            id: DeclarationId(2409),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -77817,7 +77848,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 3357, 3418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2408),
+            id: DeclarationId(2410),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77831,7 +77862,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 4297, 4302),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2409),
+            id: DeclarationId(2411),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1133)],
@@ -77849,7 +77880,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 5301, 5321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2410),
+            id: DeclarationId(2412),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1134), DeclarationId(1134)],
@@ -77867,7 +77898,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 5334, 5360),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2411),
+            id: DeclarationId(2413),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1128),
@@ -77887,7 +77918,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 7360, 7372),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2412),
+            id: DeclarationId(2414),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1132),
@@ -77913,7 +77944,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 7388, 7419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2413),
+            id: DeclarationId(2415),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1135),
@@ -77939,7 +77970,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 9093, 9124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2414),
+            id: DeclarationId(2416),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1128),
@@ -77959,7 +77990,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 10144, 10156),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2415),
+            id: DeclarationId(2417),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -77979,7 +78010,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4589, 4600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2416),
+            id: DeclarationId(2418),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -77999,7 +78030,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4642, 4653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2417),
+            id: DeclarationId(2419),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -78013,7 +78044,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4544, 4548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2418),
+            id: DeclarationId(2420),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -78032,7 +78063,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4553, 4563),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2419),
+            id: DeclarationId(2421),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78052,7 +78083,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1179, 1196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2420),
+            id: DeclarationId(2422),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -78071,7 +78102,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2421),
+            id: DeclarationId(2423),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78091,12 +78122,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1747, 1764),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2422),
+            id: DeclarationId(2424),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2421),
+                    ty: DeclarationId(2423),
                 }],
             },
             type_params: vec![],
@@ -78110,7 +78141,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1736, 1765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2423),
+            id: DeclarationId(2425),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78130,12 +78161,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1777, 1795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2424),
+            id: DeclarationId(2426),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2423),
+                    ty: DeclarationId(2425),
                 }],
             },
             type_params: vec![],
@@ -78149,7 +78180,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1770, 1796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2425),
+            id: DeclarationId(2427),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78174,7 +78205,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2073, 2113),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2426),
+            id: DeclarationId(2428),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78194,7 +78225,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2165, 2182),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2427),
+            id: DeclarationId(2429),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78204,7 +78235,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2426),
+                        ty: DeclarationId(2428),
                     },
                     Field {
                         label: "span".to_string(),
@@ -78223,7 +78254,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2118, 2211),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2428),
+            id: DeclarationId(2430),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78248,7 +78279,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2216, 2280),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2429),
+            id: DeclarationId(2431),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78268,13 +78299,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2307, 2324),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2430),
+            id: DeclarationId(2432),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(2429),
+                        ty: DeclarationId(2431),
                     },
                     Field {
                         label: "output".to_string(),
@@ -78297,7 +78328,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2285, 2379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2431),
+            id: DeclarationId(2433),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78322,7 +78353,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3749, 3795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2432),
+            id: DeclarationId(2434),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78351,7 +78382,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3800, 3883),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2433),
+            id: DeclarationId(2435),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78371,7 +78402,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3937, 3962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2434),
+            id: DeclarationId(2436),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78381,7 +78412,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2433),
+                        ty: DeclarationId(2435),
                     },
                     Field {
                         label: "span".to_string(),
@@ -78400,7 +78431,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3888, 3991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2435),
+            id: DeclarationId(2437),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -78419,7 +78450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4663, 4674),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2436),
+            id: DeclarationId(2438),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -78438,7 +78469,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4679, 4689),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2437),
+            id: DeclarationId(2439),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -78457,7 +78488,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4694, 4708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2438),
+            id: DeclarationId(2440),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78482,7 +78513,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4822, 4873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2439),
+            id: DeclarationId(2441),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78507,7 +78538,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4878, 4916),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2440),
+            id: DeclarationId(2442),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78527,7 +78558,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4944, 4956),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2441),
+            id: DeclarationId(2443),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78547,17 +78578,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4978, 4994),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2442),
+            id: DeclarationId(2444),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "segments".to_string(),
-                        ty: DeclarationId(2440),
+                        ty: DeclarationId(2442),
                     },
                     Field {
                         label: "segment_spans".to_string(),
-                        ty: DeclarationId(2441),
+                        ty: DeclarationId(2443),
                     },
                     Field {
                         label: "span".to_string(),
@@ -78576,7 +78607,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4921, 5023),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2443),
+            id: DeclarationId(2445),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78596,7 +78627,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5068, 5085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2444),
+            id: DeclarationId(2446),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78606,7 +78637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2443),
+                        ty: DeclarationId(2445),
                     },
                     Field {
                         label: "span".to_string(),
@@ -78625,7 +78656,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5028, 5114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2445),
+            id: DeclarationId(2447),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78645,7 +78676,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5685, 5697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2446),
+            id: DeclarationId(2448),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78665,7 +78696,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5719, 5735),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2447),
+            id: DeclarationId(2449),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78685,21 +78716,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5748, 5765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2448),
+            id: DeclarationId(2450),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "segments".to_string(),
-                        ty: DeclarationId(2445),
+                        ty: DeclarationId(2447),
                     },
                     Field {
                         label: "segment_spans".to_string(),
-                        ty: DeclarationId(2446),
+                        ty: DeclarationId(2448),
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2447),
+                        ty: DeclarationId(2449),
                     },
                     Field {
                         label: "span".to_string(),
@@ -78718,7 +78749,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5658, 5794),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2449),
+            id: DeclarationId(2451),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78738,7 +78769,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5850, 5874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2450),
+            id: DeclarationId(2452),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78748,7 +78779,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2449),
+                        ty: DeclarationId(2451),
                     },
                     Field {
                         label: "span".to_string(),
@@ -78767,7 +78798,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5799, 5903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2451),
+            id: DeclarationId(2453),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78787,7 +78818,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5954, 5971),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2452),
+            id: DeclarationId(2454),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78797,7 +78828,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2451),
+                        ty: DeclarationId(2453),
                     },
                     Field {
                         label: "span".to_string(),
@@ -78816,7 +78847,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5908, 6000),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2453),
+            id: DeclarationId(2455),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78836,13 +78867,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6028, 6040),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2454),
+            id: DeclarationId(2456),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(2453),
+                        ty: DeclarationId(2455),
                     },
                     Field {
                         label: "body".to_string(),
@@ -78865,7 +78896,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6005, 6093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2455),
+            id: DeclarationId(2457),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78898,7 +78929,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6098, 6217),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2456),
+            id: DeclarationId(2458),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78918,7 +78949,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6271, 6292),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2457),
+            id: DeclarationId(2459),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78928,7 +78959,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "arms".to_string(),
-                        ty: DeclarationId(2456),
+                        ty: DeclarationId(2458),
                     },
                     Field {
                         label: "span".to_string(),
@@ -78947,7 +78978,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6222, 6321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2458),
+            id: DeclarationId(2460),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78967,13 +78998,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6349, 6373),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2459),
+            id: DeclarationId(2461),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2458),
+                        ty: DeclarationId(2460),
                     },
                     Field {
                         label: "span".to_string(),
@@ -78992,7 +79023,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6326, 6402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2460),
+            id: DeclarationId(2462),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79012,13 +79043,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6430, 6447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2461),
+            id: DeclarationId(2463),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "elements".to_string(),
-                        ty: DeclarationId(2460),
+                        ty: DeclarationId(2462),
                     },
                     Field {
                         label: "span".to_string(),
@@ -79037,7 +79068,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6407, 6476),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2462),
+            id: DeclarationId(2464),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79057,13 +79088,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 8570, 8591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2463),
+            id: DeclarationId(2465),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "entries".to_string(),
-                        ty: DeclarationId(2462),
+                        ty: DeclarationId(2464),
                     },
                     Field {
                         label: "span".to_string(),
@@ -79082,7 +79113,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 8549, 8620),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2464),
+            id: DeclarationId(2466),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -79101,7 +79132,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2465),
+            id: DeclarationId(2467),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -79111,7 +79142,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_ann".to_string(),
-                        ty: DeclarationId(2464),
+                        ty: DeclarationId(2466),
                     },
                     Field {
                         label: "expr".to_string(),
@@ -79130,7 +79161,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9510, 9593),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2466),
+            id: DeclarationId(2468),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79150,7 +79181,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9641, 9653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2467),
+            id: DeclarationId(2469),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79170,7 +79201,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9668, 9686),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2468),
+            id: DeclarationId(2470),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -79180,11 +79211,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2466),
+                        ty: DeclarationId(2468),
                     },
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(2467),
+                        ty: DeclarationId(2469),
                     },
                     Field {
                         label: "return_type".to_string(),
@@ -79211,7 +79242,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9598, 9770),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2469),
+            id: DeclarationId(2471),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79231,7 +79262,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9830, 9842),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2470),
+            id: DeclarationId(2472),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79251,7 +79282,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9857, 9875),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2471),
+            id: DeclarationId(2473),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -79261,11 +79292,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2469),
+                        ty: DeclarationId(2471),
                     },
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(2470),
+                        ty: DeclarationId(2472),
                     },
                     Field {
                         label: "return_type".to_string(),
@@ -79292,7 +79323,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9775, 9963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2472),
+            id: DeclarationId(2474),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -79311,7 +79342,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2473),
+            id: DeclarationId(2475),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -79325,7 +79356,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(2472),
+                        ty: DeclarationId(2474),
                     },
                     Field {
                         label: "body_span".to_string(),
@@ -79348,7 +79379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9968, 10097),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2474),
+            id: DeclarationId(2476),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79368,13 +79399,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10117, 10129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2475),
+            id: DeclarationId(2477),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(2474),
+                        ty: DeclarationId(2476),
                     },
                     Field {
                         label: "span".to_string(),
@@ -79393,7 +79424,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10102, 10149),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2476),
+            id: DeclarationId(2478),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79413,7 +79444,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10175, 10187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2477),
+            id: DeclarationId(2479),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79433,17 +79464,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10201, 10213),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2478),
+            id: DeclarationId(2480),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(2476),
+                        ty: DeclarationId(2478),
                     },
                     Field {
                         label: "names".to_string(),
-                        ty: DeclarationId(2477),
+                        ty: DeclarationId(2479),
                     },
                     Field {
                         label: "span".to_string(),
@@ -79462,7 +79493,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10154, 10242),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2479),
+            id: DeclarationId(2481),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79482,7 +79513,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10296, 10308),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2480),
+            id: DeclarationId(2482),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -79492,7 +79523,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2479),
+                        ty: DeclarationId(2481),
                     },
                     Field {
                         label: "span".to_string(),
@@ -79511,7 +79542,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10247, 10337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2481),
+            id: DeclarationId(2483),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79531,7 +79562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10393, 10405),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2482),
+            id: DeclarationId(2484),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79551,7 +79582,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10420, 10438),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2483),
+            id: DeclarationId(2485),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -79561,11 +79592,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2481),
+                        ty: DeclarationId(2483),
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2482),
+                        ty: DeclarationId(2484),
                     },
                     Field {
                         label: "span".to_string(),
@@ -79584,7 +79615,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10342, 10467),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2484),
+            id: DeclarationId(2486),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79604,7 +79635,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10520, 10532),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2485),
+            id: DeclarationId(2487),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79624,7 +79655,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10549, 10569),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2486),
+            id: DeclarationId(2488),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -79643,7 +79674,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2487),
+            id: DeclarationId(2489),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -79653,15 +79684,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2484),
+                        ty: DeclarationId(2486),
                     },
                     Field {
                         label: "variants".to_string(),
-                        ty: DeclarationId(2485),
+                        ty: DeclarationId(2487),
                     },
                     Field {
                         label: "inhabits".to_string(),
-                        ty: DeclarationId(2486),
+                        ty: DeclarationId(2488),
                     },
                     Field {
                         label: "span".to_string(),
@@ -79680,7 +79711,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10472, 10627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2488),
+            id: DeclarationId(2490),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79700,7 +79731,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10682, 10694),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2489),
+            id: DeclarationId(2491),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -79719,7 +79750,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2490),
+            id: DeclarationId(2492),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -79729,7 +79760,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2488),
+                        ty: DeclarationId(2490),
                     },
                     Field {
                         label: "nominal_opaque".to_string(),
@@ -79741,7 +79772,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "refinement".to_string(),
-                        ty: DeclarationId(2489),
+                        ty: DeclarationId(2491),
                     },
                     Field {
                         label: "span".to_string(),
@@ -79760,7 +79791,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10632, 10807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2491),
+            id: DeclarationId(2493),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79784,7 +79815,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2492),
+            id: DeclarationId(2494),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79804,7 +79835,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 11243, 11254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2493),
+            id: DeclarationId(2495),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -79823,7 +79854,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2137, 2162),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2494),
+            id: DeclarationId(2496),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79843,12 +79874,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2179, 2195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2495),
+            id: DeclarationId(2497),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2494),
+                    ty: DeclarationId(2496),
                 }],
             },
             type_params: vec![],
@@ -79862,7 +79893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2167, 2196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2496),
+            id: DeclarationId(2498),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -79887,7 +79918,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2201, 2252),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2497),
+            id: DeclarationId(2499),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -79906,7 +79937,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2257, 2272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2498),
+            id: DeclarationId(2500),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -79925,7 +79956,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2277, 2304),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2499),
+            id: DeclarationId(2501),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -79951,7 +79982,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 3936, 3954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2500),
+            id: DeclarationId(2502),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79971,7 +80002,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 4542, 4557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2501),
+            id: DeclarationId(2503),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -79990,7 +80021,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 5388, 5442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2502),
+            id: DeclarationId(2504),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -80004,7 +80035,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 5682, 5691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2503),
+            id: DeclarationId(2505),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -80018,7 +80049,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 5694, 5704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2504),
+            id: DeclarationId(2506),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80038,7 +80069,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5769, 5797),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2505),
+            id: DeclarationId(2507),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -80064,7 +80095,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/services.dag", 6784, 6807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2506),
+            id: DeclarationId(2508),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -80084,7 +80115,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2507),
+            id: DeclarationId(2509),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -80104,7 +80135,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4626, 4652),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2508),
+            id: DeclarationId(2510),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80124,7 +80155,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4920, 4937),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2509),
+            id: DeclarationId(2511),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80144,7 +80175,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4988, 5002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2510),
+            id: DeclarationId(2512),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80164,7 +80195,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5052, 5065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2511),
+            id: DeclarationId(2513),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80184,7 +80215,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5115, 5128),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2512),
+            id: DeclarationId(2514),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80204,7 +80235,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5176, 5192),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2513),
+            id: DeclarationId(2515),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -80224,13 +80255,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5245, 5271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2514),
+            id: DeclarationId(2516),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2513),
+                    value: DeclarationId(2515),
                 }],
             },
             type_params: vec![],
@@ -80244,7 +80275,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5240, 5272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2515),
+            id: DeclarationId(2517),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -80264,13 +80295,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5346, 5372),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2516),
+            id: DeclarationId(2518),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2515),
+                    value: DeclarationId(2517),
                 }],
             },
             type_params: vec![],
@@ -80284,7 +80315,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5341, 5373),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2517),
+            id: DeclarationId(2519),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80304,7 +80335,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5498, 5514),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2518),
+            id: DeclarationId(2520),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -80324,7 +80355,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5639, 5673),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2519),
+            id: DeclarationId(2521),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -80344,7 +80375,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5885, 5919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2520),
+            id: DeclarationId(2522),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -80364,7 +80395,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6404, 6438),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2521),
+            id: DeclarationId(2523),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -80384,7 +80415,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6665, 6699),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2522),
+            id: DeclarationId(2524),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -80404,7 +80435,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6955, 6989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2523),
+            id: DeclarationId(2525),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -80424,7 +80455,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7169, 7195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2524),
+            id: DeclarationId(2526),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -80444,7 +80475,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7200, 7234),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2525),
+            id: DeclarationId(2527),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -80464,10 +80495,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8469, 8503),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2526),
+            id: DeclarationId(2528),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2302),
+                template: DeclarationId(2304),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -80484,10 +80515,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2527),
+            id: DeclarationId(2529),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2302),
+                template: DeclarationId(2304),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -80504,10 +80535,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2528),
+            id: DeclarationId(2530),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2302),
+                template: DeclarationId(2304),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -80524,10 +80555,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2529),
+            id: DeclarationId(2531),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2302),
+                template: DeclarationId(2304),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -80544,10 +80575,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2530),
+            id: DeclarationId(2532),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2302),
+                template: DeclarationId(2304),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -80564,10 +80595,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2531),
+            id: DeclarationId(2533),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2302),
+                template: DeclarationId(2304),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -80584,10 +80615,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2532),
+            id: DeclarationId(2534),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2302),
+                template: DeclarationId(2304),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -80604,10 +80635,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2533),
+            id: DeclarationId(2535),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2302),
+                template: DeclarationId(2304),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -80624,10 +80655,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2534),
+            id: DeclarationId(2536),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2302),
+                template: DeclarationId(2304),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -80644,10 +80675,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2535),
+            id: DeclarationId(2537),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2302),
+                template: DeclarationId(2304),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -80664,10 +80695,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2536),
+            id: DeclarationId(2538),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1814),
+                template: DeclarationId(1816),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(799),
@@ -80684,10 +80715,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4920, 4937),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2537),
+            id: DeclarationId(2539),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1814),
+                template: DeclarationId(1816),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(827),
@@ -80704,10 +80735,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4988, 5002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2538),
+            id: DeclarationId(2540),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1814),
+                template: DeclarationId(1816),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(781),
@@ -80724,10 +80755,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5052, 5065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2539),
+            id: DeclarationId(2541),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1814),
+                template: DeclarationId(1816),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(817),
@@ -80744,10 +80775,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5115, 5128),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2540),
+            id: DeclarationId(2542),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1814),
+                template: DeclarationId(1816),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(982),
@@ -80764,13 +80795,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5176, 5192),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2541),
+            id: DeclarationId(2543),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1814),
+                template: DeclarationId(1816),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2513),
+                    value: DeclarationId(2515),
                 }],
             },
             type_params: vec![],
@@ -80784,13 +80815,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5240, 5272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2542),
+            id: DeclarationId(2544),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1816),
+                template: DeclarationId(1818),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2515),
+                    value: DeclarationId(2517),
                 }],
             },
             type_params: vec![],
@@ -80804,10 +80835,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5341, 5373),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2543),
+            id: DeclarationId(2545),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2302),
+                template: DeclarationId(2304),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -80824,10 +80855,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5346, 5372),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2544),
+            id: DeclarationId(2546),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1816),
+                template: DeclarationId(1818),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(982),
@@ -80844,10 +80875,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5498, 5514),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2545),
+            id: DeclarationId(2547),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2308),
+                template: DeclarationId(2310),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(988),
                     value: DeclarationId(1237),
@@ -80864,10 +80895,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5639, 5673),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2546),
+            id: DeclarationId(2548),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2312),
+                template: DeclarationId(2314),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(988),
                     value: DeclarationId(1237),
@@ -80884,7 +80915,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5885, 5919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2547),
+            id: DeclarationId(2549),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -80903,7 +80934,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2548),
+            id: DeclarationId(2550),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -80922,7 +80953,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2549),
+            id: DeclarationId(2551),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -80941,7 +80972,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2550),
+            id: DeclarationId(2552),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -80967,7 +80998,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2732, 2760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2551),
+            id: DeclarationId(2553),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -80993,7 +81024,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2804, 2832),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2552),
+            id: DeclarationId(2554),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -81012,7 +81043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2553),
+            id: DeclarationId(2555),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -81031,7 +81062,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2554),
+            id: DeclarationId(2556),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(11),
@@ -81057,7 +81088,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 12353, 12399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2555),
+            id: DeclarationId(2557),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81071,7 +81102,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 767, 773),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2556),
+            id: DeclarationId(2558),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81085,7 +81116,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 778, 791),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2557),
+            id: DeclarationId(2559),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81099,7 +81130,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 796, 810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2558),
+            id: DeclarationId(2560),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81118,7 +81149,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3332, 3358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2559),
+            id: DeclarationId(2561),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81137,7 +81168,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3363, 3391),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2560),
+            id: DeclarationId(2562),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81156,7 +81187,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3396, 3429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2561),
+            id: DeclarationId(2563),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81175,7 +81206,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3434, 3465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2562),
+            id: DeclarationId(2564),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81194,7 +81225,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3470, 3502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2563),
+            id: DeclarationId(2565),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81208,7 +81239,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4509, 4516),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2564),
+            id: DeclarationId(2566),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81227,7 +81258,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4521, 4571),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2565),
+            id: DeclarationId(2567),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81241,7 +81272,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 5484, 5495),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2566),
+            id: DeclarationId(2568),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81260,7 +81291,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 5500, 5545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2567),
+            id: DeclarationId(2569),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81279,7 +81310,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7649, 7683),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2568),
+            id: DeclarationId(2570),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81298,7 +81329,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7688, 7732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2569),
+            id: DeclarationId(2571),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81317,7 +81348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7737, 7795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2570),
+            id: DeclarationId(2572),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81336,7 +81367,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7800, 7856),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2571),
+            id: DeclarationId(2573),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81355,7 +81386,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7861, 7894),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2572),
+            id: DeclarationId(2574),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81374,7 +81405,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7899, 7929),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2573),
+            id: DeclarationId(2575),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81388,7 +81419,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7934, 7947),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2574),
+            id: DeclarationId(2576),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -81408,7 +81439,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7987, 8009),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2575),
+            id: DeclarationId(2577),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -81428,7 +81459,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 8219, 8240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2576),
+            id: DeclarationId(2578),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81442,7 +81473,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 8740, 8746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2577),
+            id: DeclarationId(2579),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81456,7 +81487,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 9139, 9152),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2578),
+            id: DeclarationId(2580),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81470,7 +81501,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 9157, 9171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2579),
+            id: DeclarationId(2581),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81489,7 +81520,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 10263, 10297),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2580),
+            id: DeclarationId(2582),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81503,7 +81534,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 10302, 10320),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2581),
+            id: DeclarationId(2583),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -81529,7 +81560,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 11234, 11261),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2582),
+            id: DeclarationId(2584),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -81549,7 +81580,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8271, 8287),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2583),
+            id: DeclarationId(2585),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -81569,7 +81600,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2584),
+            id: DeclarationId(2586),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81588,7 +81619,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4032, 4066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2585),
+            id: DeclarationId(2587),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81602,7 +81633,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4071, 4081),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2586),
+            id: DeclarationId(2588),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81616,7 +81647,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4086, 4095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2587),
+            id: DeclarationId(2589),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81630,7 +81661,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4100, 4105),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2588),
+            id: DeclarationId(2590),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -81650,10 +81681,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 5943, 5971),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2589),
+            id: DeclarationId(2591),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1814),
+                template: DeclarationId(1816),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(978),
@@ -81670,10 +81701,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8271, 8287),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2590),
+            id: DeclarationId(2592),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2302),
+                template: DeclarationId(2304),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -81690,10 +81721,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2591),
+            id: DeclarationId(2593),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2302),
+                template: DeclarationId(2304),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -81710,10 +81741,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2592),
+            id: DeclarationId(2594),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2302),
+                template: DeclarationId(2304),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -81730,10 +81761,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2593),
+            id: DeclarationId(2595),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2302),
+                template: DeclarationId(2304),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -81750,10 +81781,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2594),
+            id: DeclarationId(2596),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2302),
+                template: DeclarationId(2304),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -81770,10 +81801,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2595),
+            id: DeclarationId(2597),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2302),
+                template: DeclarationId(2304),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -81790,10 +81821,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2596),
+            id: DeclarationId(2598),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2302),
+                template: DeclarationId(2304),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -81810,10 +81841,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2597),
+            id: DeclarationId(2599),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2302),
+                template: DeclarationId(2304),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -81830,10 +81861,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2598),
+            id: DeclarationId(2600),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2302),
+                template: DeclarationId(2304),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -81850,10 +81881,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2599),
+            id: DeclarationId(2601),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2302),
+                template: DeclarationId(2304),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1237),
@@ -81870,7 +81901,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2600),
+            id: DeclarationId(2602),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81884,7 +81915,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 646, 651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2601),
+            id: DeclarationId(2603),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81898,7 +81929,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 656, 660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2602),
+            id: DeclarationId(2604),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81912,7 +81943,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 665, 671),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2603),
+            id: DeclarationId(2605),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81926,7 +81957,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 676, 682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2604),
+            id: DeclarationId(2606),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81940,7 +81971,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 687, 691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2605),
+            id: DeclarationId(2607),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81954,7 +81985,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 696, 702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2606),
+            id: DeclarationId(2608),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81968,7 +81999,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 707, 715),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2607),
+            id: DeclarationId(2609),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81982,7 +82013,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 720, 728),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2608),
+            id: DeclarationId(2610),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81996,7 +82027,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 733, 740),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2609),
+            id: DeclarationId(2611),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82010,7 +82041,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 745, 751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2610),
+            id: DeclarationId(2612),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82024,7 +82055,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 756, 763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2611),
+            id: DeclarationId(2613),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82038,7 +82069,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 768, 774),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2612),
+            id: DeclarationId(2614),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82052,7 +82083,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 779, 786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2613),
+            id: DeclarationId(2615),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -82071,7 +82102,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 791, 804),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2614),
+            id: DeclarationId(2616),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -82090,7 +82121,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 889, 903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2615),
+            id: DeclarationId(2617),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -82109,7 +82140,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 908, 925),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2616),
+            id: DeclarationId(2618),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82123,7 +82154,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 930, 932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2617),
+            id: DeclarationId(2619),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82137,7 +82168,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 937, 941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2618),
+            id: DeclarationId(2620),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82151,7 +82182,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 946, 951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2619),
+            id: DeclarationId(2621),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82165,7 +82196,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 956, 958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2620),
+            id: DeclarationId(2622),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82179,7 +82210,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 963, 965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2621),
+            id: DeclarationId(2623),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82193,7 +82224,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 970, 972),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2622),
+            id: DeclarationId(2624),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82207,7 +82238,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 977, 979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2623),
+            id: DeclarationId(2625),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82221,7 +82252,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 984, 988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2624),
+            id: DeclarationId(2626),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82235,7 +82266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 993, 998),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2625),
+            id: DeclarationId(2627),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82249,7 +82280,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1003, 1007),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2626),
+            id: DeclarationId(2628),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82263,7 +82294,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1012, 1017),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2627),
+            id: DeclarationId(2629),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82277,7 +82308,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1022, 1028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2628),
+            id: DeclarationId(2630),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82291,7 +82322,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1033, 1041),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2629),
+            id: DeclarationId(2631),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82305,7 +82336,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1046, 1051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2630),
+            id: DeclarationId(2632),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82319,7 +82350,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1056, 1061),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2631),
+            id: DeclarationId(2633),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82333,7 +82364,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1066, 1074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2632),
+            id: DeclarationId(2634),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82347,7 +82378,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1079, 1088),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2633),
+            id: DeclarationId(2635),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82361,7 +82392,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1093, 1096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2634),
+            id: DeclarationId(2636),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82375,7 +82406,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1101, 1107),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2635),
+            id: DeclarationId(2637),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82389,7 +82420,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1112, 1118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2636),
+            id: DeclarationId(2638),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82403,7 +82434,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1123, 1129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2637),
+            id: DeclarationId(2639),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82417,7 +82448,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1134, 1140),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2638),
+            id: DeclarationId(2640),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82431,7 +82462,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1145, 1153),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2639),
+            id: DeclarationId(2641),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82445,7 +82476,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1158, 1166),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2640),
+            id: DeclarationId(2642),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82459,7 +82490,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1171, 1176),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2641),
+            id: DeclarationId(2643),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82473,7 +82504,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1181, 1190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2642),
+            id: DeclarationId(2644),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82487,7 +82518,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1195, 1199),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2643),
+            id: DeclarationId(2645),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82501,7 +82532,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1204, 1212),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2644),
+            id: DeclarationId(2646),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82515,7 +82546,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1217, 1220),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2645),
+            id: DeclarationId(2647),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82529,7 +82560,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1791, 1796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2646),
+            id: DeclarationId(2648),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82543,7 +82574,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1801, 1805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2647),
+            id: DeclarationId(2649),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82557,7 +82588,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1810, 1816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2648),
+            id: DeclarationId(2650),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82571,7 +82602,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1821, 1827),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2649),
+            id: DeclarationId(2651),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82585,7 +82616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1832, 1836),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2650),
+            id: DeclarationId(2652),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82599,7 +82630,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1841, 1847),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2651),
+            id: DeclarationId(2653),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82613,7 +82644,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1852, 1860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2652),
+            id: DeclarationId(2654),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82627,7 +82658,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1865, 1873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2653),
+            id: DeclarationId(2655),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82641,7 +82672,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1878, 1885),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2654),
+            id: DeclarationId(2656),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82655,7 +82686,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1890, 1896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2655),
+            id: DeclarationId(2657),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82669,7 +82700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1901, 1908),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2656),
+            id: DeclarationId(2658),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82683,7 +82714,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1913, 1919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2657),
+            id: DeclarationId(2659),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82697,7 +82728,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1924, 1931),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2658),
+            id: DeclarationId(2660),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82711,7 +82742,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2371, 2373),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2659),
+            id: DeclarationId(2661),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82725,7 +82756,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2378, 2382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2660),
+            id: DeclarationId(2662),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82739,7 +82770,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2387, 2392),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2661),
+            id: DeclarationId(2663),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82753,7 +82784,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2397, 2399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2662),
+            id: DeclarationId(2664),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82767,7 +82798,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2404, 2406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2663),
+            id: DeclarationId(2665),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82781,7 +82812,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2411, 2413),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2664),
+            id: DeclarationId(2666),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82795,7 +82826,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2418, 2420),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2665),
+            id: DeclarationId(2667),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82809,7 +82840,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2425, 2429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2666),
+            id: DeclarationId(2668),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82823,7 +82854,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2434, 2439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2667),
+            id: DeclarationId(2669),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82837,7 +82868,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2444, 2448),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2668),
+            id: DeclarationId(2670),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82851,7 +82882,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2453, 2458),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2669),
+            id: DeclarationId(2671),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82865,7 +82896,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2463, 2469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2670),
+            id: DeclarationId(2672),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82879,7 +82910,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2474, 2482),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2671),
+            id: DeclarationId(2673),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82893,7 +82924,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2487, 2492),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2672),
+            id: DeclarationId(2674),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82907,7 +82938,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2497, 2502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2673),
+            id: DeclarationId(2675),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82921,7 +82952,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2507, 2515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2674),
+            id: DeclarationId(2676),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82935,7 +82966,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2520, 2529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2675),
+            id: DeclarationId(2677),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82949,7 +82980,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2534, 2537),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2676),
+            id: DeclarationId(2678),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82963,7 +82994,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2542, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2677),
+            id: DeclarationId(2679),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82977,7 +83008,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2553, 2559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2678),
+            id: DeclarationId(2680),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82991,7 +83022,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2564, 2570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2679),
+            id: DeclarationId(2681),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83005,7 +83036,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2575, 2581),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2680),
+            id: DeclarationId(2682),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83019,7 +83050,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2586, 2594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2681),
+            id: DeclarationId(2683),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83033,7 +83064,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2599, 2607),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2682),
+            id: DeclarationId(2684),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83047,7 +83078,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2612, 2617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2683),
+            id: DeclarationId(2685),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83061,7 +83092,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2622, 2631),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2684),
+            id: DeclarationId(2686),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83075,7 +83106,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2636, 2640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2685),
+            id: DeclarationId(2687),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83089,7 +83120,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2645, 2653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2686),
+            id: DeclarationId(2688),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -83106,16 +83137,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 27371, 27394),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27585, 27608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2687),
+            id: DeclarationId(2689),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1296),
+                    value: DeclarationId(1298),
                 }],
             },
             type_params: vec![],
@@ -83126,16 +83157,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 28463, 28479),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28677, 28693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2688),
+            id: DeclarationId(2690),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1298),
+                    value: DeclarationId(1300),
                 }],
             },
             type_params: vec![],
@@ -83146,35 +83177,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 28484, 28504),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2689),
-            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", 2612, 2626),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2690),
-            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", 2631, 2641),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28698, 28718),
         });
         declarations.push(Declaration {
             id: DeclarationId(2691),
@@ -83188,7 +83191,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2646, 2658),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2826, 2840),
         });
         declarations.push(Declaration {
             id: DeclarationId(2692),
@@ -83202,7 +83205,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2663, 2676),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2845, 2855),
         });
         declarations.push(Declaration {
             id: DeclarationId(2693),
@@ -83216,7 +83219,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2681, 2693),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2860, 2872),
         });
         declarations.push(Declaration {
             id: DeclarationId(2694),
@@ -83230,7 +83233,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2698, 2710),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2877, 2890),
         });
         declarations.push(Declaration {
             id: DeclarationId(2695),
@@ -83244,7 +83247,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2715, 2737),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2895, 2907),
         });
         declarations.push(Declaration {
             id: DeclarationId(2696),
@@ -83258,7 +83261,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2742, 2761),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2912, 2924),
         });
         declarations.push(Declaration {
             id: DeclarationId(2697),
@@ -83272,7 +83275,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2766, 2791),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2929, 2951),
         });
         declarations.push(Declaration {
             id: DeclarationId(2698),
@@ -83286,7 +83289,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2796, 2819),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2956, 2975),
         });
         declarations.push(Declaration {
             id: DeclarationId(2699),
@@ -83300,17 +83303,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 3225, 3234),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2980, 3005),
         });
         declarations.push(Declaration {
             id: DeclarationId(2700),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -83319,7 +83317,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 3239, 3255),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3010, 3033),
         });
         declarations.push(Declaration {
             id: DeclarationId(2701),
@@ -83333,12 +83331,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 3914, 3922),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3439, 3448),
         });
         declarations.push(Declaration {
             id: DeclarationId(2702),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -83347,7 +83350,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 3927, 3937),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3453, 3469),
         });
         declarations.push(Declaration {
             id: DeclarationId(2703),
@@ -83361,7 +83364,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4162, 4174),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4128, 4136),
         });
         declarations.push(Declaration {
             id: DeclarationId(2704),
@@ -83375,7 +83378,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 4989, 5002),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4141, 4151),
         });
         declarations.push(Declaration {
             id: DeclarationId(2705),
@@ -83389,7 +83392,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 5007, 5020),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4376, 4388),
         });
         declarations.push(Declaration {
             id: DeclarationId(2706),
@@ -83403,11 +83406,39 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 5025, 5033),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5203, 5216),
         });
         declarations.push(Declaration {
             id: DeclarationId(2707),
             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", 5221, 5234),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2708),
+            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", 5239, 5247),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2709),
+            name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
@@ -83428,15 +83459,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 5578, 5645),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5792, 5859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2708),
+            id: DeclarationId(2710),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "var".to_string(),
-                    ty: DeclarationId(1281),
+                    ty: DeclarationId(1283),
                 }],
             },
             type_params: vec![],
@@ -83447,10 +83478,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 5686, 5739),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5900, 5953),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2709),
+            id: DeclarationId(2711),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83461,10 +83492,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 5772, 5801),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5986, 6015),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2710),
+            id: DeclarationId(2712),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83475,10 +83506,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 6403, 6435),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6617, 6649),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2711),
+            id: DeclarationId(2713),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83489,10 +83520,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 6440, 6471),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6654, 6685),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2712),
+            id: DeclarationId(2714),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83503,10 +83534,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 6513, 6545),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6727, 6759),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2713),
+            id: DeclarationId(2715),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83517,10 +83548,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 6550, 6581),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6764, 6795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2714),
+            id: DeclarationId(2716),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83531,10 +83562,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 6586, 6614),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6800, 6828),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2715),
+            id: DeclarationId(2717),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83545,10 +83576,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 6619, 6645),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6833, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2716),
+            id: DeclarationId(2718),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83559,10 +83590,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 6684, 6706),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6898, 6920),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2717),
+            id: DeclarationId(2719),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83573,10 +83604,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 6711, 6739),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6925, 6953),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2718),
+            id: DeclarationId(2720),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83587,10 +83618,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 6744, 6773),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6958, 6987),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2719),
+            id: DeclarationId(2721),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83601,15 +83632,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9583, 9591),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9797, 9805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2720),
+            id: DeclarationId(2722),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1274),
+                    ty: DeclarationId(1276),
                 }],
             },
             type_params: vec![],
@@ -83620,10 +83651,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9596, 9636),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9810, 9850),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2721),
+            id: DeclarationId(2723),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -83639,10 +83670,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9641, 9674),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9855, 9888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2722),
+            id: DeclarationId(2724),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83652,7 +83683,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "state".to_string(),
-                        ty: DeclarationId(1275),
+                        ty: DeclarationId(1277),
                     },
                 ],
             },
@@ -83664,10 +83695,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9679, 9757),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9893, 9971),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2723),
+            id: DeclarationId(2725),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -83683,10 +83714,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9923, 9986),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10137, 10200),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2724),
+            id: DeclarationId(2726),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83712,24 +83743,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9991, 10082),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10205, 10296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2725),
+            id: DeclarationId(2727),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "input_sample".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "expected_output".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                 ],
             },
@@ -83741,20 +83772,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 10087, 10219),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10301, 10433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2726),
+            id: DeclarationId(2728),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "invariant".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                 ],
             },
@@ -83766,10 +83797,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 10434, 10523),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10648, 10737),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2727),
+            id: DeclarationId(2729),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -83786,10 +83817,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 11323, 11335),
+            span: SourceSpan::new("src/v3/std/verification.dag", 11537, 11549),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2728),
+            id: DeclarationId(2730),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83799,7 +83830,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2727),
+                        ty: DeclarationId(2729),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -83815,10 +83846,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 11272, 11369),
+            span: SourceSpan::new("src/v3/std/verification.dag", 11486, 11583),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2729),
+            id: DeclarationId(2731),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -83835,10 +83866,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 12084, 12096),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12298, 12310),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2730),
+            id: DeclarationId(2732),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83848,7 +83879,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2729),
+                        ty: DeclarationId(2731),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -83856,7 +83887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "input_ref".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                 ],
             },
@@ -83868,24 +83899,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 12034, 12162),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12248, 12376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2731),
+            id: DeclarationId(2733),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "lens_ref".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "input_ref".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "expected_ref".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                 ],
             },
@@ -83897,24 +83928,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 12460, 12582),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12674, 12796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2732),
+            id: DeclarationId(2734),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject_ref".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "oracle_ref".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "input_ref".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                 ],
             },
@@ -83926,15 +83957,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 12844, 12969),
+            span: SourceSpan::new("src/v3/std/verification.dag", 13058, 13183),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2733),
+            id: DeclarationId(2735),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "expected".to_string(),
-                    ty: DeclarationId(1311),
+                    ty: DeclarationId(1313),
                 }],
             },
             type_params: vec![],
@@ -83945,20 +83976,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 15022, 15083),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15236, 15297),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2734),
+            id: DeclarationId(2736),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "expected".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "param".to_string(),
-                        ty: DeclarationId(1282),
+                        ty: DeclarationId(1284),
                     },
                 ],
             },
@@ -83970,24 +84001,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 15088, 15187),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15302, 15401),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2735),
+            id: DeclarationId(2737),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "comparator".to_string(),
-                        ty: DeclarationId(1276),
+                        ty: DeclarationId(1278),
                     },
                     Field {
                         label: "baseline_ref".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                 ],
             },
@@ -83999,20 +84030,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 15541, 15673),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15755, 15887),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2736),
+            id: DeclarationId(2738),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "left_report_ref".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "right_report_ref".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                 ],
             },
@@ -84024,20 +84055,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 16240, 16352),
+            span: SourceSpan::new("src/v3/std/verification.dag", 16454, 16566),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2737),
+            id: DeclarationId(2739),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "law".to_string(),
-                        ty: DeclarationId(1277),
+                        ty: DeclarationId(1279),
                     },
                     Field {
                         label: "lens_ref".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                 ],
             },
@@ -84049,16 +84080,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 17049, 17128),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17263, 17342),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2738),
+            id: DeclarationId(2740),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "list_constant".to_string(),
@@ -84078,16 +84109,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 17348, 17461),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17562, 17675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2739),
+            id: DeclarationId(2741),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "list_constant".to_string(),
@@ -84095,7 +84126,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "subset_predicate".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                 ],
             },
@@ -84107,10 +84138,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 17466, 17602),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17680, 17816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2740),
+            id: DeclarationId(2742),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84132,20 +84163,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 18088, 18170),
+            span: SourceSpan::new("src/v3/std/verification.dag", 18302, 18384),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2741),
+            id: DeclarationId(2743),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "ratchet_kind".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                 ],
             },
@@ -84157,10 +84188,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 18175, 18261),
+            span: SourceSpan::new("src/v3/std/verification.dag", 18389, 18475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2742),
+            id: DeclarationId(2744),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -84177,20 +84208,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 18340, 18350),
+            span: SourceSpan::new("src/v3/std/verification.dag", 18554, 18564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2743),
+            id: DeclarationId(2745),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "generated_paths".to_string(),
-                        ty: DeclarationId(2742),
+                        ty: DeclarationId(2744),
                     },
                 ],
             },
@@ -84202,20 +84233,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 18266, 18356),
+            span: SourceSpan::new("src/v3/std/verification.dag", 18480, 18570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2744),
+            id: DeclarationId(2746),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "capability_register".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "cementing_receipts".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                 ],
             },
@@ -84227,24 +84258,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 19570, 19695),
+            span: SourceSpan::new("src/v3/std/verification.dag", 19784, 19909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2745),
+            id: DeclarationId(2747),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "deferred_gate".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "target_lane".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "authority_doc".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                 ],
             },
@@ -84256,24 +84287,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 20637, 20771),
+            span: SourceSpan::new("src/v3/std/verification.dag", 20851, 20985),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2746),
+            id: DeclarationId(2748),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "deferred_gate".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "target_lane".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                     Field {
                         label: "authority_doc".to_string(),
-                        ty: DeclarationId(1311),
+                        ty: DeclarationId(1313),
                     },
                 ],
             },
@@ -84285,10 +84316,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 21410, 21554),
+            span: SourceSpan::new("src/v3/std/verification.dag", 21624, 21768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2747),
+            id: DeclarationId(2749),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -84304,10 +84335,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 22399, 22453),
+            span: SourceSpan::new("src/v3/std/verification.dag", 22613, 22667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2748),
+            id: DeclarationId(2750),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -84324,10 +84355,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 23497, 23520),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23711, 23734),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2749),
+            id: DeclarationId(2751),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84338,10 +84369,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 23723, 23729),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23937, 23943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2750),
+            id: DeclarationId(2752),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84352,10 +84383,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 23734, 23740),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23948, 23954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2751),
+            id: DeclarationId(2753),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -84372,15 +84403,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 23878, 23901),
+            span: SourceSpan::new("src/v3/std/verification.dag", 24092, 24115),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2752),
+            id: DeclarationId(2754),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1291),
+                    ty: DeclarationId(1293),
                 }],
             },
             type_params: vec![],
@@ -84391,15 +84422,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 25624, 25653),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25838, 25867),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2753),
+            id: DeclarationId(2755),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1293),
+                    ty: DeclarationId(1295),
                 }],
             },
             type_params: vec![],
@@ -84410,15 +84441,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 25658, 25697),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25872, 25911),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2754),
+            id: DeclarationId(2756),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1291),
+                    ty: DeclarationId(1293),
                 }],
             },
             type_params: vec![],
@@ -84429,15 +84460,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26555, 26576),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26769, 26790),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2755),
+            id: DeclarationId(2757),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1293),
+                    ty: DeclarationId(1295),
                 }],
             },
             type_params: vec![],
@@ -84448,16 +84479,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26581, 26612),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26795, 26826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2756),
+            id: DeclarationId(2758),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1296),
+                    value: DeclarationId(1298),
                 }],
             },
             type_params: vec![],
@@ -84468,10 +84499,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26656, 26672),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26870, 26886),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2757),
+            id: DeclarationId(2759),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -84488,16 +84519,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26928, 26951),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27142, 27165),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2758),
+            id: DeclarationId(2760),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1286),
+                    value: DeclarationId(1288),
                 }],
             },
             type_params: vec![],
@@ -84508,10 +84539,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 7007, 7038),
+            span: SourceSpan::new("src/v3/std/verification.dag", 7221, 7252),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2759),
+            id: DeclarationId(2761),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -84531,7 +84562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/workflows.dag", 992, 1006),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2760),
+            id: DeclarationId(2762),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84545,7 +84576,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 532, 547),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2761),
+            id: DeclarationId(2763),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84559,7 +84590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 550, 561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2762),
+            id: DeclarationId(2764),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84573,7 +84604,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 564, 576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2763),
+            id: DeclarationId(2765),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -84592,7 +84623,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2764),
+            id: DeclarationId(2766),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84606,7 +84637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6428, 6446),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2765),
+            id: DeclarationId(2767),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84620,7 +84651,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6451, 6466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2766),
+            id: DeclarationId(2768),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84634,7 +84665,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6495, 6518),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2767),
+            id: DeclarationId(2769),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84648,7 +84679,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6523, 6544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2768),
+            id: DeclarationId(2770),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84662,7 +84693,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6549, 6564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2769),
+            id: DeclarationId(2771),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84676,7 +84707,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8177, 8187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2770),
+            id: DeclarationId(2772),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84690,7 +84721,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8192, 8203),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2771),
+            id: DeclarationId(2773),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84704,7 +84735,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8208, 8221),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2772),
+            id: DeclarationId(2774),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84718,7 +84749,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8226, 8239),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2773),
+            id: DeclarationId(2775),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84732,7 +84763,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8244, 8257),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2774),
+            id: DeclarationId(2776),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84746,7 +84777,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8262, 8276),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2775),
+            id: DeclarationId(2777),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84760,7 +84791,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8281, 8296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2776),
+            id: DeclarationId(2778),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84774,7 +84805,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9038, 9055),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2777),
+            id: DeclarationId(2779),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84788,7 +84819,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9060, 9070),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2778),
+            id: DeclarationId(2780),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84802,7 +84833,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9075, 9079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2779),
+            id: DeclarationId(2781),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84812,11 +84843,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1718),
+                        ty: DeclarationId(1720),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(1720),
+                        ty: DeclarationId(1722),
                     },
                     Field {
                         label: "range_min_inclusive".to_string(),
@@ -84832,7 +84863,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "overflow".to_string(),
-                        ty: DeclarationId(1721),
+                        ty: DeclarationId(1723),
                     },
                 ],
             },
@@ -84847,7 +84878,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9857, 10429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2780),
+            id: DeclarationId(2782),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84857,11 +84888,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1719),
+                        ty: DeclarationId(1721),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(1720),
+                        ty: DeclarationId(1722),
                     },
                     Field {
                         label: "is_copy".to_string(),
@@ -84880,13 +84911,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10434, 10616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2781),
+            id: DeclarationId(2783),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1722),
+                    value: DeclarationId(1724),
                 }],
             },
             type_params: vec![],
@@ -84900,7 +84931,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10965, 10984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2782),
+            id: DeclarationId(2784),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84914,7 +84945,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4233, 4241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2783),
+            id: DeclarationId(2785),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -84933,7 +84964,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4246, 4277),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2784),
+            id: DeclarationId(2786),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -84953,12 +84984,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4299, 4319),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2785),
+            id: DeclarationId(2787),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "values".to_string(),
-                    ty: DeclarationId(2784),
+                    ty: DeclarationId(2786),
                 }],
             },
             type_params: vec![],
@@ -84972,7 +85003,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4282, 4321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2786),
+            id: DeclarationId(2788),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84997,7 +85028,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4326, 4379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2787),
+            id: DeclarationId(2789),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -85022,7 +85053,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4384, 4433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2788),
+            id: DeclarationId(2790),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85036,7 +85067,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 847, 851),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2789),
+            id: DeclarationId(2791),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85050,7 +85081,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 854, 857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2790),
+            id: DeclarationId(2792),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85064,13 +85095,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 860, 872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2791),
+            id: DeclarationId(2793),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1734),
+                    value: DeclarationId(1736),
                 }],
             },
             type_params: vec![],
@@ -85084,7 +85115,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1242, 1259),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2792),
+            id: DeclarationId(2794),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -85103,7 +85134,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2793),
+            id: DeclarationId(2795),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85117,7 +85148,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1309, 1318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2794),
+            id: DeclarationId(2796),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85131,7 +85162,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1323, 1332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2795),
+            id: DeclarationId(2797),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85145,7 +85176,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1337, 1350),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2796),
+            id: DeclarationId(2798),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85159,7 +85190,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1355, 1367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2797),
+            id: DeclarationId(2799),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85173,7 +85204,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1372, 1385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2798),
+            id: DeclarationId(2800),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -85192,7 +85223,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2799),
+            id: DeclarationId(2801),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85206,7 +85237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1677, 1685),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2800),
+            id: DeclarationId(2802),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85220,7 +85251,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1688, 1697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2801),
+            id: DeclarationId(2803),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85234,13 +85265,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1700, 1709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2802),
+            id: DeclarationId(2804),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1743),
+                    value: DeclarationId(1745),
                 }],
             },
             type_params: vec![],
@@ -85254,11 +85285,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1521, 1542),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2803),
+            id: DeclarationId(2805),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1752),
+                    DeclarationId(1754),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -85273,13 +85304,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2804),
+            id: DeclarationId(2806),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1749),
+                    value: DeclarationId(1751),
                 }],
             },
             type_params: vec![],
@@ -85293,7 +85324,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1583, 1592),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2805),
+            id: DeclarationId(2807),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -85319,11 +85350,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2806),
+            id: DeclarationId(2808),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2805),
+                    DeclarationId(2807),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -85338,11 +85369,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2807),
+            id: DeclarationId(2809),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1741),
+                    DeclarationId(1743),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -85357,7 +85388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2808),
+            id: DeclarationId(2810),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85371,7 +85402,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1917, 1925),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2809),
+            id: DeclarationId(2811),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85385,7 +85416,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1928, 1937),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2810),
+            id: DeclarationId(2812),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85399,7 +85430,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1940, 1948),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2811),
+            id: DeclarationId(2813),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -85419,7 +85450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2106, 2118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2812),
+            id: DeclarationId(2814),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -85439,17 +85470,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2127, 2139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2813),
+            id: DeclarationId(2815),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "branches".to_string(),
-                        ty: DeclarationId(2811),
+                        ty: DeclarationId(2813),
                     },
                     Field {
                         label: "paths".to_string(),
-                        ty: DeclarationId(2812),
+                        ty: DeclarationId(2814),
                     },
                 ],
             },
@@ -85464,7 +85495,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2089, 2141),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2814),
+            id: DeclarationId(2816),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -85484,13 +85515,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2170, 2182),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2815),
+            id: DeclarationId(2817),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1744),
+                    value: DeclarationId(1746),
                 }],
             },
             type_params: vec![],
@@ -85504,17 +85535,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2191, 2216),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2816),
+            id: DeclarationId(2818),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "branches".to_string(),
-                        ty: DeclarationId(2814),
+                        ty: DeclarationId(2816),
                     },
                     Field {
                         label: "types".to_string(),
-                        ty: DeclarationId(2815),
+                        ty: DeclarationId(2817),
                     },
                 ],
             },
@@ -85529,12 +85560,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2146, 2218),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2817),
+            id: DeclarationId(2819),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "cron".to_string(),
-                    ty: DeclarationId(1725),
+                    ty: DeclarationId(1727),
                 }],
             },
             type_params: vec![],
@@ -85548,13 +85579,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2223, 2254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2818),
+            id: DeclarationId(2820),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1745),
+                    value: DeclarationId(1747),
                 }],
             },
             type_params: vec![],
@@ -85568,12 +85599,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2286, 2305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2819),
+            id: DeclarationId(2821),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "inputs".to_string(),
-                    ty: DeclarationId(2818),
+                    ty: DeclarationId(2820),
                 }],
             },
             type_params: vec![],
@@ -85587,13 +85618,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2259, 2307),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2820),
+            id: DeclarationId(2822),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1745),
+                    value: DeclarationId(1747),
                 }],
             },
             type_params: vec![],
@@ -85607,12 +85638,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2335, 2354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2821),
+            id: DeclarationId(2823),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "inputs".to_string(),
-                    ty: DeclarationId(2820),
+                    ty: DeclarationId(2822),
                 }],
             },
             type_params: vec![],
@@ -85626,7 +85657,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2312, 2356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2822),
+            id: DeclarationId(2824),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85640,7 +85671,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2387, 2393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2823),
+            id: DeclarationId(2825),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85654,7 +85685,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2398, 2409),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2824),
+            id: DeclarationId(2826),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85668,7 +85699,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2414, 2422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2825),
+            id: DeclarationId(2827),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85682,7 +85713,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2427, 2441),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2826),
+            id: DeclarationId(2828),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85696,7 +85727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2446, 2452),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2827),
+            id: DeclarationId(2829),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -85715,7 +85746,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2828),
+            id: DeclarationId(2830),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -85734,7 +85765,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2829),
+            id: DeclarationId(2831),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85748,7 +85779,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2603, 2614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2830),
+            id: DeclarationId(2832),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85762,7 +85793,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2617, 2629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2831),
+            id: DeclarationId(2833),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85776,7 +85807,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2632, 2643),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2832),
+            id: DeclarationId(2834),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85790,7 +85821,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2646, 2662),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2833),
+            id: DeclarationId(2835),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85804,7 +85835,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4784, 4793),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2834),
+            id: DeclarationId(2836),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85818,7 +85849,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4796, 4804),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2835),
+            id: DeclarationId(2837),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85832,7 +85863,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4807, 4820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2836),
+            id: DeclarationId(2838),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -85851,13 +85882,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2837),
+            id: DeclarationId(2839),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1755),
+                    value: DeclarationId(1757),
                 }],
             },
             type_params: vec![],
@@ -85871,7 +85902,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5372, 5382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2838),
+            id: DeclarationId(2840),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -85891,7 +85922,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5392, 5404),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2839),
+            id: DeclarationId(2841),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -85917,11 +85948,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2840),
+            id: DeclarationId(2842),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2839),
+                    DeclarationId(2841),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -85936,7 +85967,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2841),
+            id: DeclarationId(2843),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -85962,11 +85993,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2842),
+            id: DeclarationId(2844),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2841),
+                    DeclarationId(2843),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -85981,7 +86012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2843),
+            id: DeclarationId(2845),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86000,11 +86031,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2844),
+            id: DeclarationId(2846),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1771),
+                    DeclarationId(1773),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -86019,7 +86050,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2845),
+            id: DeclarationId(2847),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86038,11 +86069,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2846),
+            id: DeclarationId(2848),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1752),
+                    DeclarationId(1754),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -86057,7 +86088,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2847),
+            id: DeclarationId(2849),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -86076,7 +86107,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6619, 6655),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2848),
+            id: DeclarationId(2850),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -86095,7 +86126,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6660, 6709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2849),
+            id: DeclarationId(2851),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86109,7 +86140,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7555, 7584),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2850),
+            id: DeclarationId(2852),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -86128,7 +86159,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7589, 7646),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2851),
+            id: DeclarationId(2853),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -86147,11 +86178,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8224, 8259),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2852),
+            id: DeclarationId(2854),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1751),
+                    DeclarationId(1753),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -86166,7 +86197,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2853),
+            id: DeclarationId(2855),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -86176,7 +86207,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "cancel_in_progress".to_string(),
-                        ty: DeclarationId(2852),
+                        ty: DeclarationId(2854),
                     },
                 ],
             },
@@ -86191,11 +86222,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8264, 8453),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2854),
+            id: DeclarationId(2856),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1750),
+                    DeclarationId(1752),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -86210,7 +86241,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2855),
+            id: DeclarationId(2857),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86229,7 +86260,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2856),
+            id: DeclarationId(2858),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -86239,11 +86270,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "cancel_in_progress".to_string(),
-                        ty: DeclarationId(2854),
+                        ty: DeclarationId(2856),
                     },
                     Field {
                         label: "explicit_single".to_string(),
-                        ty: DeclarationId(2855),
+                        ty: DeclarationId(2857),
                     },
                 ],
             },
@@ -86258,12 +86289,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8458, 8845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2857),
+            id: DeclarationId(2859),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "label".to_string(),
-                    ty: DeclarationId(1754),
+                    ty: DeclarationId(1756),
                 }],
             },
             type_params: vec![],
@@ -86277,7 +86308,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10037, 10072),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2858),
+            id: DeclarationId(2860),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -86297,12 +86328,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10098, 10110),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2859),
+            id: DeclarationId(2861),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "labels".to_string(),
-                    ty: DeclarationId(2858),
+                    ty: DeclarationId(2860),
                 }],
             },
             type_params: vec![],
@@ -86316,7 +86347,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10077, 10112),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2860),
+            id: DeclarationId(2862),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -86335,7 +86366,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10201, 10240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2861),
+            id: DeclarationId(2863),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86349,7 +86380,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10263, 10275),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2862),
+            id: DeclarationId(2864),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86363,7 +86394,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10280, 10290),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2863),
+            id: DeclarationId(2865),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86377,7 +86408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10295, 10305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2864),
+            id: DeclarationId(2866),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86391,7 +86422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10310, 10321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2865),
+            id: DeclarationId(2867),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86405,7 +86436,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10326, 10333),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2866),
+            id: DeclarationId(2868),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86419,7 +86450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10338, 10351),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2867),
+            id: DeclarationId(2869),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86438,7 +86469,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2868),
+            id: DeclarationId(2870),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86457,7 +86488,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2869),
+            id: DeclarationId(2871),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -86483,11 +86514,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10633),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2870),
+            id: DeclarationId(2872),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2869),
+                    DeclarationId(2871),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -86502,7 +86533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2871),
+            id: DeclarationId(2873),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86521,7 +86552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2872),
+            id: DeclarationId(2874),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86540,7 +86571,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2873),
+            id: DeclarationId(2875),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86559,17 +86590,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2874),
+            id: DeclarationId(2876),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(2867),
+                        ty: DeclarationId(2869),
                     },
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(2868),
+                        ty: DeclarationId(2870),
                     },
                     Field {
                         label: "run".to_string(),
@@ -86577,19 +86608,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "shell".to_string(),
-                        ty: DeclarationId(1756),
+                        ty: DeclarationId(1758),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(2870),
+                        ty: DeclarationId(2872),
                     },
                     Field {
                         label: "working_directory".to_string(),
-                        ty: DeclarationId(2871),
+                        ty: DeclarationId(2873),
                     },
                     Field {
                         label: "if_condition".to_string(),
-                        ty: DeclarationId(2872),
+                        ty: DeclarationId(2874),
                     },
                     Field {
                         label: "continue_on_error".to_string(),
@@ -86597,7 +86628,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "timeout_minutes".to_string(),
-                        ty: DeclarationId(2873),
+                        ty: DeclarationId(2875),
                     },
                 ],
             },
@@ -86612,7 +86643,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10510, 10763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2875),
+            id: DeclarationId(2877),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86631,7 +86662,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2876),
+            id: DeclarationId(2878),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86650,7 +86681,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2877),
+            id: DeclarationId(2879),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -86676,11 +86707,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2878),
+            id: DeclarationId(2880),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2877),
+                    DeclarationId(2879),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -86695,7 +86726,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2879),
+            id: DeclarationId(2881),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -86721,11 +86752,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10995),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2880),
+            id: DeclarationId(2882),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2879),
+                    DeclarationId(2881),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -86740,7 +86771,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10996),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2881),
+            id: DeclarationId(2883),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86759,7 +86790,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2882),
+            id: DeclarationId(2884),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86778,33 +86809,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2883),
+            id: DeclarationId(2885),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(2875),
+                        ty: DeclarationId(2877),
                     },
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(2876),
+                        ty: DeclarationId(2878),
                     },
                     Field {
                         label: "uses".to_string(),
-                        ty: DeclarationId(1757),
+                        ty: DeclarationId(1759),
                     },
                     Field {
                         label: "with".to_string(),
-                        ty: DeclarationId(2878),
+                        ty: DeclarationId(2880),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(2880),
+                        ty: DeclarationId(2882),
                     },
                     Field {
                         label: "if_condition".to_string(),
-                        ty: DeclarationId(2881),
+                        ty: DeclarationId(2883),
                     },
                     Field {
                         label: "continue_on_error".to_string(),
@@ -86812,7 +86843,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "timeout_minutes".to_string(),
-                        ty: DeclarationId(2882),
+                        ty: DeclarationId(2884),
                     },
                 ],
             },
@@ -86827,7 +86858,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10768, 11091),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2884),
+            id: DeclarationId(2886),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86841,7 +86872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11110, 11114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2885),
+            id: DeclarationId(2887),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86855,7 +86886,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11117, 11119),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2886),
+            id: DeclarationId(2888),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86869,7 +86900,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11122, 11126),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2887),
+            id: DeclarationId(2889),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86883,7 +86914,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11129, 11135),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2888),
+            id: DeclarationId(2890),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86897,7 +86928,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11138, 11141),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2889),
+            id: DeclarationId(2891),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86916,7 +86947,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2890),
+            id: DeclarationId(2892),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86935,7 +86966,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2891),
+            id: DeclarationId(2893),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86954,7 +86985,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11530, 11534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2892),
+            id: DeclarationId(2894),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -86964,15 +86995,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "file".to_string(),
-                        ty: DeclarationId(2889),
+                        ty: DeclarationId(2891),
                     },
                     Field {
                         label: "line".to_string(),
-                        ty: DeclarationId(2890),
+                        ty: DeclarationId(2892),
                     },
                     Field {
                         label: "col".to_string(),
-                        ty: DeclarationId(2891),
+                        ty: DeclarationId(2893),
                     },
                 ],
             },
@@ -86987,7 +87018,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11463, 11536),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2893),
+            id: DeclarationId(2895),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87006,7 +87037,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11584, 11591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2894),
+            id: DeclarationId(2896),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87025,7 +87056,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2895),
+            id: DeclarationId(2897),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87044,7 +87075,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11610, 11614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2896),
+            id: DeclarationId(2898),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -87054,15 +87085,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "file".to_string(),
-                        ty: DeclarationId(2893),
+                        ty: DeclarationId(2895),
                     },
                     Field {
                         label: "line".to_string(),
-                        ty: DeclarationId(2894),
+                        ty: DeclarationId(2896),
                     },
                     Field {
                         label: "col".to_string(),
-                        ty: DeclarationId(2895),
+                        ty: DeclarationId(2897),
                     },
                 ],
             },
@@ -87077,7 +87108,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11541, 11616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2897),
+            id: DeclarationId(2899),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87096,7 +87127,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11663, 11670),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2898),
+            id: DeclarationId(2900),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87115,7 +87146,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11678, 11682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2899),
+            id: DeclarationId(2901),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87134,7 +87165,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11689, 11693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2900),
+            id: DeclarationId(2902),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -87144,15 +87175,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "file".to_string(),
-                        ty: DeclarationId(2897),
+                        ty: DeclarationId(2899),
                     },
                     Field {
                         label: "line".to_string(),
-                        ty: DeclarationId(2898),
+                        ty: DeclarationId(2900),
                     },
                     Field {
                         label: "col".to_string(),
-                        ty: DeclarationId(2899),
+                        ty: DeclarationId(2901),
                     },
                 ],
             },
@@ -87167,7 +87198,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11621, 11695),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2901),
+            id: DeclarationId(2903),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87186,7 +87217,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11700, 11733),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2902),
+            id: DeclarationId(2904),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87200,7 +87231,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11738, 11756),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2903),
+            id: DeclarationId(2905),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -87225,7 +87256,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11761, 11802),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2904),
+            id: DeclarationId(2906),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87244,7 +87275,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11807, 11832),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2905),
+            id: DeclarationId(2907),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87263,7 +87294,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11837, 11867),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2906),
+            id: DeclarationId(2908),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87282,7 +87313,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12673, 12677),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2907),
+            id: DeclarationId(2909),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -87296,11 +87327,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "retention_days".to_string(),
-                        ty: DeclarationId(2906),
+                        ty: DeclarationId(2908),
                     },
                     Field {
                         label: "if_no_files_found".to_string(),
-                        ty: DeclarationId(1768),
+                        ty: DeclarationId(1770),
                     },
                 ],
             },
@@ -87315,7 +87346,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12620, 12720),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2908),
+            id: DeclarationId(2910),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87334,7 +87365,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12756, 12763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2909),
+            id: DeclarationId(2911),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -87344,7 +87375,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(2908),
+                        ty: DeclarationId(2910),
                     },
                 ],
             },
@@ -87359,7 +87390,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12725, 12765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2910),
+            id: DeclarationId(2912),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87373,7 +87404,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12795, 12799),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2911),
+            id: DeclarationId(2913),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87387,7 +87418,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12802, 12810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2912),
+            id: DeclarationId(2914),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87401,7 +87432,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12813, 12819),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2913),
+            id: DeclarationId(2915),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -87421,7 +87452,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13281, 13293),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2914),
+            id: DeclarationId(2916),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -87432,7 +87463,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(139),
-                        value: DeclarationId(2913),
+                        value: DeclarationId(2915),
                     },
                 ],
             },
@@ -87447,7 +87478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13269, 13294),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2915),
+            id: DeclarationId(2917),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -87473,13 +87504,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13311, 13330),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2916),
+            id: DeclarationId(2918),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2915),
+                    value: DeclarationId(2917),
                 }],
             },
             type_params: vec![],
@@ -87493,7 +87524,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13306, 13331),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2917),
+            id: DeclarationId(2919),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -87519,13 +87550,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13348, 13367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2918),
+            id: DeclarationId(2920),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2917),
+                    value: DeclarationId(2919),
                 }],
             },
             type_params: vec![],
@@ -87539,7 +87570,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13343, 13368),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2919),
+            id: DeclarationId(2921),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87558,7 +87589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13403, 13407),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2920),
+            id: DeclarationId(2922),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87572,7 +87603,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13563, 13570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2921),
+            id: DeclarationId(2923),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87586,7 +87617,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13575, 13582),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2922),
+            id: DeclarationId(2924),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87600,7 +87631,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13587, 13596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2923),
+            id: DeclarationId(2925),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87614,7 +87645,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13601, 13608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2924),
+            id: DeclarationId(2926),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87628,7 +87659,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13613, 13621),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2925),
+            id: DeclarationId(2927),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87642,7 +87673,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13626, 13640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2926),
+            id: DeclarationId(2928),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87656,7 +87687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1935, 1959),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2927),
+            id: DeclarationId(2929),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87670,7 +87701,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1964, 1989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2928),
+            id: DeclarationId(2930),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(151)],
@@ -87688,7 +87719,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2673, 2714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2929),
+            id: DeclarationId(2931),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87707,7 +87738,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2930),
+            id: DeclarationId(2932),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87721,17 +87752,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2931),
+            id: DeclarationId(2933),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2929),
+                        ty: DeclarationId(2931),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2930),
+                        ty: DeclarationId(2932),
                     },
                 ],
             },
@@ -87746,7 +87777,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2932),
+            id: DeclarationId(2934),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87765,7 +87796,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2933),
+            id: DeclarationId(2935),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87779,17 +87810,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2934),
+            id: DeclarationId(2936),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2932),
+                        ty: DeclarationId(2934),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2933),
+                        ty: DeclarationId(2935),
                     },
                 ],
             },
@@ -87804,7 +87835,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2935),
+            id: DeclarationId(2937),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87823,7 +87854,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2936),
+            id: DeclarationId(2938),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87837,17 +87868,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2937),
+            id: DeclarationId(2939),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2935),
+                        ty: DeclarationId(2937),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2936),
+                        ty: DeclarationId(2938),
                     },
                 ],
             },
@@ -87862,7 +87893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2938),
+            id: DeclarationId(2940),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87881,7 +87912,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2939),
+            id: DeclarationId(2941),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87895,17 +87926,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2940),
+            id: DeclarationId(2942),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2938),
+                        ty: DeclarationId(2940),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2939),
+                        ty: DeclarationId(2941),
                     },
                 ],
             },
@@ -87920,7 +87951,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2941),
+            id: DeclarationId(2943),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87939,7 +87970,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2942),
+            id: DeclarationId(2944),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87953,17 +87984,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2943),
+            id: DeclarationId(2945),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2941),
+                        ty: DeclarationId(2943),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2942),
+                        ty: DeclarationId(2944),
                     },
                 ],
             },
@@ -87978,7 +88009,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2944),
+            id: DeclarationId(2946),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87997,7 +88028,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2945),
+            id: DeclarationId(2947),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88011,17 +88042,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2946),
+            id: DeclarationId(2948),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2944),
+                        ty: DeclarationId(2946),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2945),
+                        ty: DeclarationId(2947),
                     },
                 ],
             },
@@ -88036,7 +88067,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2947),
+            id: DeclarationId(2949),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88055,7 +88086,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2948),
+            id: DeclarationId(2950),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88069,17 +88100,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2949),
+            id: DeclarationId(2951),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2947),
+                        ty: DeclarationId(2949),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2948),
+                        ty: DeclarationId(2950),
                     },
                 ],
             },
@@ -88094,7 +88125,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2950),
+            id: DeclarationId(2952),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88113,7 +88144,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 3781, 3785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2951),
+            id: DeclarationId(2953),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88127,17 +88158,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 3781, 3785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2952),
+            id: DeclarationId(2954),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2950),
+                        ty: DeclarationId(2952),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2951),
+                        ty: DeclarationId(2953),
                     },
                 ],
             },
@@ -88152,7 +88183,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 3781, 3785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2953),
+            id: DeclarationId(2955),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88171,7 +88202,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 4264, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2954),
+            id: DeclarationId(2956),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88185,17 +88216,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 4264, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2955),
+            id: DeclarationId(2957),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2953),
+                        ty: DeclarationId(2955),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2954),
+                        ty: DeclarationId(2956),
                     },
                 ],
             },
@@ -88210,7 +88241,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 4264, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2956),
+            id: DeclarationId(2958),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88229,7 +88260,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 6172, 6179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2957),
+            id: DeclarationId(2959),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88243,17 +88274,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 6172, 6179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2958),
+            id: DeclarationId(2960),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2956),
+                        ty: DeclarationId(2958),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2957),
+                        ty: DeclarationId(2959),
                     },
                 ],
             },
@@ -88268,7 +88299,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 6172, 6179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2959),
+            id: DeclarationId(2961),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88287,7 +88318,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16964, 16984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2960),
+            id: DeclarationId(2962),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88301,17 +88332,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16964, 16984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2961),
+            id: DeclarationId(2963),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2959),
+                        ty: DeclarationId(2961),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2960),
+                        ty: DeclarationId(2962),
                     },
                 ],
             },
@@ -88326,7 +88357,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16964, 16984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2962),
+            id: DeclarationId(2964),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88345,7 +88376,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17620, 17627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2963),
+            id: DeclarationId(2965),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88359,17 +88390,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17620, 17627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2964),
+            id: DeclarationId(2966),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2962),
+                        ty: DeclarationId(2964),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2963),
+                        ty: DeclarationId(2965),
                     },
                 ],
             },
@@ -88384,7 +88415,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17620, 17627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2965),
+            id: DeclarationId(2967),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88403,7 +88434,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21380, 21390),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2966),
+            id: DeclarationId(2968),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88417,17 +88448,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21380, 21390),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2967),
+            id: DeclarationId(2969),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2965),
+                        ty: DeclarationId(2967),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2966),
+                        ty: DeclarationId(2968),
                     },
                 ],
             },
@@ -88442,7 +88473,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21380, 21390),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2968),
+            id: DeclarationId(2970),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88461,7 +88492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21515, 21522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2969),
+            id: DeclarationId(2971),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88475,17 +88506,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21515, 21522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2970),
+            id: DeclarationId(2972),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2968),
+                        ty: DeclarationId(2970),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2969),
+                        ty: DeclarationId(2971),
                     },
                 ],
             },
@@ -88500,7 +88531,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21515, 21522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2971),
+            id: DeclarationId(2973),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88519,7 +88550,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21589, 21593),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2972),
+            id: DeclarationId(2974),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88533,17 +88564,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21589, 21593),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2973),
+            id: DeclarationId(2975),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2971),
+                        ty: DeclarationId(2973),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2972),
+                        ty: DeclarationId(2974),
                     },
                 ],
             },
@@ -88558,7 +88589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21589, 21593),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2974),
+            id: DeclarationId(2976),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88577,7 +88608,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23360, 23367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2975),
+            id: DeclarationId(2977),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88591,17 +88622,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23360, 23367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2976),
+            id: DeclarationId(2978),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2974),
+                        ty: DeclarationId(2976),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2975),
+                        ty: DeclarationId(2977),
                     },
                 ],
             },
@@ -88616,7 +88647,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23360, 23367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2977),
+            id: DeclarationId(2979),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88635,7 +88666,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23872, 23879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2978),
+            id: DeclarationId(2980),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88649,17 +88680,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23872, 23879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2979),
+            id: DeclarationId(2981),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2977),
+                        ty: DeclarationId(2979),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2978),
+                        ty: DeclarationId(2980),
                     },
                 ],
             },
@@ -88674,7 +88705,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23872, 23879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2980),
+            id: DeclarationId(2982),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88693,7 +88724,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23966, 23973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2981),
+            id: DeclarationId(2983),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88707,17 +88738,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23966, 23973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2982),
+            id: DeclarationId(2984),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2980),
+                        ty: DeclarationId(2982),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2981),
+                        ty: DeclarationId(2983),
                     },
                 ],
             },
@@ -88732,7 +88763,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23966, 23973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2983),
+            id: DeclarationId(2985),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88751,7 +88782,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24196, 24211),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2984),
+            id: DeclarationId(2986),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88765,17 +88796,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24196, 24211),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2985),
+            id: DeclarationId(2987),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2983),
+                        ty: DeclarationId(2985),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2984),
+                        ty: DeclarationId(2986),
                     },
                 ],
             },
@@ -88790,7 +88821,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24196, 24211),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2986),
+            id: DeclarationId(2988),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88809,7 +88840,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24222, 24235),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2987),
+            id: DeclarationId(2989),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88823,17 +88854,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24222, 24235),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2988),
+            id: DeclarationId(2990),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2986),
+                        ty: DeclarationId(2988),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2987),
+                        ty: DeclarationId(2989),
                     },
                 ],
             },
@@ -88848,7 +88879,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24222, 24235),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2989),
+            id: DeclarationId(2991),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88867,7 +88898,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24251, 24264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2990),
+            id: DeclarationId(2992),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88881,17 +88912,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24251, 24264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2991),
+            id: DeclarationId(2993),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2989),
+                        ty: DeclarationId(2991),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2990),
+                        ty: DeclarationId(2992),
                     },
                 ],
             },
@@ -88906,7 +88937,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24251, 24264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2992),
+            id: DeclarationId(2994),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88925,7 +88956,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24374, 24381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2993),
+            id: DeclarationId(2995),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88939,17 +88970,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24374, 24381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2994),
+            id: DeclarationId(2996),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2992),
+                        ty: DeclarationId(2994),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2993),
+                        ty: DeclarationId(2995),
                     },
                 ],
             },
@@ -88964,7 +88995,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24374, 24381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2995),
+            id: DeclarationId(2997),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88983,7 +89014,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2996),
+            id: DeclarationId(2998),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88997,17 +89028,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2997),
+            id: DeclarationId(2999),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2995),
+                        ty: DeclarationId(2997),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2996),
+                        ty: DeclarationId(2998),
                     },
                 ],
             },
@@ -89022,12 +89053,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2998),
+            id: DeclarationId(3000),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1822),
+                    ty: DeclarationId(1824),
                 }],
             },
             type_params: vec![],
@@ -89041,7 +89072,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2999),
+            id: DeclarationId(3001),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89055,17 +89086,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3000),
+            id: DeclarationId(3002),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2998),
+                        ty: DeclarationId(3000),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2999),
+                        ty: DeclarationId(3001),
                     },
                 ],
             },
@@ -89080,12 +89111,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3001),
+            id: DeclarationId(3003),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1825),
+                    ty: DeclarationId(1827),
                 }],
             },
             type_params: vec![],
@@ -89099,7 +89130,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3002),
+            id: DeclarationId(3004),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89113,17 +89144,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3003),
+            id: DeclarationId(3005),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3001),
+                        ty: DeclarationId(3003),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3002),
+                        ty: DeclarationId(3004),
                     },
                 ],
             },
@@ -89138,7 +89169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3004),
+            id: DeclarationId(3006),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89157,7 +89188,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3005),
+            id: DeclarationId(3007),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89171,17 +89202,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3006),
+            id: DeclarationId(3008),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3004),
+                        ty: DeclarationId(3006),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3005),
+                        ty: DeclarationId(3007),
                     },
                 ],
             },
@@ -89196,7 +89227,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3007),
+            id: DeclarationId(3009),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89215,7 +89246,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3008),
+            id: DeclarationId(3010),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89229,17 +89260,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3009),
+            id: DeclarationId(3011),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3007),
+                        ty: DeclarationId(3009),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3008),
+                        ty: DeclarationId(3010),
                     },
                 ],
             },
@@ -89254,7 +89285,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3010),
+            id: DeclarationId(3012),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89273,7 +89304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30660, 30667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3011),
+            id: DeclarationId(3013),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89287,17 +89318,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30660, 30667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3012),
+            id: DeclarationId(3014),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3010),
+                        ty: DeclarationId(3012),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3011),
+                        ty: DeclarationId(3013),
                     },
                 ],
             },
@@ -89312,7 +89343,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30660, 30667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3013),
+            id: DeclarationId(3015),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89331,7 +89362,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3014),
+            id: DeclarationId(3016),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89345,17 +89376,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3015),
+            id: DeclarationId(3017),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3013),
+                        ty: DeclarationId(3015),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3014),
+                        ty: DeclarationId(3016),
                     },
                 ],
             },
@@ -89370,7 +89401,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3016),
+            id: DeclarationId(3018),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89389,7 +89420,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3017),
+            id: DeclarationId(3019),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89403,17 +89434,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3018),
+            id: DeclarationId(3020),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3016),
+                        ty: DeclarationId(3018),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3017),
+                        ty: DeclarationId(3019),
                     },
                 ],
             },
@@ -89428,7 +89459,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3019),
+            id: DeclarationId(3021),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89447,7 +89478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3020),
+            id: DeclarationId(3022),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89461,17 +89492,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3021),
+            id: DeclarationId(3023),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3019),
+                        ty: DeclarationId(3021),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3020),
+                        ty: DeclarationId(3022),
                     },
                 ],
             },
@@ -89486,7 +89517,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3022),
+            id: DeclarationId(3024),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89505,7 +89536,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3023),
+            id: DeclarationId(3025),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89519,17 +89550,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3024),
+            id: DeclarationId(3026),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3022),
+                        ty: DeclarationId(3024),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3023),
+                        ty: DeclarationId(3025),
                     },
                 ],
             },
@@ -89544,7 +89575,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3025),
+            id: DeclarationId(3027),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89563,7 +89594,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3026),
+            id: DeclarationId(3028),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89577,17 +89608,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3027),
+            id: DeclarationId(3029),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3025),
+                        ty: DeclarationId(3027),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3026),
+                        ty: DeclarationId(3028),
                     },
                 ],
             },
@@ -89602,7 +89633,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3028),
+            id: DeclarationId(3030),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89621,7 +89652,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3029),
+            id: DeclarationId(3031),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89635,17 +89666,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3030),
+            id: DeclarationId(3032),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3028),
+                        ty: DeclarationId(3030),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3029),
+                        ty: DeclarationId(3031),
                     },
                 ],
             },
@@ -89660,7 +89691,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3031),
+            id: DeclarationId(3033),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89679,7 +89710,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3032),
+            id: DeclarationId(3034),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89693,17 +89724,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3033),
+            id: DeclarationId(3035),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3031),
+                        ty: DeclarationId(3033),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3032),
+                        ty: DeclarationId(3034),
                     },
                 ],
             },
@@ -89718,7 +89749,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3034),
+            id: DeclarationId(3036),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89737,7 +89768,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3035),
+            id: DeclarationId(3037),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89751,17 +89782,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3036),
+            id: DeclarationId(3038),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3034),
+                        ty: DeclarationId(3036),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3035),
+                        ty: DeclarationId(3037),
                     },
                 ],
             },
@@ -89776,7 +89807,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3037),
+            id: DeclarationId(3039),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89795,7 +89826,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3038),
+            id: DeclarationId(3040),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89809,17 +89840,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3039),
+            id: DeclarationId(3041),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3037),
+                        ty: DeclarationId(3039),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3038),
+                        ty: DeclarationId(3040),
                     },
                 ],
             },
@@ -89834,7 +89865,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3040),
+            id: DeclarationId(3042),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89853,7 +89884,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3041),
+            id: DeclarationId(3043),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89867,17 +89898,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3042),
+            id: DeclarationId(3044),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3040),
+                        ty: DeclarationId(3042),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3041),
+                        ty: DeclarationId(3043),
                     },
                 ],
             },
@@ -89892,7 +89923,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3043),
+            id: DeclarationId(3045),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89911,7 +89942,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3044),
+            id: DeclarationId(3046),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89925,17 +89956,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3045),
+            id: DeclarationId(3047),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3043),
+                        ty: DeclarationId(3045),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3044),
+                        ty: DeclarationId(3046),
                     },
                 ],
             },
@@ -89950,7 +89981,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3046),
+            id: DeclarationId(3048),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89969,7 +90000,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3047),
+            id: DeclarationId(3049),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89983,17 +90014,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3048),
+            id: DeclarationId(3050),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3046),
+                        ty: DeclarationId(3048),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3047),
+                        ty: DeclarationId(3049),
                     },
                 ],
             },
@@ -90008,7 +90039,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3049),
+            id: DeclarationId(3051),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90027,7 +90058,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3050),
+            id: DeclarationId(3052),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90041,17 +90072,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3051),
+            id: DeclarationId(3053),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3049),
+                        ty: DeclarationId(3051),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3050),
+                        ty: DeclarationId(3052),
                     },
                 ],
             },
@@ -90066,7 +90097,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3052),
+            id: DeclarationId(3054),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90085,7 +90116,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3053),
+            id: DeclarationId(3055),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90099,17 +90130,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3054),
+            id: DeclarationId(3056),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3052),
+                        ty: DeclarationId(3054),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3053),
+                        ty: DeclarationId(3055),
                     },
                 ],
             },
@@ -90124,7 +90155,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3055),
+            id: DeclarationId(3057),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90143,7 +90174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3056),
+            id: DeclarationId(3058),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90157,17 +90188,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3057),
+            id: DeclarationId(3059),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3055),
+                        ty: DeclarationId(3057),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3056),
+                        ty: DeclarationId(3058),
                     },
                 ],
             },
@@ -90182,7 +90213,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3058),
+            id: DeclarationId(3060),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90201,7 +90232,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3059),
+            id: DeclarationId(3061),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90215,17 +90246,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3060),
+            id: DeclarationId(3062),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3058),
+                        ty: DeclarationId(3060),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3059),
+                        ty: DeclarationId(3061),
                     },
                 ],
             },
@@ -90240,7 +90271,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3061),
+            id: DeclarationId(3063),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90259,7 +90290,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3062),
+            id: DeclarationId(3064),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90273,17 +90304,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3063),
+            id: DeclarationId(3065),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3061),
+                        ty: DeclarationId(3063),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3062),
+                        ty: DeclarationId(3064),
                     },
                 ],
             },
@@ -90298,7 +90329,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3064),
+            id: DeclarationId(3066),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90317,7 +90348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3065),
+            id: DeclarationId(3067),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90331,17 +90362,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3066),
+            id: DeclarationId(3068),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3064),
+                        ty: DeclarationId(3066),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3065),
+                        ty: DeclarationId(3067),
                     },
                 ],
             },
@@ -90356,7 +90387,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3067),
+            id: DeclarationId(3069),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90375,7 +90406,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3068),
+            id: DeclarationId(3070),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90389,17 +90420,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3069),
+            id: DeclarationId(3071),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3067),
+                        ty: DeclarationId(3069),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3068),
+                        ty: DeclarationId(3070),
                     },
                 ],
             },
@@ -90414,7 +90445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3070),
+            id: DeclarationId(3072),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90433,7 +90464,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3071),
+            id: DeclarationId(3073),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90447,17 +90478,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3072),
+            id: DeclarationId(3074),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3070),
+                        ty: DeclarationId(3072),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3071),
+                        ty: DeclarationId(3073),
                     },
                 ],
             },
@@ -90472,7 +90503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3073),
+            id: DeclarationId(3075),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90491,7 +90522,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3074),
+            id: DeclarationId(3076),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90505,17 +90536,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3075),
+            id: DeclarationId(3077),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3073),
+                        ty: DeclarationId(3075),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3074),
+                        ty: DeclarationId(3076),
                     },
                 ],
             },
@@ -90530,7 +90561,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3076),
+            id: DeclarationId(3078),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90549,7 +90580,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3077),
+            id: DeclarationId(3079),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90563,17 +90594,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3078),
+            id: DeclarationId(3080),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3076),
+                        ty: DeclarationId(3078),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3077),
+                        ty: DeclarationId(3079),
                     },
                 ],
             },
@@ -90588,7 +90619,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3079),
+            id: DeclarationId(3081),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90607,7 +90638,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3080),
+            id: DeclarationId(3082),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90621,17 +90652,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3081),
+            id: DeclarationId(3083),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3079),
+                        ty: DeclarationId(3081),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3080),
+                        ty: DeclarationId(3082),
                     },
                 ],
             },
@@ -90646,7 +90677,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3082),
+            id: DeclarationId(3084),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90665,7 +90696,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3083),
+            id: DeclarationId(3085),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90679,17 +90710,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3084),
+            id: DeclarationId(3086),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3082),
+                        ty: DeclarationId(3084),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3083),
+                        ty: DeclarationId(3085),
                     },
                 ],
             },
@@ -90704,7 +90735,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3085),
+            id: DeclarationId(3087),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90723,7 +90754,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3086),
+            id: DeclarationId(3088),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90737,17 +90768,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3087),
+            id: DeclarationId(3089),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3085),
+                        ty: DeclarationId(3087),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3086),
+                        ty: DeclarationId(3088),
                     },
                 ],
             },
@@ -90762,7 +90793,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3088),
+            id: DeclarationId(3090),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90781,7 +90812,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3089),
+            id: DeclarationId(3091),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90795,17 +90826,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3090),
+            id: DeclarationId(3092),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3088),
+                        ty: DeclarationId(3090),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3089),
+                        ty: DeclarationId(3091),
                     },
                 ],
             },
@@ -90820,7 +90851,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3091),
+            id: DeclarationId(3093),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90839,7 +90870,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3092),
+            id: DeclarationId(3094),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90853,17 +90884,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3093),
+            id: DeclarationId(3095),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3091),
+                        ty: DeclarationId(3093),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3092),
+                        ty: DeclarationId(3094),
                     },
                 ],
             },
@@ -90878,7 +90909,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3094),
+            id: DeclarationId(3096),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90897,7 +90928,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3095),
+            id: DeclarationId(3097),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90911,17 +90942,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3096),
+            id: DeclarationId(3098),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3094),
+                        ty: DeclarationId(3096),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3095),
+                        ty: DeclarationId(3097),
                     },
                 ],
             },
@@ -90936,7 +90967,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3097),
+            id: DeclarationId(3099),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90955,7 +90986,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3098),
+            id: DeclarationId(3100),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90969,17 +91000,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3099),
+            id: DeclarationId(3101),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3097),
+                        ty: DeclarationId(3099),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3098),
+                        ty: DeclarationId(3100),
                     },
                 ],
             },
@@ -90994,7 +91025,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3100),
+            id: DeclarationId(3102),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91013,7 +91044,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3101),
+            id: DeclarationId(3103),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91027,17 +91058,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3102),
+            id: DeclarationId(3104),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3100),
+                        ty: DeclarationId(3102),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3101),
+                        ty: DeclarationId(3103),
                     },
                 ],
             },
@@ -91052,7 +91083,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3103),
+            id: DeclarationId(3105),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91071,7 +91102,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3104),
+            id: DeclarationId(3106),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91085,17 +91116,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3105),
+            id: DeclarationId(3107),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3103),
+                        ty: DeclarationId(3105),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3104),
+                        ty: DeclarationId(3106),
                     },
                 ],
             },
@@ -91110,7 +91141,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3106),
+            id: DeclarationId(3108),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91129,7 +91160,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3107),
+            id: DeclarationId(3109),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91143,17 +91174,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3108),
+            id: DeclarationId(3110),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3106),
+                        ty: DeclarationId(3108),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3107),
+                        ty: DeclarationId(3109),
                     },
                 ],
             },
@@ -91168,7 +91199,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3109),
+            id: DeclarationId(3111),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91187,7 +91218,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3110),
+            id: DeclarationId(3112),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91201,17 +91232,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3111),
+            id: DeclarationId(3113),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3109),
+                        ty: DeclarationId(3111),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3110),
+                        ty: DeclarationId(3112),
                     },
                 ],
             },
@@ -91226,7 +91257,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3112),
+            id: DeclarationId(3114),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91245,7 +91276,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3113),
+            id: DeclarationId(3115),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91259,17 +91290,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3114),
+            id: DeclarationId(3116),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3112),
+                        ty: DeclarationId(3114),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3113),
+                        ty: DeclarationId(3115),
                     },
                 ],
             },
@@ -91284,7 +91315,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3115),
+            id: DeclarationId(3117),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91303,7 +91334,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3116),
+            id: DeclarationId(3118),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91317,17 +91348,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3117),
+            id: DeclarationId(3119),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3115),
+                        ty: DeclarationId(3117),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3116),
+                        ty: DeclarationId(3118),
                     },
                 ],
             },
@@ -91342,12 +91373,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3118),
+            id: DeclarationId(3120),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2140),
+                    ty: DeclarationId(2142),
                 }],
             },
             type_params: vec![],
@@ -91361,7 +91392,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3119),
+            id: DeclarationId(3121),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91375,17 +91406,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3120),
+            id: DeclarationId(3122),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3118),
+                        ty: DeclarationId(3120),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3119),
+                        ty: DeclarationId(3121),
                     },
                 ],
             },
@@ -91400,7 +91431,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3121),
+            id: DeclarationId(3123),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91419,7 +91450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3122),
+            id: DeclarationId(3124),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91433,17 +91464,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3123),
+            id: DeclarationId(3125),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3121),
+                        ty: DeclarationId(3123),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3122),
+                        ty: DeclarationId(3124),
                     },
                 ],
             },
@@ -91458,7 +91489,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3124),
+            id: DeclarationId(3126),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91477,7 +91508,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3125),
+            id: DeclarationId(3127),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91491,17 +91522,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3126),
+            id: DeclarationId(3128),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3124),
+                        ty: DeclarationId(3126),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3125),
+                        ty: DeclarationId(3127),
                     },
                 ],
             },
@@ -91516,7 +91547,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3127),
+            id: DeclarationId(3129),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91535,7 +91566,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3128),
+            id: DeclarationId(3130),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91549,17 +91580,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3129),
+            id: DeclarationId(3131),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3127),
+                        ty: DeclarationId(3129),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3128),
+                        ty: DeclarationId(3130),
                     },
                 ],
             },
@@ -91574,7 +91605,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3130),
+            id: DeclarationId(3132),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91593,7 +91624,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3131),
+            id: DeclarationId(3133),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91607,17 +91638,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3132),
+            id: DeclarationId(3134),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3130),
+                        ty: DeclarationId(3132),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3131),
+                        ty: DeclarationId(3133),
                     },
                 ],
             },
@@ -91632,7 +91663,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3133),
+            id: DeclarationId(3135),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91651,7 +91682,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3134),
+            id: DeclarationId(3136),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91665,17 +91696,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3135),
+            id: DeclarationId(3137),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3133),
+                        ty: DeclarationId(3135),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3134),
+                        ty: DeclarationId(3136),
                     },
                 ],
             },
@@ -91690,7 +91721,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3136),
+            id: DeclarationId(3138),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91709,7 +91740,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3137),
+            id: DeclarationId(3139),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91723,17 +91754,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3138),
+            id: DeclarationId(3140),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3136),
+                        ty: DeclarationId(3138),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3137),
+                        ty: DeclarationId(3139),
                     },
                 ],
             },
@@ -91748,7 +91779,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3139),
+            id: DeclarationId(3141),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91767,7 +91798,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3140),
+            id: DeclarationId(3142),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91781,17 +91812,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3141),
+            id: DeclarationId(3143),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3139),
+                        ty: DeclarationId(3141),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3140),
+                        ty: DeclarationId(3142),
                     },
                 ],
             },
@@ -91806,7 +91837,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3142),
+            id: DeclarationId(3144),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91825,7 +91856,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3143),
+            id: DeclarationId(3145),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91839,17 +91870,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3144),
+            id: DeclarationId(3146),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3142),
+                        ty: DeclarationId(3144),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3143),
+                        ty: DeclarationId(3145),
                     },
                 ],
             },
@@ -91864,7 +91895,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3145),
+            id: DeclarationId(3147),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91883,7 +91914,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3146),
+            id: DeclarationId(3148),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91897,17 +91928,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3147),
+            id: DeclarationId(3149),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3145),
+                        ty: DeclarationId(3147),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3146),
+                        ty: DeclarationId(3148),
                     },
                 ],
             },
@@ -91922,7 +91953,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3148),
+            id: DeclarationId(3150),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91941,7 +91972,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3149),
+            id: DeclarationId(3151),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91955,17 +91986,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3150),
+            id: DeclarationId(3152),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3148),
+                        ty: DeclarationId(3150),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3149),
+                        ty: DeclarationId(3151),
                     },
                 ],
             },
@@ -91980,7 +92011,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3151),
+            id: DeclarationId(3153),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91999,7 +92030,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3152),
+            id: DeclarationId(3154),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92013,17 +92044,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3153),
+            id: DeclarationId(3155),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3151),
+                        ty: DeclarationId(3153),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3152),
+                        ty: DeclarationId(3154),
                     },
                 ],
             },
@@ -92038,7 +92069,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3154),
+            id: DeclarationId(3156),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92057,7 +92088,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3155),
+            id: DeclarationId(3157),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92071,17 +92102,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3156),
+            id: DeclarationId(3158),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3154),
+                        ty: DeclarationId(3156),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3155),
+                        ty: DeclarationId(3157),
                     },
                 ],
             },
@@ -92096,7 +92127,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3157),
+            id: DeclarationId(3159),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92115,7 +92146,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3158),
+            id: DeclarationId(3160),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92129,17 +92160,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3159),
+            id: DeclarationId(3161),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3157),
+                        ty: DeclarationId(3159),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3158),
+                        ty: DeclarationId(3160),
                     },
                 ],
             },
@@ -92154,7 +92185,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3160),
+            id: DeclarationId(3162),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92173,7 +92204,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3161),
+            id: DeclarationId(3163),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92187,17 +92218,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3162),
+            id: DeclarationId(3164),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3160),
+                        ty: DeclarationId(3162),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3161),
+                        ty: DeclarationId(3163),
                     },
                 ],
             },
@@ -92212,7 +92243,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3163),
+            id: DeclarationId(3165),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92231,7 +92262,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3164),
+            id: DeclarationId(3166),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92245,17 +92276,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3165),
+            id: DeclarationId(3167),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3163),
+                        ty: DeclarationId(3165),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3164),
+                        ty: DeclarationId(3166),
                     },
                 ],
             },
@@ -92270,7 +92301,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3166),
+            id: DeclarationId(3168),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92289,7 +92320,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3167),
+            id: DeclarationId(3169),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92303,17 +92334,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3168),
+            id: DeclarationId(3170),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3166),
+                        ty: DeclarationId(3168),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3167),
+                        ty: DeclarationId(3169),
                     },
                 ],
             },
@@ -92328,7 +92359,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3169),
+            id: DeclarationId(3171),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92347,7 +92378,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3170),
+            id: DeclarationId(3172),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92361,17 +92392,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3171),
+            id: DeclarationId(3173),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3169),
+                        ty: DeclarationId(3171),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3170),
+                        ty: DeclarationId(3172),
                     },
                 ],
             },
@@ -92386,7 +92417,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3172),
+            id: DeclarationId(3174),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92405,7 +92436,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3173),
+            id: DeclarationId(3175),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92419,17 +92450,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3174),
+            id: DeclarationId(3176),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3172),
+                        ty: DeclarationId(3174),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3173),
+                        ty: DeclarationId(3175),
                     },
                 ],
             },
@@ -92444,7 +92475,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3175),
+            id: DeclarationId(3177),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92463,7 +92494,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3176),
+            id: DeclarationId(3178),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92477,17 +92508,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3177),
+            id: DeclarationId(3179),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3175),
+                        ty: DeclarationId(3177),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3176),
+                        ty: DeclarationId(3178),
                     },
                 ],
             },
@@ -92502,7 +92533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3178),
+            id: DeclarationId(3180),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92521,7 +92552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3179),
+            id: DeclarationId(3181),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92535,17 +92566,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3180),
+            id: DeclarationId(3182),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3178),
+                        ty: DeclarationId(3180),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3179),
+                        ty: DeclarationId(3181),
                     },
                 ],
             },
@@ -92560,7 +92591,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3181),
+            id: DeclarationId(3183),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92579,7 +92610,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3182),
+            id: DeclarationId(3184),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92593,17 +92624,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3183),
+            id: DeclarationId(3185),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3181),
+                        ty: DeclarationId(3183),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3182),
+                        ty: DeclarationId(3184),
                     },
                 ],
             },
@@ -92618,7 +92649,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3184),
+            id: DeclarationId(3186),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92637,7 +92668,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3185),
+            id: DeclarationId(3187),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92651,17 +92682,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3186),
+            id: DeclarationId(3188),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3184),
+                        ty: DeclarationId(3186),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3185),
+                        ty: DeclarationId(3187),
                     },
                 ],
             },
@@ -92676,7 +92707,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3187),
+            id: DeclarationId(3189),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92695,7 +92726,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3188),
+            id: DeclarationId(3190),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92709,17 +92740,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3189),
+            id: DeclarationId(3191),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3187),
+                        ty: DeclarationId(3189),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3188),
+                        ty: DeclarationId(3190),
                     },
                 ],
             },
@@ -92734,7 +92765,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3190),
+            id: DeclarationId(3192),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92753,7 +92784,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3191),
+            id: DeclarationId(3193),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92767,17 +92798,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3192),
+            id: DeclarationId(3194),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3190),
+                        ty: DeclarationId(3192),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3191),
+                        ty: DeclarationId(3193),
                     },
                 ],
             },
@@ -92792,7 +92823,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3193),
+            id: DeclarationId(3195),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92811,7 +92842,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3194),
+            id: DeclarationId(3196),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92825,17 +92856,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3195),
+            id: DeclarationId(3197),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3193),
+                        ty: DeclarationId(3195),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3194),
+                        ty: DeclarationId(3196),
                     },
                 ],
             },
@@ -92850,7 +92881,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3196),
+            id: DeclarationId(3198),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92869,7 +92900,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3197),
+            id: DeclarationId(3199),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92883,17 +92914,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3198),
+            id: DeclarationId(3200),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3196),
+                        ty: DeclarationId(3198),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3197),
+                        ty: DeclarationId(3199),
                     },
                 ],
             },
@@ -92908,7 +92939,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3199),
+            id: DeclarationId(3201),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92927,7 +92958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3200),
+            id: DeclarationId(3202),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92941,17 +92972,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3201),
+            id: DeclarationId(3203),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3199),
+                        ty: DeclarationId(3201),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3200),
+                        ty: DeclarationId(3202),
                     },
                 ],
             },
@@ -92966,7 +92997,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3202),
+            id: DeclarationId(3204),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92985,7 +93016,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3203),
+            id: DeclarationId(3205),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92999,17 +93030,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3204),
+            id: DeclarationId(3206),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3202),
+                        ty: DeclarationId(3204),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3203),
+                        ty: DeclarationId(3205),
                     },
                 ],
             },
@@ -93024,7 +93055,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3205),
+            id: DeclarationId(3207),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93043,7 +93074,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3206),
+            id: DeclarationId(3208),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93057,17 +93088,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3207),
+            id: DeclarationId(3209),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3205),
+                        ty: DeclarationId(3207),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3206),
+                        ty: DeclarationId(3208),
                     },
                 ],
             },
@@ -93082,7 +93113,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3208),
+            id: DeclarationId(3210),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93101,7 +93132,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3209),
+            id: DeclarationId(3211),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93115,17 +93146,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3210),
+            id: DeclarationId(3212),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3208),
+                        ty: DeclarationId(3210),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3209),
+                        ty: DeclarationId(3211),
                     },
                 ],
             },
@@ -93140,7 +93171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3211),
+            id: DeclarationId(3213),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93159,7 +93190,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3212),
+            id: DeclarationId(3214),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93173,17 +93204,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3213),
+            id: DeclarationId(3215),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3211),
+                        ty: DeclarationId(3213),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3212),
+                        ty: DeclarationId(3214),
                     },
                 ],
             },
@@ -93198,7 +93229,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3214),
+            id: DeclarationId(3216),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93217,7 +93248,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3215),
+            id: DeclarationId(3217),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93231,17 +93262,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3216),
+            id: DeclarationId(3218),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3214),
+                        ty: DeclarationId(3216),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3215),
+                        ty: DeclarationId(3217),
                     },
                 ],
             },
@@ -93256,7 +93287,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3217),
+            id: DeclarationId(3219),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93275,7 +93306,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3218),
+            id: DeclarationId(3220),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93289,17 +93320,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3219),
+            id: DeclarationId(3221),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3217),
+                        ty: DeclarationId(3219),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3218),
+                        ty: DeclarationId(3220),
                     },
                 ],
             },
@@ -93314,7 +93345,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3220),
+            id: DeclarationId(3222),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93333,7 +93364,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3221),
+            id: DeclarationId(3223),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93347,17 +93378,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3222),
+            id: DeclarationId(3224),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3220),
+                        ty: DeclarationId(3222),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3221),
+                        ty: DeclarationId(3223),
                     },
                 ],
             },
@@ -93372,7 +93403,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3223),
+            id: DeclarationId(3225),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93391,7 +93422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3224),
+            id: DeclarationId(3226),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93405,17 +93436,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3225),
+            id: DeclarationId(3227),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3223),
+                        ty: DeclarationId(3225),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3224),
+                        ty: DeclarationId(3226),
                     },
                 ],
             },
@@ -93430,7 +93461,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3226),
+            id: DeclarationId(3228),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93449,7 +93480,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3227),
+            id: DeclarationId(3229),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93463,17 +93494,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3228),
+            id: DeclarationId(3230),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3226),
+                        ty: DeclarationId(3228),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3227),
+                        ty: DeclarationId(3229),
                     },
                 ],
             },
@@ -93488,12 +93519,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3229),
+            id: DeclarationId(3231),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1752),
+                    ty: DeclarationId(1754),
                 }],
             },
             type_params: vec![],
@@ -93507,7 +93538,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3230),
+            id: DeclarationId(3232),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93521,17 +93552,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3231),
+            id: DeclarationId(3233),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3229),
+                        ty: DeclarationId(3231),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3230),
+                        ty: DeclarationId(3232),
                     },
                 ],
             },
@@ -93546,12 +93577,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3232),
+            id: DeclarationId(3234),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2805),
+                    ty: DeclarationId(2807),
                 }],
             },
             type_params: vec![],
@@ -93565,7 +93596,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3233),
+            id: DeclarationId(3235),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93579,17 +93610,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3234),
+            id: DeclarationId(3236),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3232),
+                        ty: DeclarationId(3234),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3233),
+                        ty: DeclarationId(3235),
                     },
                 ],
             },
@@ -93604,12 +93635,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3235),
+            id: DeclarationId(3237),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1741),
+                    ty: DeclarationId(1743),
                 }],
             },
             type_params: vec![],
@@ -93623,7 +93654,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3236),
+            id: DeclarationId(3238),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93637,17 +93668,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3237),
+            id: DeclarationId(3239),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3235),
+                        ty: DeclarationId(3237),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3236),
+                        ty: DeclarationId(3238),
                     },
                 ],
             },
@@ -93662,7 +93693,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3238),
+            id: DeclarationId(3240),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93681,7 +93712,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3239),
+            id: DeclarationId(3241),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93695,17 +93726,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3240),
+            id: DeclarationId(3242),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3238),
+                        ty: DeclarationId(3240),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3239),
+                        ty: DeclarationId(3241),
                     },
                 ],
             },
@@ -93720,7 +93751,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3241),
+            id: DeclarationId(3243),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93739,7 +93770,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3242),
+            id: DeclarationId(3244),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93753,17 +93784,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3243),
+            id: DeclarationId(3245),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3241),
+                        ty: DeclarationId(3243),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3242),
+                        ty: DeclarationId(3244),
                     },
                 ],
             },
@@ -93778,7 +93809,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3244),
+            id: DeclarationId(3246),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93797,7 +93828,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3245),
+            id: DeclarationId(3247),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93811,17 +93842,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3246),
+            id: DeclarationId(3248),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3244),
+                        ty: DeclarationId(3246),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3245),
+                        ty: DeclarationId(3247),
                     },
                 ],
             },
@@ -93836,12 +93867,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3247),
+            id: DeclarationId(3249),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2839),
+                    ty: DeclarationId(2841),
                 }],
             },
             type_params: vec![],
@@ -93855,7 +93886,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3248),
+            id: DeclarationId(3250),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93869,17 +93900,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3249),
+            id: DeclarationId(3251),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3247),
+                        ty: DeclarationId(3249),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3248),
+                        ty: DeclarationId(3250),
                     },
                 ],
             },
@@ -93894,12 +93925,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3250),
+            id: DeclarationId(3252),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2841),
+                    ty: DeclarationId(2843),
                 }],
             },
             type_params: vec![],
@@ -93913,7 +93944,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3251),
+            id: DeclarationId(3253),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93927,17 +93958,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3252),
+            id: DeclarationId(3254),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3250),
+                        ty: DeclarationId(3252),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3251),
+                        ty: DeclarationId(3253),
                     },
                 ],
             },
@@ -93952,7 +93983,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3253),
+            id: DeclarationId(3255),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93971,7 +94002,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3254),
+            id: DeclarationId(3256),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93985,17 +94016,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3255),
+            id: DeclarationId(3257),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3253),
+                        ty: DeclarationId(3255),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3254),
+                        ty: DeclarationId(3256),
                     },
                 ],
             },
@@ -94010,12 +94041,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3256),
+            id: DeclarationId(3258),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1771),
+                    ty: DeclarationId(1773),
                 }],
             },
             type_params: vec![],
@@ -94029,7 +94060,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3257),
+            id: DeclarationId(3259),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94043,17 +94074,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3258),
+            id: DeclarationId(3260),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3256),
+                        ty: DeclarationId(3258),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3257),
+                        ty: DeclarationId(3259),
                     },
                 ],
             },
@@ -94068,7 +94099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3259),
+            id: DeclarationId(3261),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94087,7 +94118,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3260),
+            id: DeclarationId(3262),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94101,17 +94132,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3261),
+            id: DeclarationId(3263),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3259),
+                        ty: DeclarationId(3261),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3260),
+                        ty: DeclarationId(3262),
                     },
                 ],
             },
@@ -94126,12 +94157,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3262),
+            id: DeclarationId(3264),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1752),
+                    ty: DeclarationId(1754),
                 }],
             },
             type_params: vec![],
@@ -94145,7 +94176,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3263),
+            id: DeclarationId(3265),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94159,17 +94190,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3264),
+            id: DeclarationId(3266),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3262),
+                        ty: DeclarationId(3264),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3263),
+                        ty: DeclarationId(3265),
                     },
                 ],
             },
@@ -94184,12 +94215,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3265),
+            id: DeclarationId(3267),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1751),
+                    ty: DeclarationId(1753),
                 }],
             },
             type_params: vec![],
@@ -94203,7 +94234,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3266),
+            id: DeclarationId(3268),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94217,17 +94248,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3267),
+            id: DeclarationId(3269),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3265),
+                        ty: DeclarationId(3267),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3266),
+                        ty: DeclarationId(3268),
                     },
                 ],
             },
@@ -94242,12 +94273,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3268),
+            id: DeclarationId(3270),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1750),
+                    ty: DeclarationId(1752),
                 }],
             },
             type_params: vec![],
@@ -94261,7 +94292,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3269),
+            id: DeclarationId(3271),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94275,17 +94306,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3270),
+            id: DeclarationId(3272),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3268),
+                        ty: DeclarationId(3270),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3269),
+                        ty: DeclarationId(3271),
                     },
                 ],
             },
@@ -94300,7 +94331,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3271),
+            id: DeclarationId(3273),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94319,7 +94350,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3272),
+            id: DeclarationId(3274),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94333,17 +94364,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3273),
+            id: DeclarationId(3275),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3271),
+                        ty: DeclarationId(3273),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3272),
+                        ty: DeclarationId(3274),
                     },
                 ],
             },
@@ -94358,7 +94389,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3274),
+            id: DeclarationId(3276),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94377,7 +94408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3275),
+            id: DeclarationId(3277),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94391,17 +94422,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3276),
+            id: DeclarationId(3278),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3274),
+                        ty: DeclarationId(3276),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3275),
+                        ty: DeclarationId(3277),
                     },
                 ],
             },
@@ -94416,7 +94447,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3277),
+            id: DeclarationId(3279),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94435,7 +94466,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3278),
+            id: DeclarationId(3280),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94449,17 +94480,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3279),
+            id: DeclarationId(3281),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3277),
+                        ty: DeclarationId(3279),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3278),
+                        ty: DeclarationId(3280),
                     },
                 ],
             },
@@ -94474,12 +94505,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3280),
+            id: DeclarationId(3282),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2869),
+                    ty: DeclarationId(2871),
                 }],
             },
             type_params: vec![],
@@ -94493,7 +94524,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3281),
+            id: DeclarationId(3283),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94507,17 +94538,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3282),
+            id: DeclarationId(3284),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3280),
+                        ty: DeclarationId(3282),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3281),
+                        ty: DeclarationId(3283),
                     },
                 ],
             },
@@ -94532,7 +94563,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3283),
+            id: DeclarationId(3285),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94551,7 +94582,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3284),
+            id: DeclarationId(3286),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94565,17 +94596,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3285),
+            id: DeclarationId(3287),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3283),
+                        ty: DeclarationId(3285),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3284),
+                        ty: DeclarationId(3286),
                     },
                 ],
             },
@@ -94590,7 +94621,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3286),
+            id: DeclarationId(3288),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94609,7 +94640,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3287),
+            id: DeclarationId(3289),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94623,17 +94654,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3288),
+            id: DeclarationId(3290),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3286),
+                        ty: DeclarationId(3288),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3287),
+                        ty: DeclarationId(3289),
                     },
                 ],
             },
@@ -94648,7 +94679,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3289),
+            id: DeclarationId(3291),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94667,7 +94698,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3290),
+            id: DeclarationId(3292),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94681,17 +94712,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3291),
+            id: DeclarationId(3293),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3289),
+                        ty: DeclarationId(3291),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3290),
+                        ty: DeclarationId(3292),
                     },
                 ],
             },
@@ -94706,7 +94737,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3292),
+            id: DeclarationId(3294),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94725,7 +94756,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3293),
+            id: DeclarationId(3295),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94739,17 +94770,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3294),
+            id: DeclarationId(3296),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3292),
+                        ty: DeclarationId(3294),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3293),
+                        ty: DeclarationId(3295),
                     },
                 ],
             },
@@ -94764,7 +94795,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3295),
+            id: DeclarationId(3297),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94783,7 +94814,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3296),
+            id: DeclarationId(3298),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94797,17 +94828,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3297),
+            id: DeclarationId(3299),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3295),
+                        ty: DeclarationId(3297),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3296),
+                        ty: DeclarationId(3298),
                     },
                 ],
             },
@@ -94822,12 +94853,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3298),
+            id: DeclarationId(3300),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2877),
+                    ty: DeclarationId(2879),
                 }],
             },
             type_params: vec![],
@@ -94841,7 +94872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3299),
+            id: DeclarationId(3301),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94855,17 +94886,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3300),
+            id: DeclarationId(3302),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3298),
+                        ty: DeclarationId(3300),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3299),
+                        ty: DeclarationId(3301),
                     },
                 ],
             },
@@ -94880,12 +94911,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3301),
+            id: DeclarationId(3303),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2879),
+                    ty: DeclarationId(2881),
                 }],
             },
             type_params: vec![],
@@ -94899,7 +94930,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10996),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3302),
+            id: DeclarationId(3304),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94913,17 +94944,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10996),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3303),
+            id: DeclarationId(3305),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3301),
+                        ty: DeclarationId(3303),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3302),
+                        ty: DeclarationId(3304),
                     },
                 ],
             },
@@ -94938,7 +94969,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10996),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3304),
+            id: DeclarationId(3306),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94957,7 +94988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3305),
+            id: DeclarationId(3307),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94971,17 +95002,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3306),
+            id: DeclarationId(3308),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3304),
+                        ty: DeclarationId(3306),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3305),
+                        ty: DeclarationId(3307),
                     },
                 ],
             },
@@ -94996,7 +95027,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3307),
+            id: DeclarationId(3309),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95015,7 +95046,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3308),
+            id: DeclarationId(3310),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95029,17 +95060,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3309),
+            id: DeclarationId(3311),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3307),
+                        ty: DeclarationId(3309),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3308),
+                        ty: DeclarationId(3310),
                     },
                 ],
             },
@@ -95054,7 +95085,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3310),
+            id: DeclarationId(3312),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95073,7 +95104,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3311),
+            id: DeclarationId(3313),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95087,17 +95118,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3312),
+            id: DeclarationId(3314),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3310),
+                        ty: DeclarationId(3312),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3311),
+                        ty: DeclarationId(3313),
                     },
                 ],
             },
@@ -95112,7 +95143,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3313),
+            id: DeclarationId(3315),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95131,7 +95162,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3314),
+            id: DeclarationId(3316),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95145,17 +95176,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3315),
+            id: DeclarationId(3317),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3313),
+                        ty: DeclarationId(3315),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3314),
+                        ty: DeclarationId(3316),
                     },
                 ],
             },
@@ -95170,7 +95201,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3316),
+            id: DeclarationId(3318),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95189,7 +95220,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11530, 11534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3317),
+            id: DeclarationId(3319),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95203,17 +95234,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11530, 11534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3318),
+            id: DeclarationId(3320),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3316),
+                        ty: DeclarationId(3318),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3317),
+                        ty: DeclarationId(3319),
                     },
                 ],
             },
@@ -95228,7 +95259,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11530, 11534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3319),
+            id: DeclarationId(3321),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95247,7 +95278,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11584, 11591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3320),
+            id: DeclarationId(3322),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95261,17 +95292,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11584, 11591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3321),
+            id: DeclarationId(3323),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3319),
+                        ty: DeclarationId(3321),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3320),
+                        ty: DeclarationId(3322),
                     },
                 ],
             },
@@ -95286,7 +95317,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11584, 11591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3322),
+            id: DeclarationId(3324),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95305,7 +95336,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3323),
+            id: DeclarationId(3325),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95319,17 +95350,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3324),
+            id: DeclarationId(3326),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3322),
+                        ty: DeclarationId(3324),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3323),
+                        ty: DeclarationId(3325),
                     },
                 ],
             },
@@ -95344,7 +95375,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3325),
+            id: DeclarationId(3327),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95363,7 +95394,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11610, 11614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3326),
+            id: DeclarationId(3328),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95377,17 +95408,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11610, 11614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3327),
+            id: DeclarationId(3329),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3325),
+                        ty: DeclarationId(3327),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3326),
+                        ty: DeclarationId(3328),
                     },
                 ],
             },
@@ -95402,7 +95433,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11610, 11614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3328),
+            id: DeclarationId(3330),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95421,7 +95452,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11663, 11670),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3329),
+            id: DeclarationId(3331),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95435,17 +95466,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11663, 11670),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3330),
+            id: DeclarationId(3332),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3328),
+                        ty: DeclarationId(3330),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3329),
+                        ty: DeclarationId(3331),
                     },
                 ],
             },
@@ -95460,7 +95491,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11663, 11670),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3331),
+            id: DeclarationId(3333),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95479,7 +95510,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11678, 11682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3332),
+            id: DeclarationId(3334),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95493,17 +95524,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11678, 11682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3333),
+            id: DeclarationId(3335),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3331),
+                        ty: DeclarationId(3333),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3332),
+                        ty: DeclarationId(3334),
                     },
                 ],
             },
@@ -95518,7 +95549,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11678, 11682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3334),
+            id: DeclarationId(3336),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95537,7 +95568,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11689, 11693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3335),
+            id: DeclarationId(3337),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95551,17 +95582,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11689, 11693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3336),
+            id: DeclarationId(3338),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3334),
+                        ty: DeclarationId(3336),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3335),
+                        ty: DeclarationId(3337),
                     },
                 ],
             },
@@ -95576,7 +95607,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11689, 11693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3337),
+            id: DeclarationId(3339),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95595,7 +95626,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12673, 12677),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3338),
+            id: DeclarationId(3340),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95609,17 +95640,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12673, 12677),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3339),
+            id: DeclarationId(3341),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3337),
+                        ty: DeclarationId(3339),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3338),
+                        ty: DeclarationId(3340),
                     },
                 ],
             },
@@ -95634,7 +95665,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12673, 12677),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3340),
+            id: DeclarationId(3342),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95653,7 +95684,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12756, 12763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3341),
+            id: DeclarationId(3343),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95667,17 +95698,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12756, 12763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3342),
+            id: DeclarationId(3344),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3340),
+                        ty: DeclarationId(3342),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3341),
+                        ty: DeclarationId(3343),
                     },
                 ],
             },
@@ -95692,7 +95723,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12756, 12763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3343),
+            id: DeclarationId(3345),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95711,7 +95742,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13403, 13407),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3344),
+            id: DeclarationId(3346),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95725,17 +95756,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13403, 13407),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3345),
+            id: DeclarationId(3347),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3343),
+                        ty: DeclarationId(3345),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3344),
+                        ty: DeclarationId(3346),
                     },
                 ],
             },
@@ -97272,7 +97303,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(189),
             Port {
                 id: PortId(189),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2008))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2010))),
                 produced_by: Some(NodeId(184)),
             },
         );
@@ -97296,7 +97327,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(192),
             Port {
                 id: PortId(192),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2009))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2011))),
                 produced_by: None,
             },
         );
@@ -97304,7 +97335,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(193),
             Port {
                 id: PortId(193),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2010))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2012))),
                 produced_by: Some(NodeId(186)),
             },
         );
@@ -97592,7 +97623,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(229),
             Port {
                 id: PortId(229),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2011))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2013))),
                 produced_by: None,
             },
         );
@@ -99144,7 +99175,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(423),
             Port {
                 id: PortId(423),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2012))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2014))),
                 produced_by: None,
             },
         );
@@ -99168,7 +99199,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(426),
             Port {
                 id: PortId(426),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2009))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2011))),
                 produced_by: Some(NodeId(363)),
             },
         );
@@ -99184,7 +99215,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(428),
             Port {
                 id: PortId(428),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2013))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2015))),
                 produced_by: Some(NodeId(365)),
             },
         );
@@ -99192,7 +99223,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(429),
             Port {
                 id: PortId(429),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2014))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2016))),
                 produced_by: None,
             },
         );
@@ -99296,7 +99327,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(442),
             Port {
                 id: PortId(442),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2015))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2017))),
                 produced_by: Some(NodeId(378)),
             },
         );
@@ -99304,7 +99335,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(443),
             Port {
                 id: PortId(443),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2016))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2018))),
                 produced_by: None,
             },
         );
@@ -99352,7 +99383,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(449),
             Port {
                 id: PortId(449),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2017))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2019))),
                 produced_by: Some(NodeId(385)),
             },
         );
@@ -99360,7 +99391,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(450),
             Port {
                 id: PortId(450),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2018))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2020))),
                 produced_by: None,
             },
         );
@@ -99440,7 +99471,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(460),
             Port {
                 id: PortId(460),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2019))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2021))),
                 produced_by: None,
             },
         );
@@ -99544,7 +99575,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(473),
             Port {
                 id: PortId(473),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2020))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2022))),
                 produced_by: Some(NodeId(407)),
             },
         );
@@ -99824,7 +99855,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(508),
             Port {
                 id: PortId(508),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2021))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2023))),
                 produced_by: None,
             },
         );
@@ -99936,7 +99967,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(522),
             Port {
                 id: PortId(522),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2022))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2024))),
                 produced_by: None,
             },
         );
@@ -100048,7 +100079,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(536),
             Port {
                 id: PortId(536),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2023))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2025))),
                 produced_by: None,
             },
         );
@@ -100664,7 +100695,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(613),
             Port {
                 id: PortId(613),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2024))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2026))),
                 produced_by: None,
             },
         );
@@ -100776,7 +100807,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(627),
             Port {
                 id: PortId(627),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2025))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2027))),
                 produced_by: Some(NodeId(516)),
             },
         );
@@ -100784,7 +100815,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(628),
             Port {
                 id: PortId(628),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2026))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2028))),
                 produced_by: None,
             },
         );
@@ -100840,7 +100871,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(635),
             Port {
                 id: PortId(635),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2027))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2029))),
                 produced_by: Some(NodeId(523)),
             },
         );
@@ -100848,7 +100879,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(636),
             Port {
                 id: PortId(636),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2028))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2030))),
                 produced_by: None,
             },
         );
@@ -100864,7 +100895,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(638),
             Port {
                 id: PortId(638),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2029))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2031))),
                 produced_by: Some(NodeId(526)),
             },
         );
@@ -101128,7 +101159,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(671),
             Port {
                 id: PortId(671),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2362))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2364))),
                 produced_by: None,
             },
         );
@@ -101560,7 +101591,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(725),
             Port {
                 id: PortId(725),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2506))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2508))),
                 produced_by: Some(NodeId(596)),
             },
         );
@@ -101584,7 +101615,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(728),
             Port {
                 id: PortId(728),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2507))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2509))),
                 produced_by: Some(NodeId(598)),
             },
         );
@@ -101592,7 +101623,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(729),
             Port {
                 id: PortId(729),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2508))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2510))),
                 produced_by: Some(NodeId(600)),
             },
         );
@@ -101600,7 +101631,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(730),
             Port {
                 id: PortId(730),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2509))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2511))),
                 produced_by: Some(NodeId(602)),
             },
         );
@@ -101608,7 +101639,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(731),
             Port {
                 id: PortId(731),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2510))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2512))),
                 produced_by: Some(NodeId(604)),
             },
         );
@@ -101616,7 +101647,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(732),
             Port {
                 id: PortId(732),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2511))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2513))),
                 produced_by: Some(NodeId(606)),
             },
         );
@@ -101624,7 +101655,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(733),
             Port {
                 id: PortId(733),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2512))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2514))),
                 produced_by: Some(NodeId(608)),
             },
         );
@@ -101632,7 +101663,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(734),
             Port {
                 id: PortId(734),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2514))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2516))),
                 produced_by: Some(NodeId(610)),
             },
         );
@@ -101664,7 +101695,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(738),
             Port {
                 id: PortId(738),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2516))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2518))),
                 produced_by: Some(NodeId(614)),
             },
         );
@@ -101688,7 +101719,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(741),
             Port {
                 id: PortId(741),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2517))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2519))),
                 produced_by: Some(NodeId(617)),
             },
         );
@@ -101720,7 +101751,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(745),
             Port {
                 id: PortId(745),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2518))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2520))),
                 produced_by: Some(NodeId(621)),
             },
         );
@@ -101768,7 +101799,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(751),
             Port {
                 id: PortId(751),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2519))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2521))),
                 produced_by: Some(NodeId(626)),
             },
         );
@@ -101840,7 +101871,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(760),
             Port {
                 id: PortId(760),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2520))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2522))),
                 produced_by: Some(NodeId(633)),
             },
         );
@@ -101920,7 +101951,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(770),
             Port {
                 id: PortId(770),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2521))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2523))),
                 produced_by: Some(NodeId(640)),
             },
         );
@@ -101984,7 +102015,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(778),
             Port {
                 id: PortId(778),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2522))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2524))),
                 produced_by: Some(NodeId(645)),
             },
         );
@@ -102000,7 +102031,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(780),
             Port {
                 id: PortId(780),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2523))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2525))),
                 produced_by: None,
             },
         );
@@ -102088,7 +102119,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(791),
             Port {
                 id: PortId(791),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2524))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2526))),
                 produced_by: Some(NodeId(655)),
             },
         );
@@ -102160,7 +102191,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(800),
             Port {
                 id: PortId(800),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2525))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2527))),
                 produced_by: Some(NodeId(663)),
             },
         );
@@ -102584,7 +102615,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(853),
             Port {
                 id: PortId(853),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2582))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2584))),
                 produced_by: Some(NodeId(713)),
             },
         );
@@ -102792,7 +102823,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(879),
             Port {
                 id: PortId(879),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1998))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2000))),
                 produced_by: Some(NodeId(733)),
             },
         );
@@ -103360,7 +103391,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(950),
             Port {
                 id: PortId(950),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2583))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2585))),
                 produced_by: Some(NodeId(792)),
             },
         );
@@ -103496,7 +103527,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(967),
             Port {
                 id: PortId(967),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1296))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1298))),
                 produced_by: None,
             },
         );
@@ -103536,7 +103567,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(972),
             Port {
                 id: PortId(972),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1298))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1300))),
                 produced_by: Some(NodeId(810)),
             },
         );
@@ -103552,7 +103583,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(974),
             Port {
                 id: PortId(974),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2759))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2761))),
                 produced_by: Some(NodeId(812)),
             },
         );
@@ -103939,145 +103970,145 @@ fn bootstrapped_fixture_dag_clusters() -> Vec<Cluster> {
 fn bootstrapped_fixture_dag_optional_match_disjs() -> HashMap<DeclarationId, DeclarationId> {
     {
         let mut map = HashMap::new();
-        map.insert(DeclarationId(389), DeclarationId(2931));
-        map.insert(DeclarationId(391), DeclarationId(2934));
-        map.insert(DeclarationId(423), DeclarationId(2937));
-        map.insert(DeclarationId(426), DeclarationId(2940));
-        map.insert(DeclarationId(471), DeclarationId(2943));
-        map.insert(DeclarationId(472), DeclarationId(2946));
-        map.insert(DeclarationId(473), DeclarationId(2949));
-        map.insert(DeclarationId(513), DeclarationId(2952));
-        map.insert(DeclarationId(515), DeclarationId(2955));
-        map.insert(DeclarationId(516), DeclarationId(2958));
-        map.insert(DeclarationId(539), DeclarationId(2961));
-        map.insert(DeclarationId(582), DeclarationId(2964));
-        map.insert(DeclarationId(602), DeclarationId(2967));
-        map.insert(DeclarationId(603), DeclarationId(2970));
-        map.insert(DeclarationId(605), DeclarationId(2973));
-        map.insert(DeclarationId(608), DeclarationId(2976));
-        map.insert(DeclarationId(613), DeclarationId(2979));
-        map.insert(DeclarationId(614), DeclarationId(2982));
-        map.insert(DeclarationId(618), DeclarationId(2985));
-        map.insert(DeclarationId(619), DeclarationId(2988));
-        map.insert(DeclarationId(620), DeclarationId(2991));
-        map.insert(DeclarationId(625), DeclarationId(2994));
-        map.insert(DeclarationId(1819), DeclarationId(2997));
-        map.insert(DeclarationId(1823), DeclarationId(3000));
-        map.insert(DeclarationId(1826), DeclarationId(3003));
-        map.insert(DeclarationId(1828), DeclarationId(3006));
-        map.insert(DeclarationId(1829), DeclarationId(3009));
-        map.insert(DeclarationId(1830), DeclarationId(3012));
-        map.insert(DeclarationId(1884), DeclarationId(3015));
-        map.insert(DeclarationId(1885), DeclarationId(3018));
-        map.insert(DeclarationId(1886), DeclarationId(3021));
-        map.insert(DeclarationId(1887), DeclarationId(3024));
-        map.insert(DeclarationId(1888), DeclarationId(3027));
-        map.insert(DeclarationId(1889), DeclarationId(3030));
-        map.insert(DeclarationId(1895), DeclarationId(3033));
-        map.insert(DeclarationId(1950), DeclarationId(3036));
-        map.insert(DeclarationId(1953), DeclarationId(3039));
-        map.insert(DeclarationId(1954), DeclarationId(3042));
-        map.insert(DeclarationId(1955), DeclarationId(3045));
-        map.insert(DeclarationId(1956), DeclarationId(3048));
-        map.insert(DeclarationId(1979), DeclarationId(3051));
-        map.insert(DeclarationId(1984), DeclarationId(3054));
-        map.insert(DeclarationId(1988), DeclarationId(3057));
-        map.insert(DeclarationId(1991), DeclarationId(3060));
-        map.insert(DeclarationId(1992), DeclarationId(3063));
-        map.insert(DeclarationId(2037), DeclarationId(3066));
-        map.insert(DeclarationId(2038), DeclarationId(3069));
-        map.insert(DeclarationId(2039), DeclarationId(3072));
-        map.insert(DeclarationId(2040), DeclarationId(3075));
-        map.insert(DeclarationId(2090), DeclarationId(3078));
-        map.insert(DeclarationId(2091), DeclarationId(3081));
-        map.insert(DeclarationId(2110), DeclarationId(3084));
-        map.insert(DeclarationId(2111), DeclarationId(3087));
-        map.insert(DeclarationId(2115), DeclarationId(3090));
-        map.insert(DeclarationId(2116), DeclarationId(3093));
-        map.insert(DeclarationId(2127), DeclarationId(3096));
-        map.insert(DeclarationId(2128), DeclarationId(3099));
-        map.insert(DeclarationId(2130), DeclarationId(3102));
-        map.insert(DeclarationId(2131), DeclarationId(3105));
-        map.insert(DeclarationId(2133), DeclarationId(3108));
-        map.insert(DeclarationId(2134), DeclarationId(3111));
-        map.insert(DeclarationId(2136), DeclarationId(3114));
-        map.insert(DeclarationId(2138), DeclarationId(3117));
-        map.insert(DeclarationId(2141), DeclarationId(3120));
-        map.insert(DeclarationId(2145), DeclarationId(3123));
-        map.insert(DeclarationId(2147), DeclarationId(3126));
-        map.insert(DeclarationId(2149), DeclarationId(3129));
-        map.insert(DeclarationId(2159), DeclarationId(3132));
-        map.insert(DeclarationId(2160), DeclarationId(3135));
-        map.insert(DeclarationId(2161), DeclarationId(3138));
-        map.insert(DeclarationId(2164), DeclarationId(3141));
-        map.insert(DeclarationId(2165), DeclarationId(3144));
-        map.insert(DeclarationId(2200), DeclarationId(3147));
-        map.insert(DeclarationId(2201), DeclarationId(3150));
-        map.insert(DeclarationId(2202), DeclarationId(3153));
-        map.insert(DeclarationId(2203), DeclarationId(3156));
-        map.insert(DeclarationId(2204), DeclarationId(3159));
-        map.insert(DeclarationId(2205), DeclarationId(3162));
-        map.insert(DeclarationId(2228), DeclarationId(3165));
-        map.insert(DeclarationId(2358), DeclarationId(3168));
-        map.insert(DeclarationId(2359), DeclarationId(3171));
-        map.insert(DeclarationId(2365), DeclarationId(3174));
-        map.insert(DeclarationId(2366), DeclarationId(3177));
-        map.insert(DeclarationId(2367), DeclarationId(3180));
-        map.insert(DeclarationId(2368), DeclarationId(3183));
-        map.insert(DeclarationId(2369), DeclarationId(3186));
-        map.insert(DeclarationId(2370), DeclarationId(3189));
-        map.insert(DeclarationId(2420), DeclarationId(3192));
-        map.insert(DeclarationId(2464), DeclarationId(3195));
-        map.insert(DeclarationId(2472), DeclarationId(3198));
-        map.insert(DeclarationId(2486), DeclarationId(3201));
-        map.insert(DeclarationId(2489), DeclarationId(3204));
-        map.insert(DeclarationId(2547), DeclarationId(3207));
-        map.insert(DeclarationId(2548), DeclarationId(3210));
-        map.insert(DeclarationId(2549), DeclarationId(3213));
-        map.insert(DeclarationId(2552), DeclarationId(3216));
-        map.insert(DeclarationId(2553), DeclarationId(3219));
-        map.insert(DeclarationId(2763), DeclarationId(3222));
-        map.insert(DeclarationId(2792), DeclarationId(3225));
-        map.insert(DeclarationId(2798), DeclarationId(3228));
-        map.insert(DeclarationId(2803), DeclarationId(3231));
-        map.insert(DeclarationId(2806), DeclarationId(3234));
-        map.insert(DeclarationId(2807), DeclarationId(3237));
-        map.insert(DeclarationId(2827), DeclarationId(3240));
-        map.insert(DeclarationId(2828), DeclarationId(3243));
-        map.insert(DeclarationId(2836), DeclarationId(3246));
-        map.insert(DeclarationId(2840), DeclarationId(3249));
-        map.insert(DeclarationId(2842), DeclarationId(3252));
-        map.insert(DeclarationId(2843), DeclarationId(3255));
-        map.insert(DeclarationId(2844), DeclarationId(3258));
-        map.insert(DeclarationId(2845), DeclarationId(3261));
-        map.insert(DeclarationId(2846), DeclarationId(3264));
-        map.insert(DeclarationId(2852), DeclarationId(3267));
-        map.insert(DeclarationId(2854), DeclarationId(3270));
-        map.insert(DeclarationId(2855), DeclarationId(3273));
-        map.insert(DeclarationId(2867), DeclarationId(3276));
-        map.insert(DeclarationId(2868), DeclarationId(3279));
-        map.insert(DeclarationId(2870), DeclarationId(3282));
-        map.insert(DeclarationId(2871), DeclarationId(3285));
-        map.insert(DeclarationId(2872), DeclarationId(3288));
-        map.insert(DeclarationId(2873), DeclarationId(3291));
-        map.insert(DeclarationId(2875), DeclarationId(3294));
-        map.insert(DeclarationId(2876), DeclarationId(3297));
-        map.insert(DeclarationId(2878), DeclarationId(3300));
-        map.insert(DeclarationId(2880), DeclarationId(3303));
-        map.insert(DeclarationId(2881), DeclarationId(3306));
-        map.insert(DeclarationId(2882), DeclarationId(3309));
-        map.insert(DeclarationId(2889), DeclarationId(3312));
-        map.insert(DeclarationId(2890), DeclarationId(3315));
-        map.insert(DeclarationId(2891), DeclarationId(3318));
-        map.insert(DeclarationId(2893), DeclarationId(3321));
-        map.insert(DeclarationId(2894), DeclarationId(3324));
-        map.insert(DeclarationId(2895), DeclarationId(3327));
-        map.insert(DeclarationId(2897), DeclarationId(3330));
-        map.insert(DeclarationId(2898), DeclarationId(3333));
-        map.insert(DeclarationId(2899), DeclarationId(3336));
-        map.insert(DeclarationId(2906), DeclarationId(3339));
-        map.insert(DeclarationId(2908), DeclarationId(3342));
-        map.insert(DeclarationId(2919), DeclarationId(3345));
+        map.insert(DeclarationId(389), DeclarationId(2933));
+        map.insert(DeclarationId(391), DeclarationId(2936));
+        map.insert(DeclarationId(423), DeclarationId(2939));
+        map.insert(DeclarationId(426), DeclarationId(2942));
+        map.insert(DeclarationId(471), DeclarationId(2945));
+        map.insert(DeclarationId(472), DeclarationId(2948));
+        map.insert(DeclarationId(473), DeclarationId(2951));
+        map.insert(DeclarationId(513), DeclarationId(2954));
+        map.insert(DeclarationId(515), DeclarationId(2957));
+        map.insert(DeclarationId(516), DeclarationId(2960));
+        map.insert(DeclarationId(539), DeclarationId(2963));
+        map.insert(DeclarationId(582), DeclarationId(2966));
+        map.insert(DeclarationId(602), DeclarationId(2969));
+        map.insert(DeclarationId(603), DeclarationId(2972));
+        map.insert(DeclarationId(605), DeclarationId(2975));
+        map.insert(DeclarationId(608), DeclarationId(2978));
+        map.insert(DeclarationId(613), DeclarationId(2981));
+        map.insert(DeclarationId(614), DeclarationId(2984));
+        map.insert(DeclarationId(618), DeclarationId(2987));
+        map.insert(DeclarationId(619), DeclarationId(2990));
+        map.insert(DeclarationId(620), DeclarationId(2993));
+        map.insert(DeclarationId(625), DeclarationId(2996));
+        map.insert(DeclarationId(1821), DeclarationId(2999));
+        map.insert(DeclarationId(1825), DeclarationId(3002));
+        map.insert(DeclarationId(1828), DeclarationId(3005));
+        map.insert(DeclarationId(1830), DeclarationId(3008));
+        map.insert(DeclarationId(1831), DeclarationId(3011));
+        map.insert(DeclarationId(1832), DeclarationId(3014));
+        map.insert(DeclarationId(1886), DeclarationId(3017));
+        map.insert(DeclarationId(1887), DeclarationId(3020));
+        map.insert(DeclarationId(1888), DeclarationId(3023));
+        map.insert(DeclarationId(1889), DeclarationId(3026));
+        map.insert(DeclarationId(1890), DeclarationId(3029));
+        map.insert(DeclarationId(1891), DeclarationId(3032));
+        map.insert(DeclarationId(1897), DeclarationId(3035));
+        map.insert(DeclarationId(1952), DeclarationId(3038));
+        map.insert(DeclarationId(1955), DeclarationId(3041));
+        map.insert(DeclarationId(1956), DeclarationId(3044));
+        map.insert(DeclarationId(1957), DeclarationId(3047));
+        map.insert(DeclarationId(1958), DeclarationId(3050));
+        map.insert(DeclarationId(1981), DeclarationId(3053));
+        map.insert(DeclarationId(1986), DeclarationId(3056));
+        map.insert(DeclarationId(1990), DeclarationId(3059));
+        map.insert(DeclarationId(1993), DeclarationId(3062));
+        map.insert(DeclarationId(1994), DeclarationId(3065));
+        map.insert(DeclarationId(2039), DeclarationId(3068));
+        map.insert(DeclarationId(2040), DeclarationId(3071));
+        map.insert(DeclarationId(2041), DeclarationId(3074));
+        map.insert(DeclarationId(2042), DeclarationId(3077));
+        map.insert(DeclarationId(2092), DeclarationId(3080));
+        map.insert(DeclarationId(2093), DeclarationId(3083));
+        map.insert(DeclarationId(2112), DeclarationId(3086));
+        map.insert(DeclarationId(2113), DeclarationId(3089));
+        map.insert(DeclarationId(2117), DeclarationId(3092));
+        map.insert(DeclarationId(2118), DeclarationId(3095));
+        map.insert(DeclarationId(2129), DeclarationId(3098));
+        map.insert(DeclarationId(2130), DeclarationId(3101));
+        map.insert(DeclarationId(2132), DeclarationId(3104));
+        map.insert(DeclarationId(2133), DeclarationId(3107));
+        map.insert(DeclarationId(2135), DeclarationId(3110));
+        map.insert(DeclarationId(2136), DeclarationId(3113));
+        map.insert(DeclarationId(2138), DeclarationId(3116));
+        map.insert(DeclarationId(2140), DeclarationId(3119));
+        map.insert(DeclarationId(2143), DeclarationId(3122));
+        map.insert(DeclarationId(2147), DeclarationId(3125));
+        map.insert(DeclarationId(2149), DeclarationId(3128));
+        map.insert(DeclarationId(2151), DeclarationId(3131));
+        map.insert(DeclarationId(2161), DeclarationId(3134));
+        map.insert(DeclarationId(2162), DeclarationId(3137));
+        map.insert(DeclarationId(2163), DeclarationId(3140));
+        map.insert(DeclarationId(2166), DeclarationId(3143));
+        map.insert(DeclarationId(2167), DeclarationId(3146));
+        map.insert(DeclarationId(2202), DeclarationId(3149));
+        map.insert(DeclarationId(2203), DeclarationId(3152));
+        map.insert(DeclarationId(2204), DeclarationId(3155));
+        map.insert(DeclarationId(2205), DeclarationId(3158));
+        map.insert(DeclarationId(2206), DeclarationId(3161));
+        map.insert(DeclarationId(2207), DeclarationId(3164));
+        map.insert(DeclarationId(2230), DeclarationId(3167));
+        map.insert(DeclarationId(2360), DeclarationId(3170));
+        map.insert(DeclarationId(2361), DeclarationId(3173));
+        map.insert(DeclarationId(2367), DeclarationId(3176));
+        map.insert(DeclarationId(2368), DeclarationId(3179));
+        map.insert(DeclarationId(2369), DeclarationId(3182));
+        map.insert(DeclarationId(2370), DeclarationId(3185));
+        map.insert(DeclarationId(2371), DeclarationId(3188));
+        map.insert(DeclarationId(2372), DeclarationId(3191));
+        map.insert(DeclarationId(2422), DeclarationId(3194));
+        map.insert(DeclarationId(2466), DeclarationId(3197));
+        map.insert(DeclarationId(2474), DeclarationId(3200));
+        map.insert(DeclarationId(2488), DeclarationId(3203));
+        map.insert(DeclarationId(2491), DeclarationId(3206));
+        map.insert(DeclarationId(2549), DeclarationId(3209));
+        map.insert(DeclarationId(2550), DeclarationId(3212));
+        map.insert(DeclarationId(2551), DeclarationId(3215));
+        map.insert(DeclarationId(2554), DeclarationId(3218));
+        map.insert(DeclarationId(2555), DeclarationId(3221));
+        map.insert(DeclarationId(2765), DeclarationId(3224));
+        map.insert(DeclarationId(2794), DeclarationId(3227));
+        map.insert(DeclarationId(2800), DeclarationId(3230));
+        map.insert(DeclarationId(2805), DeclarationId(3233));
+        map.insert(DeclarationId(2808), DeclarationId(3236));
+        map.insert(DeclarationId(2809), DeclarationId(3239));
+        map.insert(DeclarationId(2829), DeclarationId(3242));
+        map.insert(DeclarationId(2830), DeclarationId(3245));
+        map.insert(DeclarationId(2838), DeclarationId(3248));
+        map.insert(DeclarationId(2842), DeclarationId(3251));
+        map.insert(DeclarationId(2844), DeclarationId(3254));
+        map.insert(DeclarationId(2845), DeclarationId(3257));
+        map.insert(DeclarationId(2846), DeclarationId(3260));
+        map.insert(DeclarationId(2847), DeclarationId(3263));
+        map.insert(DeclarationId(2848), DeclarationId(3266));
+        map.insert(DeclarationId(2854), DeclarationId(3269));
+        map.insert(DeclarationId(2856), DeclarationId(3272));
+        map.insert(DeclarationId(2857), DeclarationId(3275));
+        map.insert(DeclarationId(2869), DeclarationId(3278));
+        map.insert(DeclarationId(2870), DeclarationId(3281));
+        map.insert(DeclarationId(2872), DeclarationId(3284));
+        map.insert(DeclarationId(2873), DeclarationId(3287));
+        map.insert(DeclarationId(2874), DeclarationId(3290));
+        map.insert(DeclarationId(2875), DeclarationId(3293));
+        map.insert(DeclarationId(2877), DeclarationId(3296));
+        map.insert(DeclarationId(2878), DeclarationId(3299));
+        map.insert(DeclarationId(2880), DeclarationId(3302));
+        map.insert(DeclarationId(2882), DeclarationId(3305));
+        map.insert(DeclarationId(2883), DeclarationId(3308));
+        map.insert(DeclarationId(2884), DeclarationId(3311));
+        map.insert(DeclarationId(2891), DeclarationId(3314));
+        map.insert(DeclarationId(2892), DeclarationId(3317));
+        map.insert(DeclarationId(2893), DeclarationId(3320));
+        map.insert(DeclarationId(2895), DeclarationId(3323));
+        map.insert(DeclarationId(2896), DeclarationId(3326));
+        map.insert(DeclarationId(2897), DeclarationId(3329));
+        map.insert(DeclarationId(2899), DeclarationId(3332));
+        map.insert(DeclarationId(2900), DeclarationId(3335));
+        map.insert(DeclarationId(2901), DeclarationId(3338));
+        map.insert(DeclarationId(2908), DeclarationId(3341));
+        map.insert(DeclarationId(2910), DeclarationId(3344));
+        map.insert(DeclarationId(2921), DeclarationId(3347));
         map
     }
 }
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 183adeec470..af9dfbb465c 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: 854,
-        next_declaration_id: 2875,
+        next_declaration_id: 2877,
         next_port_id: 1021,
         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: 2875,
+        declaration_append_begin_after_bootstrap: 2877,
     }
 }
 
@@ -1402,21 +1402,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(182),
-            target: TransformTarget::Callable(DeclarationId(1678)),
+            target: TransformTarget::Callable(DeclarationId(1680)),
             inputs: vec![PortId(185)],
             output: PortId(187),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11495, 11507),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(183),
-            target: TransformTarget::Callable(DeclarationId(1680)),
+            target: TransformTarget::Callable(DeclarationId(1682)),
             inputs: vec![PortId(187)],
             output: PortId(188),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11488, 11535),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(184),
-            target: TransformTarget::Callable(DeclarationId(1624)),
+            target: TransformTarget::Callable(DeclarationId(1626)),
             inputs: vec![PortId(185), PortId(186), PortId(188)],
             output: PortId(189),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11149, 11539),
@@ -1432,7 +1432,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(186),
-            target: TransformTarget::Callable(DeclarationId(1626)),
+            target: TransformTarget::Callable(DeclarationId(1628)),
             inputs: vec![PortId(190), PortId(191), PortId(192)],
             output: PortId(193),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11670, 11726),
@@ -1448,7 +1448,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(188),
-            target: TransformTarget::Callable(DeclarationId(1681)),
+            target: TransformTarget::Callable(DeclarationId(1683)),
             inputs: vec![PortId(194)],
             output: PortId(195),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11795, 11810),
@@ -1600,7 +1600,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(202),
-            target: TransformTarget::Callable(DeclarationId(1665)),
+            target: TransformTarget::Callable(DeclarationId(1667)),
             inputs: vec![PortId(211)],
             output: PortId(212),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12325, 12349),
@@ -1630,7 +1630,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(206),
-            target: TransformTarget::Callable(DeclarationId(1663)),
+            target: TransformTarget::Callable(DeclarationId(1665)),
             inputs: vec![PortId(216)],
             output: PortId(217),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12618, 12653),
@@ -1760,14 +1760,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(218),
-            target: TransformTarget::Callable(DeclarationId(1659)),
+            target: TransformTarget::Callable(DeclarationId(1661)),
             inputs: vec![PortId(230)],
             output: PortId(231),
             span: SourceSpan::new("src/v3/std/algebra.dag", 14214, 14229),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(219),
-            target: TransformTarget::Callable(DeclarationId(1683)),
+            target: TransformTarget::Callable(DeclarationId(1685)),
             inputs: vec![PortId(229), PortId(231)],
             output: PortId(232),
             span: SourceSpan::new("src/v3/std/algebra.dag", 14202, 14245),
@@ -2472,7 +2472,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(266),
-            target: TransformTarget::Callable(DeclarationId(1685)),
+            target: TransformTarget::Callable(DeclarationId(1687)),
             inputs: vec![PortId(312), PortId(313)],
             output: PortId(314),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16911, 17021),
@@ -2500,7 +2500,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(270),
-            target: TransformTarget::Callable(DeclarationId(1687)),
+            target: TransformTarget::Callable(DeclarationId(1689)),
             inputs: vec![PortId(317), PortId(318)],
             output: PortId(319),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17076, 17186),
@@ -3993,14 +3993,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(364),
-            target: TransformTarget::Callable(DeclarationId(1688)),
+            target: TransformTarget::Callable(DeclarationId(1690)),
             inputs: vec![PortId(425), PortId(426)],
             output: PortId(427),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22293, 22323),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(365),
-            target: TransformTarget::Callable(DeclarationId(1689)),
+            target: TransformTarget::Callable(DeclarationId(1691)),
             inputs: vec![PortId(424), PortId(427)],
             output: PortId(428),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22275, 22324),
@@ -4016,7 +4016,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(367),
-            target: TransformTarget::Callable(DeclarationId(1690)),
+            target: TransformTarget::Callable(DeclarationId(1692)),
             inputs: vec![],
             output: PortId(430),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22603, 22610),
@@ -4080,7 +4080,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(375),
-            target: TransformTarget::Callable(DeclarationId(1691)),
+            target: TransformTarget::Callable(DeclarationId(1693)),
             inputs: vec![PortId(436), PortId(438)],
             output: PortId(439),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22737, 22789),
@@ -4176,21 +4176,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(382),
-            target: TransformTarget::Callable(DeclarationId(1659)),
+            target: TransformTarget::Callable(DeclarationId(1661)),
             inputs: vec![PortId(445)],
             output: PortId(446),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23123, 23138),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(383),
-            target: TransformTarget::Callable(DeclarationId(1692)),
+            target: TransformTarget::Callable(DeclarationId(1694)),
             inputs: vec![],
             output: PortId(447),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23140, 23147),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(384),
-            target: TransformTarget::Callable(DeclarationId(1693)),
+            target: TransformTarget::Callable(DeclarationId(1695)),
             inputs: vec![PortId(446), PortId(447)],
             output: PortId(448),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23118, 23148),
@@ -4327,7 +4327,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(396),
-            target: TransformTarget::Callable(DeclarationId(1694)),
+            target: TransformTarget::Callable(DeclarationId(1696)),
             inputs: vec![],
             output: PortId(461),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23597, 23604),
@@ -4391,7 +4391,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(404),
-            target: TransformTarget::Callable(DeclarationId(1695)),
+            target: TransformTarget::Callable(DeclarationId(1697)),
             inputs: vec![PortId(467), PortId(469)],
             output: PortId(470),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23735, 23792),
@@ -4796,7 +4796,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(430),
-            target: TransformTarget::Callable(DeclarationId(1659)),
+            target: TransformTarget::Callable(DeclarationId(1661)),
             inputs: vec![PortId(509)],
             output: PortId(510),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25180, 25195),
@@ -4839,7 +4839,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(435),
-            target: TransformTarget::Callable(DeclarationId(1696)),
+            target: TransformTarget::Callable(DeclarationId(1698)),
             inputs: vec![PortId(515), PortId(516)],
             output: PortId(517),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25317, 25349),
@@ -4936,7 +4936,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(442),
-            target: TransformTarget::Callable(DeclarationId(1659)),
+            target: TransformTarget::Callable(DeclarationId(1661)),
             inputs: vec![PortId(523)],
             output: PortId(524),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25451, 25466),
@@ -4995,7 +4995,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(449),
-            target: TransformTarget::Callable(DeclarationId(1665)),
+            target: TransformTarget::Callable(DeclarationId(1667)),
             inputs: vec![PortId(532)],
             output: PortId(533),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25569, 25628),
@@ -5078,7 +5078,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(454),
-            target: TransformTarget::Callable(DeclarationId(1659)),
+            target: TransformTarget::Callable(DeclarationId(1661)),
             inputs: vec![PortId(537)],
             output: PortId(538),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25917, 25932),
@@ -5171,7 +5171,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(465),
-            target: TransformTarget::Callable(DeclarationId(1663)),
+            target: TransformTarget::Callable(DeclarationId(1665)),
             inputs: vec![PortId(551)],
             output: PortId(552),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26159, 26222),
@@ -5643,7 +5643,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(494),
-            target: TransformTarget::Callable(DeclarationId(1663)),
+            target: TransformTarget::Callable(DeclarationId(1665)),
             inputs: vec![PortId(601)],
             output: PortId(602),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27605, 27633),
@@ -5734,7 +5734,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(505),
-            target: TransformTarget::Callable(DeclarationId(1697)),
+            target: TransformTarget::Callable(DeclarationId(1699)),
             inputs: vec![],
             output: PortId(615),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27988, 27995),
@@ -5798,7 +5798,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(513),
-            target: TransformTarget::Callable(DeclarationId(1698)),
+            target: TransformTarget::Callable(DeclarationId(1700)),
             inputs: vec![PortId(621), PortId(623)],
             output: PortId(624),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28136, 28201),
@@ -5887,7 +5887,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(519),
-            target: TransformTarget::Callable(DeclarationId(1700)),
+            target: TransformTarget::Callable(DeclarationId(1702)),
             inputs: vec![PortId(628), PortId(630)],
             output: PortId(631),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28319, 28377),
@@ -5908,7 +5908,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(522),
-            target: TransformTarget::Callable(DeclarationId(1701)),
+            target: TransformTarget::Callable(DeclarationId(1703)),
             inputs: vec![PortId(629), PortId(633)],
             output: PortId(634),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28403, 28449),
@@ -5951,14 +5951,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(525),
-            target: TransformTarget::Callable(DeclarationId(1702)),
+            target: TransformTarget::Callable(DeclarationId(1704)),
             inputs: vec![],
             output: PortId(637),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28720, 28727),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(526),
-            target: TransformTarget::Callable(DeclarationId(1704)),
+            target: TransformTarget::Callable(DeclarationId(1706)),
             inputs: vec![PortId(636), PortId(637)],
             output: PortId(638),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28708, 28749),
@@ -5981,7 +5981,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(529),
-            target: TransformTarget::Callable(DeclarationId(1659)),
+            target: TransformTarget::Callable(DeclarationId(1661)),
             inputs: vec![PortId(640)],
             output: PortId(641),
             span: SourceSpan::new("src/v3/std/induction.dag", 29099, 29114),
@@ -6054,7 +6054,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(538),
-            target: TransformTarget::Callable(DeclarationId(1667)),
+            target: TransformTarget::Callable(DeclarationId(1669)),
             inputs: vec![PortId(653)],
             output: PortId(654),
             span: SourceSpan::new("src/v3/std/induction.dag", 29338, 29412),
@@ -6068,7 +6068,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(540),
-            target: TransformTarget::Callable(DeclarationId(1667)),
+            target: TransformTarget::Callable(DeclarationId(1669)),
             inputs: vec![PortId(655)],
             output: PortId(656),
             span: SourceSpan::new("src/v3/std/induction.dag", 29433, 29461),
@@ -6082,7 +6082,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(542),
-            target: TransformTarget::Callable(DeclarationId(1667)),
+            target: TransformTarget::Callable(DeclarationId(1669)),
             inputs: vec![PortId(657)],
             output: PortId(658),
             span: SourceSpan::new("src/v3/std/induction.dag", 29480, 29513),
@@ -6209,7 +6209,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(548),
-            target: TransformTarget::Callable(DeclarationId(1667)),
+            target: TransformTarget::Callable(DeclarationId(1669)),
             inputs: vec![PortId(664)],
             output: PortId(665),
             span: SourceSpan::new("src/v3/std/induction.dag", 29645, 29726),
@@ -6234,7 +6234,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(551),
-            target: TransformTarget::Callable(DeclarationId(1667)),
+            target: TransformTarget::Callable(DeclarationId(1669)),
             inputs: vec![PortId(668)],
             output: PortId(669),
             span: SourceSpan::new("src/v3/std/induction.dag", 29761, 29835),
@@ -6320,7 +6320,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(559),
-            target: TransformTarget::Callable(DeclarationId(2070)),
+            target: TransformTarget::Callable(DeclarationId(2072)),
             inputs: vec![PortId(678)],
             output: PortId(679),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3203, 3241),
@@ -6343,7 +6343,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(562),
-            target: TransformTarget::Callable(DeclarationId(2071)),
+            target: TransformTarget::Callable(DeclarationId(2073)),
             inputs: vec![PortId(682)],
             output: PortId(683),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3281, 3319),
@@ -6409,7 +6409,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(567),
-            target: TransformTarget::Callable(DeclarationId(2072)),
+            target: TransformTarget::Callable(DeclarationId(2074)),
             inputs: vec![PortId(688)],
             output: PortId(689),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3440, 3478),
@@ -6432,7 +6432,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(570),
-            target: TransformTarget::Callable(DeclarationId(2073)),
+            target: TransformTarget::Callable(DeclarationId(2075)),
             inputs: vec![PortId(692)],
             output: PortId(693),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3518, 3556),
@@ -6498,7 +6498,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(575),
-            target: TransformTarget::Callable(DeclarationId(2074)),
+            target: TransformTarget::Callable(DeclarationId(2076)),
             inputs: vec![PortId(698)],
             output: PortId(699),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3674, 3712),
@@ -6521,7 +6521,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(578),
-            target: TransformTarget::Callable(DeclarationId(2075)),
+            target: TransformTarget::Callable(DeclarationId(2077)),
             inputs: vec![PortId(702)],
             output: PortId(703),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3752, 3790),
@@ -6587,7 +6587,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(583),
-            target: TransformTarget::Callable(DeclarationId(2076)),
+            target: TransformTarget::Callable(DeclarationId(2078)),
             inputs: vec![PortId(708)],
             output: PortId(709),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3906, 3944),
@@ -6610,7 +6610,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(586),
-            target: TransformTarget::Callable(DeclarationId(2077)),
+            target: TransformTarget::Callable(DeclarationId(2079)),
             inputs: vec![PortId(712)],
             output: PortId(713),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3984, 4022),
@@ -6676,7 +6676,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(591),
-            target: TransformTarget::Callable(DeclarationId(2078)),
+            target: TransformTarget::Callable(DeclarationId(2080)),
             inputs: vec![PortId(718)],
             output: PortId(719),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4138, 4176),
@@ -6699,7 +6699,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(594),
-            target: TransformTarget::Callable(DeclarationId(2079)),
+            target: TransformTarget::Callable(DeclarationId(2081)),
             inputs: vec![PortId(722)],
             output: PortId(723),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4216, 4254),
@@ -6858,7 +6858,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(600),
-            target: TransformTarget::Callable(DeclarationId(2080)),
+            target: TransformTarget::Callable(DeclarationId(2082)),
             inputs: vec![],
             output: PortId(729),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4940, 4945),
@@ -6874,7 +6874,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(602),
-            target: TransformTarget::Callable(DeclarationId(2081)),
+            target: TransformTarget::Callable(DeclarationId(2083)),
             inputs: vec![],
             output: PortId(730),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5005, 5010),
@@ -6890,7 +6890,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(604),
-            target: TransformTarget::Callable(DeclarationId(2082)),
+            target: TransformTarget::Callable(DeclarationId(2084)),
             inputs: vec![],
             output: PortId(731),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5068, 5073),
@@ -6906,7 +6906,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(606),
-            target: TransformTarget::Callable(DeclarationId(2083)),
+            target: TransformTarget::Callable(DeclarationId(2085)),
             inputs: vec![],
             output: PortId(732),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5131, 5136),
@@ -6922,7 +6922,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(608),
-            target: TransformTarget::Callable(DeclarationId(2084)),
+            target: TransformTarget::Callable(DeclarationId(2086)),
             inputs: vec![],
             output: PortId(733),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5195, 5200),
@@ -6938,7 +6938,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(610),
-            target: TransformTarget::Callable(DeclarationId(2085)),
+            target: TransformTarget::Callable(DeclarationId(2087)),
             inputs: vec![],
             output: PortId(734),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5275, 5280),
@@ -6954,7 +6954,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(612),
-            target: TransformTarget::Callable(DeclarationId(2087)),
+            target: TransformTarget::Callable(DeclarationId(2089)),
             inputs: vec![PortId(735)],
             output: PortId(736),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5391, 5402),
@@ -6968,7 +6968,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(614),
-            target: TransformTarget::Callable(DeclarationId(2086)),
+            target: TransformTarget::Callable(DeclarationId(2088)),
             inputs: vec![PortId(736), PortId(737)],
             output: PortId(738),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5378, 5443),
@@ -6991,7 +6991,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(617),
-            target: TransformTarget::Callable(DeclarationId(2088)),
+            target: TransformTarget::Callable(DeclarationId(2090)),
             inputs: vec![PortId(739), PortId(740)],
             output: PortId(741),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5519, 5577),
@@ -7021,7 +7021,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(621),
-            target: TransformTarget::Callable(DeclarationId(2089)),
+            target: TransformTarget::Callable(DeclarationId(2091)),
             inputs: vec![PortId(743), PortId(742), PortId(744)],
             output: PortId(745),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5678, 5803),
@@ -7058,7 +7058,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(626),
-            target: TransformTarget::Callable(DeclarationId(2090)),
+            target: TransformTarget::Callable(DeclarationId(2092)),
             inputs: vec![PortId(748), PortId(749), PortId(750)],
             output: PortId(751),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5924, 6086),
@@ -7074,7 +7074,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(628),
-            target: TransformTarget::Callable(DeclarationId(1289)),
+            target: TransformTarget::Callable(DeclarationId(1291)),
             inputs: vec![PortId(752)],
             output: PortId(754),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6449, 6466),
@@ -7160,7 +7160,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(635),
-            target: TransformTarget::Callable(DeclarationId(1289)),
+            target: TransformTarget::Callable(DeclarationId(1291)),
             inputs: vec![PortId(761)],
             output: PortId(764),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6710, 6727),
@@ -7426,7 +7426,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(657),
-            target: TransformTarget::Callable(DeclarationId(1289)),
+            target: TransformTarget::Callable(DeclarationId(1291)),
             inputs: vec![PortId(792)],
             output: PortId(794),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8520, 8537),
@@ -7528,7 +7528,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(667),
-            target: TransformTarget::Callable(DeclarationId(2129)),
+            target: TransformTarget::Callable(DeclarationId(2131)),
             inputs: vec![],
             output: PortId(802),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6612, 6622),
@@ -7544,28 +7544,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(669),
-            target: TransformTarget::Callable(DeclarationId(2129)),
+            target: TransformTarget::Callable(DeclarationId(2131)),
             inputs: vec![],
             output: PortId(806),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6930, 6940),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(670),
-            target: TransformTarget::Callable(DeclarationId(2129)),
+            target: TransformTarget::Callable(DeclarationId(2131)),
             inputs: vec![],
             output: PortId(807),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 6992, 7002),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(671),
-            target: TransformTarget::Callable(DeclarationId(2131)),
+            target: TransformTarget::Callable(DeclarationId(2133)),
             inputs: vec![],
             output: PortId(808),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7020, 7025),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(672),
-            target: TransformTarget::Callable(DeclarationId(2131)),
+            target: TransformTarget::Callable(DeclarationId(2133)),
             inputs: vec![],
             output: PortId(809),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7047, 7052),
@@ -7581,7 +7581,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(674),
-            target: TransformTarget::Callable(DeclarationId(2131)),
+            target: TransformTarget::Callable(DeclarationId(2133)),
             inputs: vec![],
             output: PortId(812),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7089, 7094),
@@ -7636,21 +7636,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(676),
-            target: TransformTarget::Callable(DeclarationId(2129)),
+            target: TransformTarget::Callable(DeclarationId(2131)),
             inputs: vec![],
             output: PortId(814),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7158, 7168),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(677),
-            target: TransformTarget::Callable(DeclarationId(2131)),
+            target: TransformTarget::Callable(DeclarationId(2133)),
             inputs: vec![],
             output: PortId(815),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7186, 7191),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(678),
-            target: TransformTarget::Callable(DeclarationId(2130)),
+            target: TransformTarget::Callable(DeclarationId(2132)),
             inputs: vec![],
             output: PortId(816),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7213, 7222),
@@ -7666,7 +7666,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(680),
-            target: TransformTarget::Callable(DeclarationId(2130)),
+            target: TransformTarget::Callable(DeclarationId(2132)),
             inputs: vec![],
             output: PortId(819),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7259, 7268),
@@ -7730,21 +7730,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(683),
-            target: TransformTarget::Callable(DeclarationId(2129)),
+            target: TransformTarget::Callable(DeclarationId(2131)),
             inputs: vec![],
             output: PortId(823),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7348, 7358),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(684),
-            target: TransformTarget::Callable(DeclarationId(2131)),
+            target: TransformTarget::Callable(DeclarationId(2133)),
             inputs: vec![],
             output: PortId(824),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7376, 7381),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(685),
-            target: TransformTarget::Callable(DeclarationId(2130)),
+            target: TransformTarget::Callable(DeclarationId(2132)),
             inputs: vec![],
             output: PortId(825),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7403, 7412),
@@ -7792,7 +7792,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(691),
-            target: TransformTarget::Callable(DeclarationId(2128)),
+            target: TransformTarget::Callable(DeclarationId(2130)),
             inputs: vec![PortId(831)],
             output: PortId(832),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7491, 7544),
@@ -7851,7 +7851,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(696),
-            target: TransformTarget::Callable(DeclarationId(2128)),
+            target: TransformTarget::Callable(DeclarationId(2130)),
             inputs: vec![PortId(836)],
             output: PortId(837),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7572, 7660),
@@ -8043,7 +8043,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(708),
-            target: TransformTarget::Callable(DeclarationId(2128)),
+            target: TransformTarget::Callable(DeclarationId(2130)),
             inputs: vec![PortId(847)],
             output: PortId(848),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7997, 8038),
@@ -8082,7 +8082,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(713),
-            target: TransformTarget::Callable(DeclarationId(2133)),
+            target: TransformTarget::Callable(DeclarationId(2135)),
             inputs: vec![],
             output: PortId(853),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8292, 8297),
@@ -8221,14 +8221,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(722),
-            target: TransformTarget::Callable(DeclarationId(1887)),
+            target: TransformTarget::Callable(DeclarationId(1889)),
             inputs: vec![],
             output: PortId(868),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9047, 9059),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(723),
-            target: TransformTarget::Callable(DeclarationId(1893)),
+            target: TransformTarget::Callable(DeclarationId(1895)),
             inputs: vec![PortId(868)],
             output: PortId(869),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9034, 9060),
@@ -8295,7 +8295,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(732),
-            target: TransformTarget::Callable(DeclarationId(1289)),
+            target: TransformTarget::Callable(DeclarationId(1291)),
             inputs: vec![PortId(876)],
             output: PortId(878),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10059, 10076),
@@ -8336,7 +8336,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(737),
-            target: TransformTarget::Callable(DeclarationId(1921)),
+            target: TransformTarget::Callable(DeclarationId(1923)),
             inputs: vec![PortId(883)],
             output: PortId(884),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10151, 10263),
@@ -8357,7 +8357,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(740),
-            target: TransformTarget::Callable(DeclarationId(1921)),
+            target: TransformTarget::Callable(DeclarationId(1923)),
             inputs: vec![PortId(886)],
             output: PortId(887),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10291, 10472),
@@ -8417,7 +8417,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(745),
-            target: TransformTarget::Callable(DeclarationId(1921)),
+            target: TransformTarget::Callable(DeclarationId(1923)),
             inputs: vec![PortId(892)],
             output: PortId(893),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10508, 10669),
@@ -8519,21 +8519,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(752),
-            target: TransformTarget::Callable(DeclarationId(2129)),
+            target: TransformTarget::Callable(DeclarationId(2131)),
             inputs: vec![],
             output: PortId(904),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11299, 11309),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(753),
-            target: TransformTarget::Callable(DeclarationId(2130)),
+            target: TransformTarget::Callable(DeclarationId(2132)),
             inputs: vec![],
             output: PortId(905),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11327, 11336),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(754),
-            target: TransformTarget::Callable(DeclarationId(2131)),
+            target: TransformTarget::Callable(DeclarationId(2133)),
             inputs: vec![],
             output: PortId(906),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11350, 11355),
@@ -8597,7 +8597,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(757),
-            target: TransformTarget::Callable(DeclarationId(1289)),
+            target: TransformTarget::Callable(DeclarationId(1291)),
             inputs: vec![PortId(908)],
             output: PortId(911),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12255, 12272),
@@ -8618,7 +8618,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(760),
-            target: TransformTarget::Callable(DeclarationId(2134)),
+            target: TransformTarget::Callable(DeclarationId(2136)),
             inputs: vec![PortId(913)],
             output: PortId(914),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12279, 12320),
@@ -8632,7 +8632,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(762),
-            target: TransformTarget::Callable(DeclarationId(2135)),
+            target: TransformTarget::Callable(DeclarationId(2137)),
             inputs: vec![PortId(915)],
             output: PortId(916),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12326, 12367),
@@ -8666,7 +8666,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(764),
-            target: TransformTarget::Callable(DeclarationId(1289)),
+            target: TransformTarget::Callable(DeclarationId(1291)),
             inputs: vec![PortId(908)],
             output: PortId(919),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12406, 12423),
@@ -8687,7 +8687,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(767),
-            target: TransformTarget::Callable(DeclarationId(2136)),
+            target: TransformTarget::Callable(DeclarationId(2138)),
             inputs: vec![PortId(921)],
             output: PortId(922),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12430, 12471),
@@ -8701,7 +8701,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(769),
-            target: TransformTarget::Callable(DeclarationId(2137)),
+            target: TransformTarget::Callable(DeclarationId(2139)),
             inputs: vec![PortId(923)],
             output: PortId(924),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12477, 12518),
@@ -8735,7 +8735,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(771),
-            target: TransformTarget::Callable(DeclarationId(1289)),
+            target: TransformTarget::Callable(DeclarationId(1291)),
             inputs: vec![PortId(908)],
             output: PortId(927),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12554, 12571),
@@ -8756,7 +8756,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(774),
-            target: TransformTarget::Callable(DeclarationId(2138)),
+            target: TransformTarget::Callable(DeclarationId(2140)),
             inputs: vec![PortId(929)],
             output: PortId(930),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12578, 12619),
@@ -8770,7 +8770,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(776),
-            target: TransformTarget::Callable(DeclarationId(2139)),
+            target: TransformTarget::Callable(DeclarationId(2141)),
             inputs: vec![PortId(931)],
             output: PortId(932),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12625, 12666),
@@ -8804,7 +8804,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(778),
-            target: TransformTarget::Callable(DeclarationId(1289)),
+            target: TransformTarget::Callable(DeclarationId(1291)),
             inputs: vec![PortId(908)],
             output: PortId(935),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12700, 12717),
@@ -8825,7 +8825,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(781),
-            target: TransformTarget::Callable(DeclarationId(2140)),
+            target: TransformTarget::Callable(DeclarationId(2142)),
             inputs: vec![PortId(937)],
             output: PortId(938),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12724, 12765),
@@ -8839,7 +8839,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(783),
-            target: TransformTarget::Callable(DeclarationId(2141)),
+            target: TransformTarget::Callable(DeclarationId(2143)),
             inputs: vec![PortId(939)],
             output: PortId(940),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12771, 12812),
@@ -8873,7 +8873,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(785),
-            target: TransformTarget::Callable(DeclarationId(1289)),
+            target: TransformTarget::Callable(DeclarationId(1291)),
             inputs: vec![PortId(908)],
             output: PortId(943),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12846, 12863),
@@ -8894,7 +8894,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(788),
-            target: TransformTarget::Callable(DeclarationId(2142)),
+            target: TransformTarget::Callable(DeclarationId(2144)),
             inputs: vec![PortId(945)],
             output: PortId(946),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12870, 12911),
@@ -8908,7 +8908,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(790),
-            target: TransformTarget::Callable(DeclarationId(2143)),
+            target: TransformTarget::Callable(DeclarationId(2145)),
             inputs: vec![PortId(947)],
             output: PortId(948),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12917, 12958),
@@ -9029,7 +9029,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(795),
-            target: TransformTarget::Callable(DeclarationId(1289)),
+            target: TransformTarget::Callable(DeclarationId(1291)),
             inputs: vec![PortId(951)],
             output: PortId(955),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13118, 13135),
@@ -9043,14 +9043,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(797),
-            target: TransformTarget::Callable(DeclarationId(1920)),
+            target: TransformTarget::Callable(DeclarationId(1922)),
             inputs: vec![],
             output: PortId(957),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13142, 13154),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(798),
-            target: TransformTarget::Callable(DeclarationId(1920)),
+            target: TransformTarget::Callable(DeclarationId(1922)),
             inputs: vec![],
             output: PortId(958),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13160, 13172),
@@ -9165,17 +9165,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(808),
-            target: TransformTarget::Callable(DeclarationId(1285)),
+            target: TransformTarget::Callable(DeclarationId(1287)),
             inputs: vec![PortId(968)],
             output: PortId(969),
-            span: SourceSpan::new("src/v3/std/verification.dag", 28338, 28361),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28552, 28575),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(809),
-            target: TransformTarget::Callable(DeclarationId(1286)),
+            target: TransformTarget::Callable(DeclarationId(1288)),
             inputs: vec![PortId(970)],
             output: PortId(971),
-            span: SourceSpan::new("src/v3/std/verification.dag", 28383, 28417),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28597, 28631),
         }));
         nodes.push(Behavior::Branch(BranchNode {
             id: NodeId(810),
@@ -9186,7 +9186,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     output: PortId(969),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Enumerated".to_string(),
-                        span: SourceSpan::new("src/v3/std/verification.dag", 28321, 28334),
+                        span: SourceSpan::new("src/v3/std/verification.dag", 28535, 28548),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "c".to_string(),
@@ -9198,7 +9198,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     output: PortId(971),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Quantified".to_string(),
-                        span: SourceSpan::new("src/v3/std/verification.dag", 28366, 28379),
+                        span: SourceSpan::new("src/v3/std/verification.dag", 28580, 28593),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "q".to_string(),
@@ -9207,7 +9207,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                 },
             ],
             output: PortId(972),
-            span: SourceSpan::new("src/v3/std/verification.dag", 28303, 28421),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28517, 28635),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Bind(BindNode {
@@ -9215,7 +9215,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
             name: "obligation_for_suite_claim".to_string(),
             value: PortId(972),
             params: vec![PortId(967)],
-            span: SourceSpan::new("src/v3/std/verification.dag", 28303, 28421),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28517, 28635),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
@@ -9834,7 +9834,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(2875);
+        let mut declarations = Vec::with_capacity(2877);
         declarations.push(Declaration {
             id: DeclarationId(0),
             name: Some("Classical".to_string()),
@@ -24042,11 +24042,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Empty".to_string(),
-                        ty: DeclarationId(1430),
+                        ty: DeclarationId(1432),
                     },
                     Field {
                         label: "Cons".to_string(),
-                        ty: DeclarationId(1432),
+                        ty: DeclarationId(1434),
                     },
                 ],
             },
@@ -24079,7 +24079,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1400),
+                output: DeclarationId(1402),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3273, 3284)),
             },
             type_params: vec![DeclarationId(688)],
@@ -24110,8 +24110,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(689),
             name: Some("cons".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(690), DeclarationId(1401)],
-                output: DeclarationId(1402),
+                inputs: vec![DeclarationId(690), DeclarationId(1403)],
+                output: DeclarationId(1404),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3453, 3475)),
             },
             type_params: vec![DeclarationId(690)],
@@ -24143,7 +24143,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("singleton".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(692)],
-                output: DeclarationId(1403),
+                output: DeclarationId(1405),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3570, 3590)),
             },
             type_params: vec![DeclarationId(692)],
@@ -24174,7 +24174,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(693),
             name: Some("fold".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1404), DeclarationId(695), DeclarationId(1405)],
+                inputs: vec![DeclarationId(1406), DeclarationId(695), DeclarationId(1407)],
                 output: DeclarationId(695),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4203, 4307)),
             },
@@ -24220,7 +24220,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(696),
             name: Some("fold_right".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1406), DeclarationId(698), DeclarationId(1407)],
+                inputs: vec![DeclarationId(1408), DeclarationId(698), DeclarationId(1409)],
                 output: DeclarationId(698),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4658, 4768)),
             },
@@ -24266,8 +24266,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(699),
             name: Some("concat".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1408), DeclarationId(1409)],
-                output: DeclarationId(1410),
+                inputs: vec![DeclarationId(1410), DeclarationId(1411)],
+                output: DeclarationId(1412),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5386, 5414)),
             },
             type_params: vec![DeclarationId(700)],
@@ -24298,8 +24298,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(701),
             name: Some("map".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1411), DeclarationId(1412)],
-                output: DeclarationId(1413),
+                inputs: vec![DeclarationId(1413), DeclarationId(1414)],
+                output: DeclarationId(1415),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5721, 5778)),
             },
             type_params: vec![DeclarationId(702), DeclarationId(703)],
@@ -24344,8 +24344,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(704),
             name: Some("filter".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1414), DeclarationId(1415)],
-                output: DeclarationId(1416),
+                inputs: vec![DeclarationId(1416), DeclarationId(1417)],
+                output: DeclarationId(1418),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5905, 5988)),
             },
             type_params: vec![DeclarationId(705)],
@@ -24376,8 +24376,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(706),
             name: Some("flat_map".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1417), DeclarationId(1419)],
-                output: DeclarationId(1420),
+                inputs: vec![DeclarationId(1419), DeclarationId(1421)],
+                output: DeclarationId(1422),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6171, 6230)),
             },
             type_params: vec![DeclarationId(707), DeclarationId(708)],
@@ -24422,7 +24422,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(709),
             name: Some("length".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1421)],
+                inputs: vec![DeclarationId(1423)],
                 output: DeclarationId(93),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6372, 6409)),
             },
@@ -24454,7 +24454,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(711),
             name: Some("is_empty".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1422)],
+                inputs: vec![DeclarationId(1424)],
                 output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6605, 6671)),
             },
@@ -24525,8 +24525,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(715),
             name: Some("enumerate".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1423)],
-                output: DeclarationId(1425),
+                inputs: vec![DeclarationId(1425)],
+                output: DeclarationId(1427),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7238, 7269)),
             },
             type_params: vec![DeclarationId(716)],
@@ -24557,8 +24557,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(717),
             name: Some("enumerate_helper".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1426), DeclarationId(93)],
-                output: DeclarationId(1428),
+                inputs: vec![DeclarationId(1428), DeclarationId(93)],
+                output: DeclarationId(1430),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7463, 7644)),
             },
             type_params: vec![DeclarationId(718)],
@@ -24589,7 +24589,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(719),
             name: Some("contains".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1429), DeclarationId(720)],
+                inputs: vec![DeclarationId(1431), DeclarationId(720)],
                 output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 8205, 8332)),
             },
@@ -24684,7 +24684,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "rest".to_string(),
-                        ty: DeclarationId(1433),
+                        ty: DeclarationId(1435),
                     },
                 ],
             },
@@ -24727,7 +24727,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "rest".to_string(),
-                        ty: DeclarationId(1434),
+                        ty: DeclarationId(1436),
                     },
                 ],
             },
@@ -24762,11 +24762,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LiteralToken".to_string(),
-                        ty: DeclarationId(1449),
+                        ty: DeclarationId(1451),
                     },
                     Field {
                         label: "ParamToken".to_string(),
-                        ty: DeclarationId(1450),
+                        ty: DeclarationId(1452),
                     },
                 ],
             },
@@ -24786,7 +24786,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tokens".to_string(),
-                    ty: DeclarationId(1451),
+                    ty: DeclarationId(1453),
                 }],
             },
             type_params: vec![],
@@ -24806,11 +24806,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ParsedSegmentTokens".to_string(),
-                        ty: DeclarationId(1453),
+                        ty: DeclarationId(1455),
                     },
                     Field {
                         label: "MalformedPathSegment".to_string(),
-                        ty: DeclarationId(1454),
+                        ty: DeclarationId(1456),
                     },
                 ],
             },
@@ -24831,11 +24831,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ParsedPathTemplate".to_string(),
-                        ty: DeclarationId(1455),
+                        ty: DeclarationId(1457),
                     },
                     Field {
                         label: "MalformedPathTemplate".to_string(),
-                        ty: DeclarationId(1456),
+                        ty: DeclarationId(1458),
                     },
                 ],
             },
@@ -24890,7 +24890,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("last_path_param".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(730)],
-                output: DeclarationId(1435),
+                output: DeclarationId(1437),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 11761, 12044)),
             },
             type_params: vec![],
@@ -24910,15 +24910,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ReadEffect".to_string(),
-                        ty: DeclarationId(1457),
+                        ty: DeclarationId(1459),
                     },
                     Field {
                         label: "UpsertEffect".to_string(),
-                        ty: DeclarationId(1458),
+                        ty: DeclarationId(1460),
                     },
                     Field {
                         label: "DeleteEffect".to_string(),
-                        ty: DeclarationId(1459),
+                        ty: DeclarationId(1461),
                     },
                 ],
             },
@@ -24939,11 +24939,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "CreateEffect".to_string(),
-                        ty: DeclarationId(1460),
+                        ty: DeclarationId(1462),
                     },
                     Field {
                         label: "AppendEffect".to_string(),
-                        ty: DeclarationId(1461),
+                        ty: DeclarationId(1463),
                     },
                 ],
             },
@@ -24964,11 +24964,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IsIdempotent".to_string(),
-                        ty: DeclarationId(1462),
+                        ty: DeclarationId(1464),
                     },
                     Field {
                         label: "IsBreaking".to_string(),
-                        ty: DeclarationId(1463),
+                        ty: DeclarationId(1465),
                     },
                 ],
             },
@@ -24989,11 +24989,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "PostAlways".to_string(),
-                        ty: DeclarationId(1464),
+                        ty: DeclarationId(1466),
                     },
                     Field {
                         label: "KeylessFallback".to_string(),
-                        ty: DeclarationId(1465),
+                        ty: DeclarationId(1467),
                     },
                 ],
             },
@@ -25014,15 +25014,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "PathParam".to_string(),
-                        ty: DeclarationId(1466),
+                        ty: DeclarationId(1468),
                     },
                     Field {
                         label: "InputField".to_string(),
-                        ty: DeclarationId(1467),
+                        ty: DeclarationId(1469),
                     },
                     Field {
                         label: "CompositeKey".to_string(),
-                        ty: DeclarationId(1469),
+                        ty: DeclarationId(1471),
                     },
                 ],
             },
@@ -25043,15 +25043,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LatticeEffect".to_string(),
-                        ty: DeclarationId(1470),
+                        ty: DeclarationId(1472),
                     },
                     Field {
                         label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(1471),
+                        ty: DeclarationId(1473),
                     },
                     Field {
                         label: "NonIdempotent".to_string(),
-                        ty: DeclarationId(1472),
+                        ty: DeclarationId(1474),
                     },
                 ],
             },
@@ -25133,15 +25133,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DerivedEffect".to_string(),
-                        ty: DeclarationId(1473),
+                        ty: DeclarationId(1475),
                     },
                     Field {
                         label: "UnknownHttpMethodInput".to_string(),
-                        ty: DeclarationId(1474),
+                        ty: DeclarationId(1476),
                     },
                     Field {
                         label: "MalformedPathInput".to_string(),
-                        ty: DeclarationId(1475),
+                        ty: DeclarationId(1477),
                     },
                 ],
             },
@@ -25162,11 +25162,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IdempotentComposition".to_string(),
-                        ty: DeclarationId(1476),
+                        ty: DeclarationId(1478),
                     },
                     Field {
                         label: "BrokenBy".to_string(),
-                        ty: DeclarationId(1478),
+                        ty: DeclarationId(1480),
                     },
                 ],
             },
@@ -25203,7 +25203,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(1436),
+                output: DeclarationId(1438),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20942, 20964)),
             },
             type_params: vec![],
@@ -25220,8 +25220,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(749),
             name: Some("indexed_breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1437)],
-                output: DeclarationId(1439),
+                inputs: vec![DeclarationId(1439)],
+                output: DeclarationId(1441),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21058, 21151)),
             },
             type_params: vec![],
@@ -25238,8 +25238,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(750),
             name: Some("first_breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1440)],
-                output: DeclarationId(1442),
+                inputs: vec![DeclarationId(1442)],
+                output: DeclarationId(1444),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21238, 21421)),
             },
             type_params: vec![],
@@ -25256,7 +25256,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(751),
             name: Some("compose_effects".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1443)],
+                inputs: vec![DeclarationId(1445)],
                 output: DeclarationId(746),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22311, 22434)),
             },
@@ -25321,19 +25321,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LinearEffect".to_string(),
-                        ty: DeclarationId(1480),
+                        ty: DeclarationId(1482),
                     },
                     Field {
                         label: "BranchEffect".to_string(),
-                        ty: DeclarationId(1482),
+                        ty: DeclarationId(1484),
                     },
                     Field {
                         label: "LoopEffect".to_string(),
-                        ty: DeclarationId(1483),
+                        ty: DeclarationId(1485),
                     },
                     Field {
                         label: "ParallelEffect".to_string(),
-                        ty: DeclarationId(1485),
+                        ty: DeclarationId(1487),
                     },
                 ],
             },
@@ -25383,11 +25383,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "WorkflowCompositionVerdict".to_string(),
-                        ty: DeclarationId(1486),
+                        ty: DeclarationId(1488),
                     },
                     Field {
                         label: "IdempotencyUnsupported".to_string(),
-                        ty: DeclarationId(1487),
+                        ty: DeclarationId(1489),
                     },
                 ],
             },
@@ -25426,23 +25426,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NoWorkflowProjection".to_string(),
-                        ty: DeclarationId(1488),
+                        ty: DeclarationId(1490),
                     },
                     Field {
                         label: "NotParallelEffectRoot".to_string(),
-                        ty: DeclarationId(1489),
+                        ty: DeclarationId(1491),
                     },
                     Field {
                         label: "NonLinearParallelBranch".to_string(),
-                        ty: DeclarationId(1490),
+                        ty: DeclarationId(1492),
                     },
                     Field {
                         label: "PairwiseNonCommute".to_string(),
-                        ty: DeclarationId(1491),
+                        ty: DeclarationId(1493),
                     },
                     Field {
                         label: "LensSurfacePending".to_string(),
-                        ty: DeclarationId(1492),
+                        ty: DeclarationId(1494),
                     },
                 ],
             },
@@ -25492,11 +25492,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ParallelCompositionVerdict".to_string(),
-                        ty: DeclarationId(1493),
+                        ty: DeclarationId(1495),
                     },
                     Field {
                         label: "ParallelismUnsupported".to_string(),
-                        ty: DeclarationId(1494),
+                        ty: DeclarationId(1496),
                     },
                 ],
             },
@@ -25551,7 +25551,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("parse_http_method".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230)],
-                output: DeclarationId(1444),
+                output: DeclarationId(1446),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 29705, 30003)),
             },
             type_params: vec![],
@@ -25586,7 +25586,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(765),
             name: Some("upsert_or_create".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1445), DeclarationId(198)],
+                inputs: vec![DeclarationId(1447), DeclarationId(198)],
                 output: DeclarationId(738),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30474, 30626)),
             },
@@ -25604,7 +25604,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(766),
             name: Some("delete_or_create".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1446), DeclarationId(198)],
+                inputs: vec![DeclarationId(1448), DeclarationId(198)],
                 output: DeclarationId(738),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30704, 30856)),
             },
@@ -25661,15 +25661,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Agrees".to_string(),
-                        ty: DeclarationId(1495),
+                        ty: DeclarationId(1497),
                     },
                     Field {
                         label: "Disagrees".to_string(),
-                        ty: DeclarationId(1496),
+                        ty: DeclarationId(1498),
                     },
                     Field {
                         label: "DerivationUnknown".to_string(),
-                        ty: DeclarationId(1497),
+                        ty: DeclarationId(1499),
                     },
                 ],
             },
@@ -25690,11 +25690,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ModifierNotDeclared".to_string(),
-                        ty: DeclarationId(1498),
+                        ty: DeclarationId(1500),
                     },
                     Field {
                         label: "ModifierDeclared".to_string(),
-                        ty: DeclarationId(1499),
+                        ty: DeclarationId(1501),
                     },
                 ],
             },
@@ -25832,8 +25832,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(776),
             name: Some("generate_idempotency_obligations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1447)],
-                output: DeclarationId(1448),
+                inputs: vec![DeclarationId(1449)],
+                output: DeclarationId(1450),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 36638, 36908)),
             },
             type_params: vec![],
@@ -25926,15 +25926,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Uninferred".to_string(),
-                        ty: DeclarationId(1508),
+                        ty: DeclarationId(1510),
                     },
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(1509),
+                        ty: DeclarationId(1511),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(1510),
+                        ty: DeclarationId(1512),
                     },
                 ],
             },
@@ -25963,7 +25963,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "produced_by".to_string(),
-                        ty: DeclarationId(1511),
+                        ty: DeclarationId(1513),
                     },
                 ],
             },
@@ -25984,15 +25984,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LitInt".to_string(),
-                        ty: DeclarationId(1512),
+                        ty: DeclarationId(1514),
                     },
                     Field {
                         label: "LitBool".to_string(),
-                        ty: DeclarationId(1513),
+                        ty: DeclarationId(1515),
                     },
                     Field {
                         label: "LitString".to_string(),
-                        ty: DeclarationId(1514),
+                        ty: DeclarationId(1516),
                     },
                 ],
             },
@@ -26013,23 +26013,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(1515),
+                        ty: DeclarationId(1517),
                     },
                     Field {
                         label: "UnresolvedIdentifier".to_string(),
-                        ty: DeclarationId(1516),
+                        ty: DeclarationId(1518),
                     },
                     Field {
                         label: "ResolvedByStructure".to_string(),
-                        ty: DeclarationId(1517),
+                        ty: DeclarationId(1519),
                     },
                     Field {
                         label: "ResolvedByName".to_string(),
-                        ty: DeclarationId(1518),
+                        ty: DeclarationId(1520),
                     },
                     Field {
                         label: "TypeParam".to_string(),
-                        ty: DeclarationId(1519),
+                        ty: DeclarationId(1521),
                     },
                 ],
             },
@@ -26050,15 +26050,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "OneUnit".to_string(),
-                        ty: DeclarationId(1520),
+                        ty: DeclarationId(1522),
                     },
                     Field {
                         label: "AdditionalUnit".to_string(),
-                        ty: DeclarationId(1521),
+                        ty: DeclarationId(1523),
                     },
                     Field {
                         label: "UnitCount".to_string(),
-                        ty: DeclarationId(1522),
+                        ty: DeclarationId(1524),
                     },
                 ],
             },
@@ -26079,11 +26079,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ZeroWidth".to_string(),
-                        ty: DeclarationId(1523),
+                        ty: DeclarationId(1525),
                     },
                     Field {
                         label: "PositiveWidth".to_string(),
-                        ty: DeclarationId(1524),
+                        ty: DeclarationId(1526),
                     },
                 ],
             },
@@ -26104,11 +26104,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "BoundedInterval".to_string(),
-                        ty: DeclarationId(1525),
+                        ty: DeclarationId(1527),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1526),
+                        ty: DeclarationId(1528),
                     },
                 ],
             },
@@ -26163,11 +26163,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "StaticBound".to_string(),
-                        ty: DeclarationId(1528),
+                        ty: DeclarationId(1530),
                     },
                     Field {
                         label: "PlatformDependent".to_string(),
-                        ty: DeclarationId(1529),
+                        ty: DeclarationId(1531),
                     },
                 ],
             },
@@ -26188,15 +26188,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Exact".to_string(),
-                        ty: DeclarationId(1530),
+                        ty: DeclarationId(1532),
                     },
                     Field {
                         label: "AtMostOne".to_string(),
-                        ty: DeclarationId(1531),
+                        ty: DeclarationId(1533),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1532),
+                        ty: DeclarationId(1534),
                     },
                 ],
             },
@@ -26292,27 +26292,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(1533),
+                        ty: DeclarationId(1535),
                     },
                     Field {
                         label: "Reference".to_string(),
-                        ty: DeclarationId(1534),
+                        ty: DeclarationId(1536),
                     },
                     Field {
                         label: "Record".to_string(),
-                        ty: DeclarationId(1536),
+                        ty: DeclarationId(1538),
                     },
                     Field {
                         label: "List".to_string(),
-                        ty: DeclarationId(1538),
+                        ty: DeclarationId(1540),
                     },
                     Field {
                         label: "Map".to_string(),
-                        ty: DeclarationId(1540),
+                        ty: DeclarationId(1542),
                     },
                     Field {
                         label: "Variant".to_string(),
-                        ty: DeclarationId(1542),
+                        ty: DeclarationId(1544),
                     },
                 ],
             },
@@ -26333,23 +26333,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ValueBodyUnparsed".to_string(),
-                        ty: DeclarationId(1543),
+                        ty: DeclarationId(1545),
                     },
                     Field {
                         label: "ValueBodyStructural".to_string(),
-                        ty: DeclarationId(1545),
+                        ty: DeclarationId(1547),
                     },
                     Field {
                         label: "ValueBodyScalar".to_string(),
-                        ty: DeclarationId(1546),
+                        ty: DeclarationId(1548),
                     },
                     Field {
                         label: "ValueBodyList".to_string(),
-                        ty: DeclarationId(1548),
+                        ty: DeclarationId(1550),
                     },
                     Field {
                         label: "ValueBodyMap".to_string(),
-                        ty: DeclarationId(1550),
+                        ty: DeclarationId(1552),
                     },
                 ],
             },
@@ -26389,23 +26389,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UserDefined".to_string(),
-                        ty: DeclarationId(1551),
+                        ty: DeclarationId(1553),
                     },
                     Field {
                         label: "ExternalRealization".to_string(),
-                        ty: DeclarationId(1552),
+                        ty: DeclarationId(1554),
                     },
                     Field {
                         label: "Pending".to_string(),
-                        ty: DeclarationId(1553),
+                        ty: DeclarationId(1555),
                     },
                     Field {
                         label: "NoBody".to_string(),
-                        ty: DeclarationId(1554),
+                        ty: DeclarationId(1556),
                     },
                     Field {
                         label: "Unparsed".to_string(),
-                        ty: DeclarationId(1555),
+                        ty: DeclarationId(1557),
                     },
                 ],
             },
@@ -26426,27 +26426,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Atom".to_string(),
-                        ty: DeclarationId(1556),
+                        ty: DeclarationId(1558),
                     },
                     Field {
                         label: "Conj".to_string(),
-                        ty: DeclarationId(1558),
+                        ty: DeclarationId(1560),
                     },
                     Field {
                         label: "Disj".to_string(),
-                        ty: DeclarationId(1560),
+                        ty: DeclarationId(1562),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(1562),
+                        ty: DeclarationId(1564),
                     },
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(1563),
+                        ty: DeclarationId(1565),
                     },
                     Field {
                         label: "Instantiation".to_string(),
-                        ty: DeclarationId(1565),
+                        ty: DeclarationId(1567),
                     },
                 ],
             },
@@ -26471,7 +26471,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(1566),
+                        ty: DeclarationId(1568),
                     },
                     Field {
                         label: "connective".to_string(),
@@ -26479,27 +26479,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(1567),
+                        ty: DeclarationId(1569),
                     },
                     Field {
                         label: "phantom_params".to_string(),
-                        ty: DeclarationId(1568),
+                        ty: DeclarationId(1570),
                     },
                     Field {
                         label: "meta_tag".to_string(),
-                        ty: DeclarationId(1569),
+                        ty: DeclarationId(1571),
                     },
                     Field {
                         label: "inhabits".to_string(),
-                        ty: DeclarationId(1570),
+                        ty: DeclarationId(1572),
                     },
                     Field {
                         label: "value_body".to_string(),
-                        ty: DeclarationId(1571),
+                        ty: DeclarationId(1573),
                     },
                     Field {
                         label: "nominal_opacity".to_string(),
-                        ty: DeclarationId(1572),
+                        ty: DeclarationId(1574),
                     },
                     Field {
                         label: "span".to_string(),
@@ -26548,7 +26548,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "permitted_accessors".to_string(),
-                    ty: DeclarationId(1573),
+                    ty: DeclarationId(1575),
                 }],
             },
             type_params: vec![],
@@ -26568,19 +26568,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Add".to_string(),
-                        ty: DeclarationId(1574),
+                        ty: DeclarationId(1576),
                     },
                     Field {
                         label: "Sub".to_string(),
-                        ty: DeclarationId(1575),
+                        ty: DeclarationId(1577),
                     },
                     Field {
                         label: "Mul".to_string(),
-                        ty: DeclarationId(1576),
+                        ty: DeclarationId(1578),
                     },
                     Field {
                         label: "Div".to_string(),
-                        ty: DeclarationId(1577),
+                        ty: DeclarationId(1579),
                     },
                 ],
             },
@@ -26601,27 +26601,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(1578),
+                        ty: DeclarationId(1580),
                     },
                     Field {
                         label: "Ne".to_string(),
-                        ty: DeclarationId(1579),
+                        ty: DeclarationId(1581),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(1580),
+                        ty: DeclarationId(1582),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(1581),
+                        ty: DeclarationId(1583),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(1582),
+                        ty: DeclarationId(1584),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(1583),
+                        ty: DeclarationId(1585),
                     },
                 ],
             },
@@ -26667,11 +26667,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "And".to_string(),
-                        ty: DeclarationId(1584),
+                        ty: DeclarationId(1586),
                     },
                     Field {
                         label: "Or".to_string(),
-                        ty: DeclarationId(1585),
+                        ty: DeclarationId(1587),
                     },
                 ],
             },
@@ -26692,15 +26692,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Arithmetic".to_string(),
-                        ty: DeclarationId(1586),
+                        ty: DeclarationId(1588),
                     },
                     Field {
                         label: "Comparison".to_string(),
-                        ty: DeclarationId(1587),
+                        ty: DeclarationId(1589),
                     },
                     Field {
                         label: "Logical".to_string(),
-                        ty: DeclarationId(1588),
+                        ty: DeclarationId(1590),
                     },
                 ],
             },
@@ -26721,19 +26721,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Callable".to_string(),
-                        ty: DeclarationId(1589),
+                        ty: DeclarationId(1591),
                     },
                     Field {
                         label: "UnresolvedFieldProject".to_string(),
-                        ty: DeclarationId(1590),
+                        ty: DeclarationId(1592),
                     },
                     Field {
                         label: "ResolvedFieldProject".to_string(),
-                        ty: DeclarationId(1591),
+                        ty: DeclarationId(1593),
                     },
                     Field {
                         label: "Operator".to_string(),
-                        ty: DeclarationId(1592),
+                        ty: DeclarationId(1594),
                     },
                 ],
             },
@@ -26754,11 +26754,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UnresolvedVariant".to_string(),
-                        ty: DeclarationId(1593),
+                        ty: DeclarationId(1595),
                     },
                     Field {
                         label: "ResolvedVariant".to_string(),
-                        ty: DeclarationId(1594),
+                        ty: DeclarationId(1596),
                     },
                 ],
             },
@@ -26816,7 +26816,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "binding".to_string(),
-                        ty: DeclarationId(1595),
+                        ty: DeclarationId(1597),
                     },
                 ],
             },
@@ -26952,11 +26952,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "members".to_string(),
-                        ty: DeclarationId(1596),
+                        ty: DeclarationId(1598),
                     },
                     Field {
                         label: "intra_cluster_calls".to_string(),
-                        ty: DeclarationId(1597),
+                        ty: DeclarationId(1599),
                     },
                 ],
             },
@@ -26977,11 +26977,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(1598),
+                        ty: DeclarationId(1600),
                     },
                     Field {
                         label: "Descent".to_string(),
-                        ty: DeclarationId(1599),
+                        ty: DeclarationId(1601),
                     },
                 ],
             },
@@ -27036,7 +27036,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "lane2_workflow".to_string(),
-                        ty: DeclarationId(1600),
+                        ty: DeclarationId(1602),
                     },
                 ],
             },
@@ -27065,7 +27065,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(1601),
+                        ty: DeclarationId(1603),
                     },
                     Field {
                         label: "result_port".to_string(),
@@ -27093,7 +27093,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "UserMatch".to_string(),
-                    ty: DeclarationId(1602),
+                    ty: DeclarationId(1604),
                 }],
             },
             type_params: vec![],
@@ -27121,7 +27121,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "paths".to_string(),
-                        ty: DeclarationId(1603),
+                        ty: DeclarationId(1605),
                     },
                     Field {
                         label: "result_port".to_string(),
@@ -27133,7 +27133,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "emit_participation".to_string(),
-                        ty: DeclarationId(1604),
+                        ty: DeclarationId(1606),
                     },
                 ],
             },
@@ -27198,7 +27198,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "UserCallable".to_string(),
-                    ty: DeclarationId(1605),
+                    ty: DeclarationId(1607),
                 }],
             },
             type_params: vec![],
@@ -27230,7 +27230,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(1606),
+                        ty: DeclarationId(1608),
                     },
                     Field {
                         label: "span".to_string(),
@@ -27238,11 +27238,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "lane2_workflow".to_string(),
-                        ty: DeclarationId(1607),
+                        ty: DeclarationId(1609),
                     },
                     Field {
                         label: "emit_participation".to_string(),
-                        ty: DeclarationId(1608),
+                        ty: DeclarationId(1610),
                     },
                 ],
             },
@@ -27263,23 +27263,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Value".to_string(),
-                        ty: DeclarationId(1609),
+                        ty: DeclarationId(1611),
                     },
                     Field {
                         label: "Transform".to_string(),
-                        ty: DeclarationId(1610),
+                        ty: DeclarationId(1612),
                     },
                     Field {
                         label: "Branch".to_string(),
-                        ty: DeclarationId(1611),
+                        ty: DeclarationId(1613),
                     },
                     Field {
                         label: "Loop".to_string(),
-                        ty: DeclarationId(1612),
+                        ty: DeclarationId(1614),
                     },
                     Field {
                         label: "Bind".to_string(),
-                        ty: DeclarationId(1613),
+                        ty: DeclarationId(1615),
                     },
                 ],
             },
@@ -27300,19 +27300,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "declarations".to_string(),
-                        ty: DeclarationId(1614),
+                        ty: DeclarationId(1616),
                     },
                     Field {
                         label: "nodes".to_string(),
-                        ty: DeclarationId(1615),
+                        ty: DeclarationId(1617),
                     },
                     Field {
                         label: "ports".to_string(),
-                        ty: DeclarationId(1616),
+                        ty: DeclarationId(1618),
                     },
                     Field {
                         label: "clusters".to_string(),
-                        ty: DeclarationId(1617),
+                        ty: DeclarationId(1619),
                     },
                 ],
             },
@@ -27352,15 +27352,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "accessor".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "realization".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                 ],
             },
@@ -27379,7 +27379,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("port".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(722)],
-                output: DeclarationId(1500),
+                output: DeclarationId(1502),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22297,
@@ -27401,7 +27401,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("node".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-                output: DeclarationId(1501),
+                output: DeclarationId(1503),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22355,
@@ -27423,7 +27423,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("resolve_producer".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(722)],
-                output: DeclarationId(1502),
+                output: DeclarationId(1504),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22430,
@@ -27445,7 +27445,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("declaration_by_id".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(723)],
-                output: DeclarationId(1503),
+                output: DeclarationId(1505),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22819,
@@ -27467,7 +27467,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("declaration_by_name".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(230)],
-                output: DeclarationId(1504),
+                output: DeclarationId(1506),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     23694,
@@ -27489,7 +27489,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("lane2_workflow_at".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-                output: DeclarationId(1505),
+                output: DeclarationId(1507),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     24020,
@@ -27513,15 +27513,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "SingleRoot".to_string(),
-                        ty: DeclarationId(1618),
+                        ty: DeclarationId(1620),
                     },
                     Field {
                         label: "NoRoot".to_string(),
-                        ty: DeclarationId(1619),
+                        ty: DeclarationId(1621),
                     },
                     Field {
                         label: "AmbiguousRoot".to_string(),
-                        ty: DeclarationId(1621),
+                        ty: DeclarationId(1623),
                     },
                 ],
             },
@@ -27562,7 +27562,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(1506),
+                output: DeclarationId(1508),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     28025,
@@ -27584,7 +27584,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(723)],
-                output: DeclarationId(1507),
+                output: DeclarationId(1509),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     28110,
@@ -27607,7 +27607,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "decl".to_string(),
-                    ty: DeclarationId(1296),
+                    ty: DeclarationId(1298),
                 }],
             },
             type_params: vec![],
@@ -27627,15 +27627,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ShrinkEffect".to_string(),
-                        ty: DeclarationId(1646),
+                        ty: DeclarationId(1648),
                     },
                     Field {
                         label: "ProjectionEffect".to_string(),
-                        ty: DeclarationId(1647),
+                        ty: DeclarationId(1649),
                     },
                     Field {
                         label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(1648),
+                        ty: DeclarationId(1650),
                     },
                 ],
             },
@@ -27656,19 +27656,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ShapeConstant".to_string(),
-                        ty: DeclarationId(1649),
+                        ty: DeclarationId(1651),
                     },
                     Field {
                         label: "ShapeLinearScan".to_string(),
-                        ty: DeclarationId(1650),
+                        ty: DeclarationId(1652),
                     },
                     Field {
                         label: "ShapeIterateBody".to_string(),
-                        ty: DeclarationId(1651),
+                        ty: DeclarationId(1653),
                     },
                     Field {
                         label: "ShapeSortBody".to_string(),
-                        ty: DeclarationId(1652),
+                        ty: DeclarationId(1654),
                     },
                 ],
             },
@@ -27697,15 +27697,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "size_effect".to_string(),
-                        ty: DeclarationId(1653),
+                        ty: DeclarationId(1655),
                     },
                     Field {
                         label: "cost_shape".to_string(),
-                        ty: DeclarationId(1654),
+                        ty: DeclarationId(1656),
                     },
                     Field {
                         label: "callback_element_position".to_string(),
-                        ty: DeclarationId(1655),
+                        ty: DeclarationId(1657),
                     },
                 ],
             },
@@ -27730,7 +27730,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "display_name".to_string(),
-                        ty: DeclarationId(1656),
+                        ty: DeclarationId(1658),
                     },
                 ],
             },
@@ -27787,11 +27787,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DegreeTwo".to_string(),
-                        ty: DeclarationId(1657),
+                        ty: DeclarationId(1659),
                     },
                     Field {
                         label: "DegreeSuccessor".to_string(),
-                        ty: DeclarationId(1658),
+                        ty: DeclarationId(1660),
                     },
                 ],
             },
@@ -27812,31 +27812,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ConstantCost".to_string(),
-                        ty: DeclarationId(1659),
+                        ty: DeclarationId(1661),
                     },
                     Field {
                         label: "LinearCost".to_string(),
-                        ty: DeclarationId(1660),
+                        ty: DeclarationId(1662),
                     },
                     Field {
                         label: "PolynomialCost".to_string(),
-                        ty: DeclarationId(1661),
+                        ty: DeclarationId(1663),
                     },
                     Field {
                         label: "ProductCost".to_string(),
-                        ty: DeclarationId(1663),
+                        ty: DeclarationId(1665),
                     },
                     Field {
                         label: "SumCost".to_string(),
-                        ty: DeclarationId(1665),
+                        ty: DeclarationId(1667),
                     },
                     Field {
                         label: "LogCost".to_string(),
-                        ty: DeclarationId(1666),
+                        ty: DeclarationId(1668),
                     },
                     Field {
                         label: "UnknownCost".to_string(),
-                        ty: DeclarationId(1667),
+                        ty: DeclarationId(1669),
                     },
                 ],
             },
@@ -27844,7 +27844,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-            inhabits: Some(DeclarationId(1668)),
+            inhabits: Some(DeclarationId(1670)),
             value_body: None,
             refinement: None,
             nominal_opacity: None,
@@ -27898,7 +27898,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(1622),
+                output: DeclarationId(1624),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 10963, 10973)),
             },
             type_params: vec![],
@@ -27916,7 +27916,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(849)],
-                output: DeclarationId(1623),
+                output: DeclarationId(1625),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 11047, 11062)),
             },
             type_params: vec![],
@@ -27934,7 +27934,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("two_terms".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(849), DeclarationId(849)],
-                output: DeclarationId(1624),
+                output: DeclarationId(1626),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(185))),
             },
             type_params: vec![],
@@ -27951,8 +27951,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(855),
             name: Some("many_terms".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849), DeclarationId(849), DeclarationId(1625)],
-                output: DeclarationId(1626),
+                inputs: vec![DeclarationId(849), DeclarationId(849), DeclarationId(1627)],
+                output: DeclarationId(1628),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(187))),
             },
             type_params: vec![],
@@ -28077,7 +28077,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(862),
             name: Some("max_path".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1627)],
+                inputs: vec![DeclarationId(1629)],
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(220))),
             },
@@ -28134,35 +28134,35 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ClassConstant".to_string(),
-                        ty: DeclarationId(1669),
+                        ty: DeclarationId(1671),
                     },
                     Field {
                         label: "ClassLog".to_string(),
-                        ty: DeclarationId(1670),
+                        ty: DeclarationId(1672),
                     },
                     Field {
                         label: "ClassLinear".to_string(),
-                        ty: DeclarationId(1671),
+                        ty: DeclarationId(1673),
                     },
                     Field {
                         label: "ClassLinearithmic".to_string(),
-                        ty: DeclarationId(1672),
+                        ty: DeclarationId(1674),
                     },
                     Field {
                         label: "ClassQuadratic".to_string(),
-                        ty: DeclarationId(1673),
+                        ty: DeclarationId(1675),
                     },
                     Field {
                         label: "ClassPolynomial".to_string(),
-                        ty: DeclarationId(1674),
+                        ty: DeclarationId(1676),
                     },
                     Field {
                         label: "ClassExponential".to_string(),
-                        ty: DeclarationId(1675),
+                        ty: DeclarationId(1677),
                     },
                     Field {
                         label: "ClassUnknown".to_string(),
-                        ty: DeclarationId(1676),
+                        ty: DeclarationId(1678),
                     },
                 ],
             },
@@ -28170,7 +28170,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-            inhabits: Some(DeclarationId(1677)),
+            inhabits: Some(DeclarationId(1679)),
             value_body: None,
             refinement: None,
             nominal_opacity: None,
@@ -28270,8 +28270,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(871),
             name: Some("nsl_to_list".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1628)],
-                output: DeclarationId(1629),
+                inputs: vec![DeclarationId(1630)],
+                output: DeclarationId(1631),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(366))),
             },
             type_params: vec![],
@@ -28288,8 +28288,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(872),
             name: Some("drop_additive_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1630)],
-                output: DeclarationId(1631),
+                inputs: vec![DeclarationId(1632)],
+                output: DeclarationId(1633),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(379))),
             },
             type_params: vec![],
@@ -28306,8 +28306,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(873),
             name: Some("collapse_on_multiplicative_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1632)],
-                output: DeclarationId(1633),
+                inputs: vec![DeclarationId(1634)],
+                output: DeclarationId(1635),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(386))),
             },
             type_params: vec![],
@@ -28324,7 +28324,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(874),
             name: Some("any_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1634)],
+                inputs: vec![DeclarationId(1636)],
                 output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(395))),
             },
@@ -28342,8 +28342,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(875),
             name: Some("drop_multiplicative_one".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1635)],
-                output: DeclarationId(1636),
+                inputs: vec![DeclarationId(1637)],
+                output: DeclarationId(1638),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(408))),
             },
             type_params: vec![],
@@ -28396,7 +28396,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(878),
             name: Some("reduce_sum".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1637)],
+                inputs: vec![DeclarationId(1639)],
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(440))),
             },
@@ -28414,7 +28414,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(879),
             name: Some("wrap_sum".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1638)],
+                inputs: vec![DeclarationId(1640)],
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(452))),
             },
@@ -28432,7 +28432,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(880),
             name: Some("reduce_product".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1639)],
+                inputs: vec![DeclarationId(1641)],
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(469))),
             },
@@ -28581,8 +28581,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(888),
             name: Some("filter_not_dominated_by".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1640), DeclarationId(849)],
-                output: DeclarationId(1641),
+                inputs: vec![DeclarationId(1642), DeclarationId(849)],
+                output: DeclarationId(1643),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(517))),
             },
             type_params: vec![],
@@ -28599,8 +28599,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(889),
             name: Some("drop_dominated_step".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1642), DeclarationId(849)],
-                output: DeclarationId(1643),
+                inputs: vec![DeclarationId(1644), DeclarationId(849)],
+                output: DeclarationId(1645),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(524))),
             },
             type_params: vec![],
@@ -28617,8 +28617,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(890),
             name: Some("drop_dominated".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1644)],
-                output: DeclarationId(1645),
+                inputs: vec![DeclarationId(1646)],
+                output: DeclarationId(1647),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(527))),
             },
             type_params: vec![],
@@ -28638,10 +28638,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 inputs: vec![
                     DeclarationId(147),
                     DeclarationId(230),
-                    DeclarationId(1705),
-                    DeclarationId(93),
-                    DeclarationId(1706),
                     DeclarationId(1707),
+                    DeclarationId(93),
+                    DeclarationId(1708),
+                    DeclarationId(1709),
                 ],
                 output: DeclarationId(912),
                 body: ArrowBody::Unparsed(SourceSpan::new(
@@ -28672,7 +28672,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1708)),
+            meta_tag: Some(DeclarationId(1710)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![])),
@@ -28687,11 +28687,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UserMessage".to_string(),
-                        ty: DeclarationId(1710),
+                        ty: DeclarationId(1712),
                     },
                     Field {
                         label: "AssistantMessage".to_string(),
-                        ty: DeclarationId(1712),
+                        ty: DeclarationId(1714),
                     },
                 ],
             },
@@ -28712,11 +28712,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Base64Image".to_string(),
-                        ty: DeclarationId(1713),
+                        ty: DeclarationId(1715),
                     },
                     Field {
                         label: "UrlImage".to_string(),
-                        ty: DeclarationId(1714),
+                        ty: DeclarationId(1716),
                     },
                 ],
             },
@@ -28737,11 +28737,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "TextContent".to_string(),
-                        ty: DeclarationId(1715),
+                        ty: DeclarationId(1717),
                     },
                     Field {
                         label: "ImageContent".to_string(),
-                        ty: DeclarationId(1716),
+                        ty: DeclarationId(1718),
                     },
                 ],
             },
@@ -28800,11 +28800,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ToolResultText".to_string(),
-                        ty: DeclarationId(1717),
+                        ty: DeclarationId(1719),
                     },
                     Field {
                         label: "ToolResultBlocks".to_string(),
-                        ty: DeclarationId(1719),
+                        ty: DeclarationId(1721),
                     },
                 ],
             },
@@ -28824,7 +28824,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Text".to_string(),
-                    ty: DeclarationId(1720),
+                    ty: DeclarationId(1722),
                 }],
             },
             type_params: vec![],
@@ -28843,7 +28843,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "TextPlain".to_string(),
-                    ty: DeclarationId(1721),
+                    ty: DeclarationId(1723),
                 }],
             },
             type_params: vec![],
@@ -28888,23 +28888,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "AnthropicTextBlock".to_string(),
-                        ty: DeclarationId(1722),
+                        ty: DeclarationId(1724),
                     },
                     Field {
                         label: "AnthropicImageBlock".to_string(),
-                        ty: DeclarationId(1723),
+                        ty: DeclarationId(1725),
                     },
                     Field {
                         label: "AnthropicDocumentBlock".to_string(),
-                        ty: DeclarationId(1724),
+                        ty: DeclarationId(1726),
                     },
                     Field {
                         label: "AnthropicSearchResultBlock".to_string(),
-                        ty: DeclarationId(1728),
+                        ty: DeclarationId(1730),
                     },
                     Field {
                         label: "AnthropicToolReferenceBlock".to_string(),
-                        ty: DeclarationId(1729),
+                        ty: DeclarationId(1731),
                     },
                 ],
             },
@@ -28954,11 +28954,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UserTextBlock".to_string(),
-                        ty: DeclarationId(1730),
+                        ty: DeclarationId(1732),
                     },
                     Field {
                         label: "UserToolResultBlock".to_string(),
-                        ty: DeclarationId(1733),
+                        ty: DeclarationId(1735),
                     },
                 ],
             },
@@ -28979,11 +28979,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "AssistantTextBlock".to_string(),
-                        ty: DeclarationId(1734),
+                        ty: DeclarationId(1736),
                     },
                     Field {
                         label: "AssistantToolUseBlock".to_string(),
-                        ty: DeclarationId(1735),
+                        ty: DeclarationId(1737),
                     },
                 ],
             },
@@ -29004,31 +29004,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "EndTurn".to_string(),
-                        ty: DeclarationId(1736),
+                        ty: DeclarationId(1738),
                     },
                     Field {
                         label: "MaxTokens".to_string(),
-                        ty: DeclarationId(1737),
+                        ty: DeclarationId(1739),
                     },
                     Field {
                         label: "StopSequence".to_string(),
-                        ty: DeclarationId(1738),
+                        ty: DeclarationId(1740),
                     },
                     Field {
                         label: "ToolUse".to_string(),
-                        ty: DeclarationId(1739),
+                        ty: DeclarationId(1741),
                     },
                     Field {
                         label: "PauseTurn".to_string(),
-                        ty: DeclarationId(1740),
+                        ty: DeclarationId(1742),
                     },
                     Field {
                         label: "Refusal".to_string(),
-                        ty: DeclarationId(1741),
+                        ty: DeclarationId(1743),
                     },
                     Field {
                         label: "ModelContextWindowExceeded".to_string(),
-                        ty: DeclarationId(1742),
+                        ty: DeclarationId(1744),
                     },
                 ],
             },
@@ -29049,23 +29049,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "CharLocation".to_string(),
-                        ty: DeclarationId(1745),
+                        ty: DeclarationId(1747),
                     },
                     Field {
                         label: "PageLocation".to_string(),
-                        ty: DeclarationId(1748),
+                        ty: DeclarationId(1750),
                     },
                     Field {
                         label: "ContentBlockLocation".to_string(),
-                        ty: DeclarationId(1751),
+                        ty: DeclarationId(1753),
                     },
                     Field {
                         label: "WebSearchResultLocation".to_string(),
-                        ty: DeclarationId(1753),
+                        ty: DeclarationId(1755),
                     },
                     Field {
                         label: "SearchResultLocation".to_string(),
-                        ty: DeclarationId(1755),
+                        ty: DeclarationId(1757),
                     },
                 ],
             },
@@ -29086,27 +29086,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "MessagesTextBlock".to_string(),
-                        ty: DeclarationId(1758),
+                        ty: DeclarationId(1760),
                     },
                     Field {
                         label: "MessagesThinkingBlock".to_string(),
-                        ty: DeclarationId(1759),
+                        ty: DeclarationId(1761),
                     },
                     Field {
                         label: "MessagesRedactedThinkingBlock".to_string(),
-                        ty: DeclarationId(1760),
+                        ty: DeclarationId(1762),
                     },
                     Field {
                         label: "MessagesToolUseBlock".to_string(),
-                        ty: DeclarationId(1762),
+                        ty: DeclarationId(1764),
                     },
                     Field {
                         label: "MessagesServerToolUseBlock".to_string(),
-                        ty: DeclarationId(1764),
+                        ty: DeclarationId(1766),
                     },
                     Field {
                         label: "MessagesWebSearchToolResultBlock".to_string(),
-                        ty: DeclarationId(1766),
+                        ty: DeclarationId(1768),
                     },
                 ],
             },
@@ -29127,35 +29127,35 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "WebSearch".to_string(),
-                        ty: DeclarationId(1767),
+                        ty: DeclarationId(1769),
                     },
                     Field {
                         label: "WebFetch".to_string(),
-                        ty: DeclarationId(1768),
+                        ty: DeclarationId(1770),
                     },
                     Field {
                         label: "CodeExecution".to_string(),
-                        ty: DeclarationId(1769),
+                        ty: DeclarationId(1771),
                     },
                     Field {
                         label: "BashCodeExecution".to_string(),
-                        ty: DeclarationId(1770),
+                        ty: DeclarationId(1772),
                     },
                     Field {
                         label: "TextEditorCodeExecution".to_string(),
-                        ty: DeclarationId(1771),
+                        ty: DeclarationId(1773),
                     },
                     Field {
                         label: "ToolSearchToolRegex".to_string(),
-                        ty: DeclarationId(1772),
+                        ty: DeclarationId(1774),
                     },
                     Field {
                         label: "ToolSearchToolBm25".to_string(),
-                        ty: DeclarationId(1773),
+                        ty: DeclarationId(1775),
                     },
                     Field {
                         label: "Advisor".to_string(),
-                        ty: DeclarationId(1774),
+                        ty: DeclarationId(1776),
                     },
                 ],
             },
@@ -29184,15 +29184,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "cache_creation_input_tokens".to_string(),
-                        ty: DeclarationId(1775),
+                        ty: DeclarationId(1777),
                     },
                     Field {
                         label: "cache_read_input_tokens".to_string(),
-                        ty: DeclarationId(1776),
+                        ty: DeclarationId(1778),
                     },
                     Field {
                         label: "service_tier".to_string(),
-                        ty: DeclarationId(1777),
+                        ty: DeclarationId(1779),
                     },
                 ],
             },
@@ -29212,7 +29212,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Assistant".to_string(),
-                    ty: DeclarationId(1778),
+                    ty: DeclarationId(1780),
                 }],
             },
             type_params: vec![],
@@ -29244,7 +29244,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(1779),
+                        ty: DeclarationId(1781),
                     },
                     Field {
                         label: "model".to_string(),
@@ -29256,7 +29256,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "stop_sequence".to_string(),
-                        ty: DeclarationId(1780),
+                        ty: DeclarationId(1782),
                     },
                     Field {
                         label: "usage".to_string(),
@@ -29264,7 +29264,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "container".to_string(),
-                        ty: DeclarationId(1781),
+                        ty: DeclarationId(1783),
                     },
                 ],
             },
@@ -29293,7 +29293,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "entry".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                 ],
             },
@@ -29314,23 +29314,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "StdAuthority".to_string(),
-                        ty: DeclarationId(1782),
+                        ty: DeclarationId(1784),
                     },
                     Field {
                         label: "V3StdAuthority".to_string(),
-                        ty: DeclarationId(1783),
+                        ty: DeclarationId(1785),
                     },
                     Field {
                         label: "V3SpecAuthority".to_string(),
-                        ty: DeclarationId(1784),
+                        ty: DeclarationId(1786),
                     },
                     Field {
                         label: "CompilerAuthority".to_string(),
-                        ty: DeclarationId(1785),
+                        ty: DeclarationId(1787),
                     },
                     Field {
                         label: "ExtdepsFixtureAuthority".to_string(),
-                        ty: DeclarationId(1786),
+                        ty: DeclarationId(1788),
                     },
                 ],
             },
@@ -29387,483 +29387,483 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "dsl/std/logic.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1784),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/bit.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1784),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/error_primitives.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1784),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/algebra.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1784),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/magnitude.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1784),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/machine_constraints.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1784),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/nat.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1784),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/integer.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1784),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/rational.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1784),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/float.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1784),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/types.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1784),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/string_type.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1784),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/unicode.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1784),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/render_repeat_string_bootstrap.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1784),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/methods.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1784),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/serialization.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1782),
+                            constructor: DeclarationId(1784),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/algebra.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_messages.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_operations.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_schema.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/approximate_field.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bin_shim.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bootstrap_authority.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bridge_ledger.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/clean_emission.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/computation.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/computation_model.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/coproduct_projection.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/cross_target_coverage.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/diagnostics.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/dimensions.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/effects.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/emission_provenance.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/emit_model.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/extdeps_bootstrap_fixtures.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/go_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/induction.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/integer_diagnostic_order.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lens.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lens_application.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/list.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lookup.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/methods.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/parse_surface.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/python_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/resources.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/runtime.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/rust_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/services.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/substrate.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/substrate_minimal.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/termination.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/t_ci_workflow_as_data_demo.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/timing_lens.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/tokenize.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/verification.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/workflows.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1783),
+                            constructor: DeclarationId(1785),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/v3_l1.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1784),
+                            constructor: DeclarationId(1786),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/go.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1784),
+                            constructor: DeclarationId(1786),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/python.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1784),
+                            constructor: DeclarationId(1786),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/rust.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1784),
+                            constructor: DeclarationId(1786),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/pipeline.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1785),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/operators.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1785),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/regen.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1785),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/languages/rust/primitives.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1788),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/cron_schedule_model.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1788),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/github/github.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1788),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/github/actions.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1788),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/github/ci.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1788),
                             payload: vec![],
                         },
                     ),
@@ -29881,11 +29881,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Retired".to_string(),
-                        ty: DeclarationId(1787),
+                        ty: DeclarationId(1789),
                     },
                     Field {
                         label: "Open".to_string(),
-                        ty: DeclarationId(1788),
+                        ty: DeclarationId(1790),
                     },
                 ],
             },
@@ -29905,7 +29905,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "decl".to_string(),
-                    ty: DeclarationId(1296),
+                    ty: DeclarationId(1298),
                 }],
             },
             type_params: vec![],
@@ -29951,7 +29951,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6389, 6499),
         });
-        declarations.push(Declaration { id: DeclarationId(920), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(919) }] }, 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(1787), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-pb-bridge-canonical-lens-name-dispatch-closure.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(1787), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/l1_5_fixed_point_test.rs".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(1787), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/bridge_lower_helpers_patch_zero_residual_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_semantic_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/r3-v-bridge-row-4-exact-string-deeper-detail-receipt.md".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6963, 8416) });
+        declarations.push(Declaration { id: DeclarationId(920), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(919) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1791)), 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(1790), 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(1789), 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(1789), 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(1789), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-pb-bridge-canonical-lens-name-dispatch-closure.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(1789), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/l1_5_fixed_point_test.rs".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(1789), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/bridge_lower_helpers_patch_zero_residual_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_semantic_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1790), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-v-bridge-row-4-exact-string-deeper-detail-receipt.md".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6963, 8416) });
         declarations.push(Declaration {
             id: DeclarationId(921),
             name: Some("CleanEmissionContract".to_string()),
@@ -30037,15 +30037,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "WrapEverything".to_string(),
-                        ty: DeclarationId(1790),
+                        ty: DeclarationId(1792),
                     },
                     Field {
                         label: "WrapOnlyInOperandPosition".to_string(),
-                        ty: DeclarationId(1791),
+                        ty: DeclarationId(1793),
                     },
                     Field {
                         label: "NoWrapping".to_string(),
-                        ty: DeclarationId(1792),
+                        ty: DeclarationId(1794),
                     },
                 ],
             },
@@ -30066,19 +30066,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "EmitBindingAlways".to_string(),
-                        ty: DeclarationId(1793),
+                        ty: DeclarationId(1795),
                     },
                     Field {
                         label: "EmitUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(1794),
+                        ty: DeclarationId(1796),
                     },
                     Field {
                         label: "EmitPrefixedUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(1795),
+                        ty: DeclarationId(1797),
                     },
                     Field {
                         label: "NotApplicablePatternBinding".to_string(),
-                        ty: DeclarationId(1796),
+                        ty: DeclarationId(1798),
                     },
                 ],
             },
@@ -30099,11 +30099,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "AccessFromPayloadBinding".to_string(),
-                        ty: DeclarationId(1797),
+                        ty: DeclarationId(1799),
                     },
                     Field {
                         label: "OverrideNamedFieldsAtBindingSite".to_string(),
-                        ty: DeclarationId(1798),
+                        ty: DeclarationId(1800),
                     },
                 ],
             },
@@ -30124,15 +30124,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ImportEverythingDeclared".to_string(),
-                        ty: DeclarationId(1799),
+                        ty: DeclarationId(1801),
                     },
                     Field {
                         label: "IncludeOnlyReferenced".to_string(),
-                        ty: DeclarationId(1800),
+                        ty: DeclarationId(1802),
                     },
                     Field {
                         label: "ImportPerUsageSite".to_string(),
-                        ty: DeclarationId(1801),
+                        ty: DeclarationId(1803),
                     },
                 ],
             },
@@ -30153,15 +30153,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "WrapReturnValue".to_string(),
-                        ty: DeclarationId(1802),
+                        ty: DeclarationId(1804),
                     },
                     Field {
                         label: "NoWrappingOnTerminalExpression".to_string(),
-                        ty: DeclarationId(1803),
+                        ty: DeclarationId(1805),
                     },
                     Field {
                         label: "ExplicitReturnKeyword".to_string(),
-                        ty: DeclarationId(1804),
+                        ty: DeclarationId(1806),
                     },
                 ],
             },
@@ -30182,15 +30182,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "EmitLetBindingAlways".to_string(),
-                        ty: DeclarationId(1805),
+                        ty: DeclarationId(1807),
                     },
                     Field {
                         label: "EmitLetUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(1806),
+                        ty: DeclarationId(1808),
                     },
                     Field {
                         label: "OmitLetBinding".to_string(),
-                        ty: DeclarationId(1807),
+                        ty: DeclarationId(1809),
                     },
                 ],
             },
@@ -30211,15 +30211,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "WrapBody".to_string(),
-                        ty: DeclarationId(1808),
+                        ty: DeclarationId(1810),
                     },
                     Field {
                         label: "NoWrappingOnNonComplexBody".to_string(),
-                        ty: DeclarationId(1809),
+                        ty: DeclarationId(1811),
                     },
                     Field {
                         label: "NotApplicableMatchArmBody".to_string(),
-                        ty: DeclarationId(1810),
+                        ty: DeclarationId(1812),
                     },
                 ],
             },
@@ -30277,7 +30277,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(1811),
+                        ty: DeclarationId(1813),
                     },
                     Field {
                         label: "syntax_only".to_string(),
@@ -30310,19 +30310,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IgnoreVerifierOutput".to_string(),
-                        ty: DeclarationId(1812),
+                        ty: DeclarationId(1814),
                     },
                     Field {
                         label: "RequireEmptyStdout".to_string(),
-                        ty: DeclarationId(1813),
+                        ty: DeclarationId(1815),
                     },
                     Field {
                         label: "RequireEmptyStderr".to_string(),
-                        ty: DeclarationId(1814),
+                        ty: DeclarationId(1816),
                     },
                     Field {
                         label: "RequireEmptyStdoutAndStderr".to_string(),
-                        ty: DeclarationId(1815),
+                        ty: DeclarationId(1817),
                     },
                 ],
             },
@@ -30343,35 +30343,35 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "CollectionSize".to_string(),
-                        ty: DeclarationId(1822),
+                        ty: DeclarationId(1824),
                     },
                     Field {
                         label: "ParserStreamSize".to_string(),
-                        ty: DeclarationId(1823),
+                        ty: DeclarationId(1825),
                     },
                     Field {
                         label: "WorklistDrainSize".to_string(),
-                        ty: DeclarationId(1824),
+                        ty: DeclarationId(1826),
                     },
                     Field {
                         label: "TreeSize".to_string(),
-                        ty: DeclarationId(1825),
+                        ty: DeclarationId(1827),
                     },
                     Field {
                         label: "ArithmeticParam".to_string(),
-                        ty: DeclarationId(1826),
+                        ty: DeclarationId(1828),
                     },
                     Field {
                         label: "ExplicitCountZero".to_string(),
-                        ty: DeclarationId(1827),
+                        ty: DeclarationId(1829),
                     },
                     Field {
                         label: "ExplicitCountPositive".to_string(),
-                        ty: DeclarationId(1828),
+                        ty: DeclarationId(1830),
                     },
                     Field {
                         label: "Forever".to_string(),
-                        ty: DeclarationId(1829),
+                        ty: DeclarationId(1831),
                     },
                 ],
             },
@@ -30414,35 +30414,35 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ChildAccessorCall".to_string(),
-                        ty: DeclarationId(1830),
+                        ty: DeclarationId(1832),
                     },
                     Field {
                         label: "CollectionShrinkCall".to_string(),
-                        ty: DeclarationId(1831),
+                        ty: DeclarationId(1833),
                     },
                     Field {
                         label: "ArithmeticSubtractCall".to_string(),
-                        ty: DeclarationId(1832),
+                        ty: DeclarationId(1834),
                     },
                     Field {
                         label: "ArithmeticDivideCall".to_string(),
-                        ty: DeclarationId(1833),
+                        ty: DeclarationId(1835),
                     },
                     Field {
                         label: "ParserAdvanceCall".to_string(),
-                        ty: DeclarationId(1834),
+                        ty: DeclarationId(1836),
                     },
                     Field {
                         label: "WorklistDrainCall".to_string(),
-                        ty: DeclarationId(1835),
+                        ty: DeclarationId(1837),
                     },
                     Field {
                         label: "FoldBodyCall".to_string(),
-                        ty: DeclarationId(1836),
+                        ty: DeclarationId(1838),
                     },
                     Field {
                         label: "SameArgumentCall".to_string(),
-                        ty: DeclarationId(1837),
+                        ty: DeclarationId(1839),
                     },
                 ],
             },
@@ -30461,7 +30461,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("per_call_pattern_at".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-                output: DeclarationId(1816),
+                output: DeclarationId(1818),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     2764,
@@ -30483,7 +30483,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("per_call_descent_operand_port".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-                output: DeclarationId(1817),
+                output: DeclarationId(1819),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     2969,
@@ -30507,15 +30507,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UnitShrink".to_string(),
-                        ty: DeclarationId(1838),
+                        ty: DeclarationId(1840),
                     },
                     Field {
                         label: "ConstantShrink".to_string(),
-                        ty: DeclarationId(1839),
+                        ty: DeclarationId(1841),
                     },
                     Field {
                         label: "ProportionalShrink".to_string(),
-                        ty: DeclarationId(1840),
+                        ty: DeclarationId(1842),
                     },
                 ],
             },
@@ -30536,15 +30536,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Fold".to_string(),
-                        ty: DeclarationId(1841),
+                        ty: DeclarationId(1843),
                     },
                     Field {
                         label: "Descend".to_string(),
-                        ty: DeclarationId(1842),
+                        ty: DeclarationId(1844),
                     },
                     Field {
                         label: "Repeat".to_string(),
-                        ty: DeclarationId(1843),
+                        ty: DeclarationId(1845),
                     },
                 ],
             },
@@ -30577,7 +30577,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "factor".to_string(),
-                        ty: DeclarationId(1844),
+                        ty: DeclarationId(1846),
                     },
                 ],
             },
@@ -30618,7 +30618,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("size_bound_param".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(933)],
-                output: DeclarationId(1818),
+                output: DeclarationId(1820),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     5787,
@@ -30684,7 +30684,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("constant_bound_value".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(933)],
-                output: DeclarationId(1819),
+                output: DeclarationId(1821),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     6715,
@@ -30708,15 +30708,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "TreeDescent".to_string(),
-                        ty: DeclarationId(1845),
+                        ty: DeclarationId(1847),
                     },
                     Field {
                         label: "CollectionFold".to_string(),
-                        ty: DeclarationId(1846),
+                        ty: DeclarationId(1848),
                     },
                     Field {
                         label: "ArithmeticRepeat".to_string(),
-                        ty: DeclarationId(1847),
+                        ty: DeclarationId(1849),
                     },
                 ],
             },
@@ -30735,7 +30735,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("algebra_profile_to_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(53)],
-                output: DeclarationId(1820),
+                output: DeclarationId(1822),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     7781,
@@ -30757,7 +30757,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("type_iteration_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230)],
-                output: DeclarationId(1821),
+                output: DeclarationId(1823),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     8346,
@@ -30781,11 +30781,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Immutable".to_string(),
-                        ty: DeclarationId(1848),
+                        ty: DeclarationId(1850),
                     },
                     Field {
                         label: "Mutable".to_string(),
-                        ty: DeclarationId(1849),
+                        ty: DeclarationId(1851),
                     },
                 ],
             },
@@ -30806,11 +30806,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Pure".to_string(),
-                        ty: DeclarationId(1850),
+                        ty: DeclarationId(1852),
                     },
                     Field {
                         label: "Effectful".to_string(),
-                        ty: DeclarationId(1851),
+                        ty: DeclarationId(1853),
                     },
                 ],
             },
@@ -30831,11 +30831,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ExplicitDAG".to_string(),
-                        ty: DeclarationId(1852),
+                        ty: DeclarationId(1854),
                     },
                     Field {
                         label: "Arbitrary".to_string(),
-                        ty: DeclarationId(1853),
+                        ty: DeclarationId(1855),
                     },
                 ],
             },
@@ -30856,11 +30856,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Bounded".to_string(),
-                        ty: DeclarationId(1854),
+                        ty: DeclarationId(1856),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1855),
+                        ty: DeclarationId(1857),
                     },
                 ],
             },
@@ -30924,28 +30924,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "mutability".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1848),
+                            constructor: DeclarationId(1850),
                             payload: vec![],
                         },
                     ),
                     (
                         "purity".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1850),
+                            constructor: DeclarationId(1852),
                             payload: vec![],
                         },
                     ),
                     (
                         "structure".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1852),
+                            constructor: DeclarationId(1854),
                             payload: vec![],
                         },
                     ),
                     (
                         "iteration".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1854),
+                            constructor: DeclarationId(1856),
                             payload: vec![],
                         },
                     ),
@@ -30962,19 +30962,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ValueOnly".to_string(),
-                        ty: DeclarationId(1856),
+                        ty: DeclarationId(1858),
                     },
                     Field {
                         label: "GarbageCollected".to_string(),
-                        ty: DeclarationId(1857),
+                        ty: DeclarationId(1859),
                     },
                     Field {
                         label: "RefCounted".to_string(),
-                        ty: DeclarationId(1858),
+                        ty: DeclarationId(1860),
                     },
                     Field {
                         label: "OwnershipBased".to_string(),
-                        ty: DeclarationId(1859),
+                        ty: DeclarationId(1861),
                     },
                 ],
             },
@@ -30995,11 +30995,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LexicalScoping".to_string(),
-                        ty: DeclarationId(1860),
+                        ty: DeclarationId(1862),
                     },
                     Field {
                         label: "DynamicScoping".to_string(),
-                        ty: DeclarationId(1861),
+                        ty: DeclarationId(1863),
                     },
                 ],
             },
@@ -31044,7 +31044,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "excluded_prefixes".to_string(),
-                    ty: DeclarationId(1862),
+                    ty: DeclarationId(1864),
                 }],
             },
             type_params: vec![],
@@ -31068,7 +31068,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "additional_excluded_prefixes".to_string(),
-                        ty: DeclarationId(1863),
+                        ty: DeclarationId(1865),
                     },
                 ],
             },
@@ -31116,11 +31116,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "OwnershipBased".to_string(),
-                        ty: DeclarationId(1864),
+                        ty: DeclarationId(1866),
                     },
                     Field {
                         label: "GarbageCollected".to_string(),
-                        ty: DeclarationId(1865),
+                        ty: DeclarationId(1867),
                     },
                 ],
             },
@@ -31157,7 +31157,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "StringTag".to_string(),
-                    ty: DeclarationId(1866),
+                    ty: DeclarationId(1868),
                 }],
             },
             type_params: vec![],
@@ -31177,11 +31177,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Empty".to_string(),
-                        ty: DeclarationId(1867),
+                        ty: DeclarationId(1869),
                     },
                     Field {
                         label: "Populated".to_string(),
-                        ty: DeclarationId(1868),
+                        ty: DeclarationId(1870),
                     },
                 ],
             },
@@ -31227,7 +31227,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "declaration".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "wire_tag_field".to_string(),
@@ -31235,7 +31235,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "variant_projections".to_string(),
-                        ty: DeclarationId(1869),
+                        ty: DeclarationId(1871),
                     },
                 ],
             },
@@ -31336,27 +31336,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Atom".to_string(),
-                        ty: DeclarationId(1870),
+                        ty: DeclarationId(1872),
                     },
                     Field {
                         label: "Conj".to_string(),
-                        ty: DeclarationId(1871),
+                        ty: DeclarationId(1873),
                     },
                     Field {
                         label: "Disj".to_string(),
-                        ty: DeclarationId(1872),
+                        ty: DeclarationId(1874),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(1873),
+                        ty: DeclarationId(1875),
                     },
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(1874),
+                        ty: DeclarationId(1876),
                     },
                     Field {
                         label: "Instantiation".to_string(),
-                        ty: DeclarationId(1875),
+                        ty: DeclarationId(1877),
                     },
                 ],
             },
@@ -31377,23 +31377,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Value".to_string(),
-                        ty: DeclarationId(1876),
+                        ty: DeclarationId(1878),
                     },
                     Field {
                         label: "Transform".to_string(),
-                        ty: DeclarationId(1877),
+                        ty: DeclarationId(1879),
                     },
                     Field {
                         label: "Branch".to_string(),
-                        ty: DeclarationId(1878),
+                        ty: DeclarationId(1880),
                     },
                     Field {
                         label: "Loop".to_string(),
-                        ty: DeclarationId(1879),
+                        ty: DeclarationId(1881),
                     },
                     Field {
                         label: "Bind".to_string(),
-                        ty: DeclarationId(1880),
+                        ty: DeclarationId(1882),
                     },
                 ],
             },
@@ -31468,7 +31468,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "cells".to_string(),
-                        ty: DeclarationId(1881),
+                        ty: DeclarationId(1883),
                     },
                 ],
             },
@@ -31494,7 +31494,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1882)),
+            meta_tag: Some(DeclarationId(1884)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -31521,14 +31521,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -31558,14 +31558,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -31595,14 +31595,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -31632,14 +31632,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -31669,14 +31669,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -31706,14 +31706,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -31743,14 +31743,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -31780,14 +31780,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -31817,14 +31817,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -31854,14 +31854,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -31891,14 +31891,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -31928,14 +31928,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -31965,14 +31965,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -32002,14 +32002,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -32039,14 +32039,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -32076,14 +32076,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -32113,14 +32113,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -32150,14 +32150,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -32187,14 +32187,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -32224,14 +32224,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -32261,14 +32261,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -32298,14 +32298,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -32335,14 +32335,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -32372,14 +32372,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -32409,14 +32409,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -32446,14 +32446,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -32483,14 +32483,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -32520,14 +32520,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -32557,14 +32557,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -32594,14 +32594,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -32631,14 +32631,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -32668,14 +32668,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -32705,14 +32705,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -32742,14 +32742,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -32779,14 +32779,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -32816,14 +32816,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -32853,14 +32853,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -32890,14 +32890,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -32927,14 +32927,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -32964,14 +32964,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -33001,14 +33001,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1874),
+                                    constructor: DeclarationId(1876),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1879),
                                     payload: vec![],
                                 },
                             ),
@@ -33027,43 +33027,43 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-                        ty: DeclarationId(1883),
+                        ty: DeclarationId(1885),
                     },
                     Field {
                         label: "ParseError".to_string(),
-                        ty: DeclarationId(1884),
+                        ty: DeclarationId(1886),
                     },
                     Field {
                         label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(1885),
+                        ty: DeclarationId(1887),
                     },
                     Field {
                         label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(1886),
+                        ty: DeclarationId(1888),
                     },
                     Field {
                         label: "ResolveError".to_string(),
-                        ty: DeclarationId(1887),
+                        ty: DeclarationId(1889),
                     },
                     Field {
                         label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(1888),
+                        ty: DeclarationId(1890),
                     },
                     Field {
                         label: "BranchConditionNotBool".to_string(),
-                        ty: DeclarationId(1889),
+                        ty: DeclarationId(1891),
                     },
                     Field {
                         label: "MagnitudeOutOfRange".to_string(),
-                        ty: DeclarationId(1890),
+                        ty: DeclarationId(1892),
                     },
                     Field {
                         label: "MalformedIntegerRangeFact".to_string(),
-                        ty: DeclarationId(1891),
+                        ty: DeclarationId(1893),
                     },
                     Field {
                         label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(1892),
+                        ty: DeclarationId(1894),
                     },
                 ],
             },
@@ -33137,7 +33137,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "kind_decl".to_string(),
-                    ty: DeclarationId(1296),
+                    ty: DeclarationId(1298),
                 }],
             },
             type_params: vec![],
@@ -33157,11 +33157,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "CompilerKind".to_string(),
-                        ty: DeclarationId(1893),
+                        ty: DeclarationId(1895),
                     },
                     Field {
                         label: "LensInstanceKind".to_string(),
-                        ty: DeclarationId(1894),
+                        ty: DeclarationId(1896),
                     },
                 ],
             },
@@ -33194,7 +33194,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "fixes".to_string(),
-                        ty: DeclarationId(1895),
+                        ty: DeclarationId(1897),
                     },
                 ],
             },
@@ -33215,31 +33215,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UnderRefined".to_string(),
-                        ty: DeclarationId(1896),
+                        ty: DeclarationId(1898),
                     },
                     Field {
                         label: "NoInhabitant".to_string(),
-                        ty: DeclarationId(1897),
+                        ty: DeclarationId(1899),
                     },
                     Field {
                         label: "ContradictoryUse".to_string(),
-                        ty: DeclarationId(1899),
+                        ty: DeclarationId(1901),
                     },
                     Field {
                         label: "OutOfR2Scope".to_string(),
-                        ty: DeclarationId(1900),
+                        ty: DeclarationId(1902),
                     },
                     Field {
                         label: "LifetimeProgramExtractionPending".to_string(),
-                        ty: DeclarationId(1901),
+                        ty: DeclarationId(1903),
                     },
                     Field {
                         label: "FoldNotImplemented".to_string(),
-                        ty: DeclarationId(1902),
+                        ty: DeclarationId(1904),
                     },
                     Field {
                         label: "MissingEmissionPath".to_string(),
-                        ty: DeclarationId(1903),
+                        ty: DeclarationId(1905),
                     },
                 ],
             },
@@ -33260,11 +33260,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Inhabits".to_string(),
-                        ty: DeclarationId(1918),
+                        ty: DeclarationId(1920),
                     },
                     Field {
                         label: "Violates".to_string(),
-                        ty: DeclarationId(1919),
+                        ty: DeclarationId(1921),
                     },
                 ],
             },
@@ -33299,11 +33299,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NoDiagnostic".to_string(),
-                        ty: DeclarationId(1920),
+                        ty: DeclarationId(1922),
                     },
                     Field {
                         label: "SomeDiagnostic".to_string(),
-                        ty: DeclarationId(1921),
+                        ty: DeclarationId(1923),
                     },
                 ],
             },
@@ -33324,11 +33324,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DimensionOk".to_string(),
-                        ty: DeclarationId(1924),
+                        ty: DeclarationId(1926),
                     },
                     Field {
                         label: "DimensionFail".to_string(),
-                        ty: DeclarationId(1928),
+                        ty: DeclarationId(1930),
                     },
                 ],
             },
@@ -33367,15 +33367,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "witness_of".to_string(),
-                        ty: DeclarationId(1930),
+                        ty: DeclarationId(1932),
                     },
                     Field {
                         label: "compose".to_string(),
-                        ty: DeclarationId(1931),
+                        ty: DeclarationId(1933),
                     },
                     Field {
                         label: "break_diagnostic".to_string(),
-                        ty: DeclarationId(1932),
+                        ty: DeclarationId(1934),
                     },
                 ],
             },
@@ -33415,7 +33415,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             type_params: vec![DeclarationId(992), DeclarationId(993)],
             phantom_params: vec![PhantomParameter {
                 parameter: DeclarationId(992),
-                algebra: DeclarationId(1933),
+                algebra: DeclarationId(1935),
             }],
             meta_tag: None,
             specialization_parent: None,
@@ -33556,11 +33556,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("add_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(1904),
-                    DeclarationId(1905),
                     DeclarationId(1906),
+                    DeclarationId(1907),
+                    DeclarationId(1908),
                 ],
-                output: DeclarationId(1907),
+                output: DeclarationId(1909),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4966, 4988)),
             },
             type_params: vec![DeclarationId(1002), DeclarationId(1003)],
@@ -33606,11 +33606,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("sub_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(1908),
-                    DeclarationId(1909),
                     DeclarationId(1910),
+                    DeclarationId(1911),
+                    DeclarationId(1912),
                 ],
-                output: DeclarationId(1911),
+                output: DeclarationId(1913),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5162, 5184)),
             },
             type_params: vec![DeclarationId(1005), DeclarationId(1006)],
@@ -33656,11 +33656,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("mul_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(1912),
-                    DeclarationId(1913),
+                    DeclarationId(1914),
+                    DeclarationId(1915),
                     DeclarationId(1009),
                 ],
-                output: DeclarationId(1914),
+                output: DeclarationId(1916),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5350, 5379)),
             },
             type_params: vec![DeclarationId(1008), DeclarationId(1009)],
@@ -33706,11 +33706,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("div_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(1915),
-                    DeclarationId(1916),
+                    DeclarationId(1917),
+                    DeclarationId(1918),
                     DeclarationId(1012),
                 ],
-                output: DeclarationId(1917),
+                output: DeclarationId(1919),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5545, 5574)),
             },
             type_params: vec![DeclarationId(1011), DeclarationId(1012)],
@@ -33775,11 +33775,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NoSourceSpan".to_string(),
-                        ty: DeclarationId(1934),
+                        ty: DeclarationId(1936),
                     },
                     Field {
                         label: "SomeSourceSpan".to_string(),
-                        ty: DeclarationId(1935),
+                        ty: DeclarationId(1937),
                     },
                 ],
             },
@@ -33829,11 +33829,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "carrier".to_string(),
@@ -33845,7 +33845,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(1936),
+                        ty: DeclarationId(1938),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -33870,15 +33870,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "kernel_integer".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "bound".to_string(),
@@ -33886,7 +33886,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "type_realization".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                 ],
             },
@@ -33907,15 +33907,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "BoundUnspecified".to_string(),
-                        ty: DeclarationId(1937),
+                        ty: DeclarationId(1939),
                     },
                     Field {
                         label: "StaticBoundFact".to_string(),
-                        ty: DeclarationId(1938),
+                        ty: DeclarationId(1940),
                     },
                     Field {
                         label: "PlatformDependentFact".to_string(),
-                        ty: DeclarationId(1939),
+                        ty: DeclarationId(1941),
                     },
                 ],
             },
@@ -33965,11 +33965,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DirectField".to_string(),
-                        ty: DeclarationId(1940),
+                        ty: DeclarationId(1942),
                     },
                     Field {
                         label: "AccessorMethod".to_string(),
-                        ty: DeclarationId(1941),
+                        ty: DeclarationId(1943),
                     },
                 ],
             },
@@ -33990,15 +33990,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "op".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "carrier".to_string(),
@@ -34027,11 +34027,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "carrier".to_string(),
@@ -34060,11 +34060,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "strategy".to_string(),
@@ -34072,7 +34072,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "parameters".to_string(),
-                        ty: DeclarationId(1942),
+                        ty: DeclarationId(1944),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -34122,11 +34122,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Borrowed".to_string(),
-                        ty: DeclarationId(1943),
+                        ty: DeclarationId(1945),
                     },
                     Field {
                         label: "Consumed".to_string(),
-                        ty: DeclarationId(1944),
+                        ty: DeclarationId(1946),
                     },
                 ],
             },
@@ -34147,11 +34147,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Owned".to_string(),
-                        ty: DeclarationId(1945),
+                        ty: DeclarationId(1947),
                     },
                     Field {
                         label: "Borrowed".to_string(),
-                        ty: DeclarationId(1946),
+                        ty: DeclarationId(1948),
                     },
                 ],
             },
@@ -34172,11 +34172,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "SelfContained".to_string(),
-                        ty: DeclarationId(1947),
+                        ty: DeclarationId(1949),
                     },
                     Field {
                         label: "Caller".to_string(),
-                        ty: DeclarationId(1948),
+                        ty: DeclarationId(1950),
                     },
                 ],
             },
@@ -34197,15 +34197,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Growable".to_string(),
-                        ty: DeclarationId(1949),
+                        ty: DeclarationId(1951),
                     },
                     Field {
                         label: "Fixed".to_string(),
-                        ty: DeclarationId(1950),
+                        ty: DeclarationId(1952),
                     },
                     Field {
                         label: "NotApplicable".to_string(),
-                        ty: DeclarationId(1951),
+                        ty: DeclarationId(1953),
                     },
                 ],
             },
@@ -34225,7 +34225,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Utf8FreeMonoidChar".to_string(),
-                    ty: DeclarationId(1952),
+                    ty: DeclarationId(1954),
                 }],
             },
             type_params: vec![],
@@ -34245,31 +34245,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "target_type".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "type_realization".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "ownership".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "lifetime".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "growability".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "encoding".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                 ],
             },
@@ -34290,11 +34290,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "carrier".to_string(),
@@ -34323,43 +34323,43 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ListEmpty".to_string(),
-                        ty: DeclarationId(1953),
+                        ty: DeclarationId(1955),
                     },
                     Field {
                         label: "ListSingleton".to_string(),
-                        ty: DeclarationId(1954),
+                        ty: DeclarationId(1956),
                     },
                     Field {
                         label: "ListCons".to_string(),
-                        ty: DeclarationId(1955),
+                        ty: DeclarationId(1957),
                     },
                     Field {
                         label: "ListConcat".to_string(),
-                        ty: DeclarationId(1956),
+                        ty: DeclarationId(1958),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(1957),
+                        ty: DeclarationId(1959),
                     },
                     Field {
                         label: "ListIsEmpty".to_string(),
-                        ty: DeclarationId(1958),
+                        ty: DeclarationId(1960),
                     },
                     Field {
                         label: "ListFold".to_string(),
-                        ty: DeclarationId(1959),
+                        ty: DeclarationId(1961),
                     },
                     Field {
                         label: "ListMap".to_string(),
-                        ty: DeclarationId(1960),
+                        ty: DeclarationId(1962),
                     },
                     Field {
                         label: "ListFilter".to_string(),
-                        ty: DeclarationId(1961),
+                        ty: DeclarationId(1963),
                     },
                     Field {
                         label: "ListContains".to_string(),
-                        ty: DeclarationId(1962),
+                        ty: DeclarationId(1964),
                     },
                 ],
             },
@@ -34380,11 +34380,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "strategy".to_string(),
@@ -34392,11 +34392,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "empty_variant".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "cons_variant".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "scrutinee".to_string(),
@@ -34441,11 +34441,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "PlaceholderPatternStrategy".to_string(),
-                        ty: DeclarationId(1963),
+                        ty: DeclarationId(1965),
                     },
                     Field {
                         label: "VectorList".to_string(),
-                        ty: DeclarationId(1964),
+                        ty: DeclarationId(1966),
                     },
                 ],
             },
@@ -34789,39 +34789,39 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "concat_contract".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "length_contract".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "is_empty_contract".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "fold_contract".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "filter_contract".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "flat_map_contract".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "any_contract".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "all_contract".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "map_contract".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "filter".to_string(),
@@ -34924,11 +34924,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Borrow".to_string(),
-                        ty: DeclarationId(1965),
+                        ty: DeclarationId(1967),
                     },
                     Field {
                         label: "PassByValue".to_string(),
-                        ty: DeclarationId(1966),
+                        ty: DeclarationId(1968),
                     },
                 ],
             },
@@ -34949,11 +34949,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "CopyOrClone".to_string(),
-                        ty: DeclarationId(1967),
+                        ty: DeclarationId(1969),
                     },
                     Field {
                         label: "PassByValue".to_string(),
-                        ty: DeclarationId(1968),
+                        ty: DeclarationId(1970),
                     },
                 ],
             },
@@ -34974,51 +34974,51 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "statements".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "expressions".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "control_flow".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "literals".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "modules".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "functions".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "type_applications".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "type_definitions".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "record_derive_templates".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "patterns".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "collection_ops".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "values".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                 ],
             },
@@ -35039,11 +35039,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IndexedArgs".to_string(),
-                        ty: DeclarationId(1969),
+                        ty: DeclarationId(1971),
                     },
                     Field {
                         label: "NamedArg".to_string(),
-                        ty: DeclarationId(1970),
+                        ty: DeclarationId(1972),
                     },
                 ],
             },
@@ -35064,11 +35064,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "SingleTemplate".to_string(),
-                        ty: DeclarationId(1971),
+                        ty: DeclarationId(1973),
                     },
                     Field {
                         label: "HigherOrderTemplates".to_string(),
-                        ty: DeclarationId(1972),
+                        ty: DeclarationId(1974),
                     },
                 ],
             },
@@ -35335,7 +35335,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({left}, {right}...)".to_string(),
                             ))],
@@ -35348,7 +35348,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -35386,7 +35386,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "int64(len({recv}))".to_string(),
                             ))],
@@ -35399,7 +35399,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -35437,7 +35437,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv}) == 0".to_string(),
                             ))],
@@ -35450,7 +35450,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -35490,7 +35490,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "/* fold({recv}, {init}, {body}) */".to_string(),
                             ))],
@@ -35503,7 +35503,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -35543,7 +35543,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "/* map({recv}, {body}) */".to_string(),
                             ))],
@@ -35556,7 +35556,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -35596,7 +35596,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Filter({recv}, {arg})".to_string(),
                             ))],
@@ -35609,7 +35609,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -35649,7 +35649,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Any({recv}, {arg})".to_string(),
                             ))],
@@ -35662,7 +35662,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -35702,7 +35702,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.All({recv}, {arg})".to_string(),
                             ))],
@@ -35715,7 +35715,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -35755,7 +35755,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.FlatMap({recv}, {arg})".to_string(),
                             ))],
@@ -35768,7 +35768,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -35790,7 +35790,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1973)),
+            meta_tag: Some(DeclarationId(1975)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -35809,7 +35809,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -35822,7 +35822,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -35844,7 +35844,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Join({recv}, {arg})".to_string(),
                             ))],
@@ -35857,7 +35857,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -35879,7 +35879,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Split({recv}, {arg})".to_string(),
                             ))],
@@ -35892,7 +35892,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -35916,7 +35916,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -35929,7 +35929,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -35949,7 +35949,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -35962,7 +35962,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -35984,7 +35984,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.SortBy({recv}, {arg})".to_string(),
                             ))],
@@ -35997,7 +35997,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -36019,7 +36019,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({recv}, {arg})".to_string(),
                             ))],
@@ -36032,7 +36032,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -36054,7 +36054,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Contains({recv}, {arg})".to_string(),
                             ))],
@@ -36067,7 +36067,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -36084,23 +36084,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DirectRecursion".to_string(),
-                        ty: DeclarationId(1987),
+                        ty: DeclarationId(1989),
                     },
                     Field {
                         label: "ListRecursion".to_string(),
-                        ty: DeclarationId(1988),
+                        ty: DeclarationId(1990),
                     },
                     Field {
                         label: "OptionalRecursion".to_string(),
-                        ty: DeclarationId(1989),
+                        ty: DeclarationId(1991),
                     },
                     Field {
                         label: "SetRecursion".to_string(),
-                        ty: DeclarationId(1990),
+                        ty: DeclarationId(1992),
                     },
                     Field {
                         label: "MapValueRecursion".to_string(),
-                        ty: DeclarationId(1991),
+                        ty: DeclarationId(1993),
                     },
                 ],
             },
@@ -36212,23 +36212,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "StrictSubValue".to_string(),
-                        ty: DeclarationId(1992),
+                        ty: DeclarationId(1994),
                     },
                     Field {
                         label: "IteratedSubValue".to_string(),
-                        ty: DeclarationId(1993),
+                        ty: DeclarationId(1995),
                     },
                     Field {
                         label: "ArithmeticDescent".to_string(),
-                        ty: DeclarationId(1994),
+                        ty: DeclarationId(1996),
                     },
                     Field {
                         label: "PreservedValue".to_string(),
-                        ty: DeclarationId(1995),
+                        ty: DeclarationId(1997),
                     },
                     Field {
                         label: "SubValueUnknown".to_string(),
-                        ty: DeclarationId(1996),
+                        ty: DeclarationId(1998),
                     },
                 ],
             },
@@ -36379,7 +36379,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(1073)],
-                output: DeclarationId(1974),
+                output: DeclarationId(1976),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     20571,
@@ -36401,7 +36401,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(1073)],
-                output: DeclarationId(1975),
+                output: DeclarationId(1977),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     21959,
@@ -36425,19 +36425,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IntegerExpZero".to_string(),
-                        ty: DeclarationId(1997),
+                        ty: DeclarationId(1999),
                     },
                     Field {
                         label: "IntegerExpPos".to_string(),
-                        ty: DeclarationId(1998),
+                        ty: DeclarationId(2000),
                     },
                     Field {
                         label: "FractionExp".to_string(),
-                        ty: DeclarationId(1999),
+                        ty: DeclarationId(2001),
                     },
                     Field {
                         label: "LogBasedExp".to_string(),
-                        ty: DeclarationId(2000),
+                        ty: DeclarationId(2002),
                     },
                 ],
             },
@@ -36480,11 +36480,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "PolyCost".to_string(),
-                        ty: DeclarationId(2001),
+                        ty: DeclarationId(2003),
                     },
                     Field {
                         label: "LogCost".to_string(),
-                        ty: DeclarationId(2002),
+                        ty: DeclarationId(2004),
                     },
                 ],
             },
@@ -36505,31 +36505,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ConstantBound".to_string(),
-                        ty: DeclarationId(2003),
+                        ty: DeclarationId(2005),
                     },
                     Field {
                         label: "AtomicBound".to_string(),
-                        ty: DeclarationId(2004),
+                        ty: DeclarationId(2006),
                     },
                     Field {
                         label: "ProductBound".to_string(),
-                        ty: DeclarationId(2006),
+                        ty: DeclarationId(2008),
                     },
                     Field {
                         label: "SumOfProductsBound".to_string(),
-                        ty: DeclarationId(2009),
+                        ty: DeclarationId(2011),
                     },
                     Field {
                         label: "SumBound".to_string(),
-                        ty: DeclarationId(2011),
+                        ty: DeclarationId(2013),
                     },
                     Field {
                         label: "ForeverBound".to_string(),
-                        ty: DeclarationId(2012),
+                        ty: DeclarationId(2014),
                     },
                     Field {
                         label: "ErrorBound".to_string(),
-                        ty: DeclarationId(2013),
+                        ty: DeclarationId(2015),
                     },
                 ],
             },
@@ -36547,7 +36547,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1086),
             name: Some("sum_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1976)],
+                inputs: vec![DeclarationId(1978)],
                 output: DeclarationId(1085),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -36627,7 +36627,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1090),
             name: Some("product_atoms_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1977)],
+                inputs: vec![DeclarationId(1979)],
                 output: DeclarationId(849),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -36649,7 +36649,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1091),
             name: Some("product_term_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1978)],
+                inputs: vec![DeclarationId(1980)],
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(555))),
             },
@@ -36667,7 +36667,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1092),
             name: Some("sum_products_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1980)],
+                inputs: vec![DeclarationId(1982)],
                 output: DeclarationId(849),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -36921,7 +36921,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("int_add_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(1981),
+                output: DeclarationId(1983),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33617,
@@ -36943,7 +36943,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("int_mul_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(1982),
+                output: DeclarationId(1984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33913,
@@ -36965,7 +36965,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(93)],
-                output: DeclarationId(1983),
+                output: DeclarationId(1985),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35162,
@@ -36987,7 +36987,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("int_pow_bounded".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(1984),
+                output: DeclarationId(1986),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35637,
@@ -37009,7 +37009,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("ceil_log".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(1985),
+                output: DeclarationId(1987),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     36900,
@@ -37036,7 +37036,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     DeclarationId(93),
                     DeclarationId(93),
                 ],
-                output: DeclarationId(1986),
+                output: DeclarationId(1988),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     37172,
@@ -37439,12 +37439,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1296),
+                    value: DeclarationId(1298),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2014)),
+            meta_tag: Some(DeclarationId(2016)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -37465,12 +37465,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1296),
+                    value: DeclarationId(1298),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2015)),
+            meta_tag: Some(DeclarationId(2017)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -37495,23 +37495,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "read".to_string(),
-                        ty: DeclarationId(2017),
+                        ty: DeclarationId(2019),
                     },
                     Field {
                         label: "sequential".to_string(),
-                        ty: DeclarationId(2018),
+                        ty: DeclarationId(2020),
                     },
                     Field {
                         label: "branch".to_string(),
-                        ty: DeclarationId(2019),
+                        ty: DeclarationId(2021),
                     },
                     Field {
                         label: "iterate".to_string(),
-                        ty: DeclarationId(2020),
+                        ty: DeclarationId(2022),
                     },
                     Field {
                         label: "validate".to_string(),
-                        ty: DeclarationId(2021),
+                        ty: DeclarationId(2023),
                     },
                 ],
             },
@@ -37546,11 +37546,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DeclarationScope".to_string(),
-                        ty: DeclarationId(2022),
+                        ty: DeclarationId(2024),
                     },
                     Field {
                         label: "NodeScope".to_string(),
-                        ty: DeclarationId(2023),
+                        ty: DeclarationId(2025),
                     },
                 ],
             },
@@ -37570,7 +37570,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Error".to_string(),
-                    ty: DeclarationId(2024),
+                    ty: DeclarationId(2026),
                 }],
             },
             type_params: vec![],
@@ -37590,11 +37590,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "project".to_string(),
-                        ty: DeclarationId(2025),
+                        ty: DeclarationId(2027),
                     },
                     Field {
                         label: "violates".to_string(),
-                        ty: DeclarationId(2026),
+                        ty: DeclarationId(2028),
                     },
                 ],
             },
@@ -37643,11 +37643,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "lens".to_string(),
-                        ty: DeclarationId(2027),
+                        ty: DeclarationId(2029),
                     },
                     Field {
                         label: "enforcement".to_string(),
-                        ty: DeclarationId(2028),
+                        ty: DeclarationId(2030),
                     },
                 ],
             },
@@ -37696,7 +37696,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "enforceable_lens".to_string(),
-                        ty: DeclarationId(2029),
+                        ty: DeclarationId(2031),
                     },
                     Field {
                         label: "section".to_string(),
@@ -37761,7 +37761,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "lens".to_string(),
-                        ty: DeclarationId(2030),
+                        ty: DeclarationId(2032),
                     },
                     Field {
                         label: "section".to_string(),
@@ -37804,11 +37804,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Miss".to_string(),
-                        ty: DeclarationId(2033),
+                        ty: DeclarationId(2035),
                     },
                     Field {
                         label: "Hit".to_string(),
-                        ty: DeclarationId(2034),
+                        ty: DeclarationId(2036),
                     },
                 ],
             },
@@ -37841,7 +37841,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(2031),
+                output: DeclarationId(2033),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4601, 4611)),
             },
             type_params: vec![],
@@ -37859,7 +37859,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("hit_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(2032),
+                output: DeclarationId(2034),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4654, 4666)),
             },
             type_params: vec![],
@@ -37900,7 +37900,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[*{left}, *{right}]".to_string(),
                             ))],
@@ -37913,7 +37913,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -37955,7 +37955,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -37968,7 +37968,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -38010,7 +38010,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "(len({recv}) == 0)".to_string(),
                             ))],
@@ -38023,7 +38023,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -38067,7 +38067,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "__v3_fold({recv}, {init}, {body})".to_string(),
                             ))],
@@ -38080,7 +38080,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -38124,7 +38124,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[{body} for {item} in {recv}]".to_string(),
                             ))],
@@ -38137,7 +38137,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -38181,7 +38181,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[x for x in {recv} if {arg}(x)]".to_string(),
                             ))],
@@ -38194,7 +38194,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -38238,7 +38238,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "any({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -38251,7 +38251,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -38295,7 +38295,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "all({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -38308,7 +38308,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -38352,7 +38352,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[y for x in {recv} for y in {arg}(x)]".to_string(),
                             ))],
@@ -38365,7 +38365,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -38391,7 +38391,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2035)),
+            meta_tag: Some(DeclarationId(2037)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -38410,7 +38410,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -38423,7 +38423,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -38443,7 +38443,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg}.join({recv})".to_string(),
                             ))],
@@ -38456,7 +38456,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -38476,7 +38476,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}.split({arg})".to_string(),
                             ))],
@@ -38489,7 +38489,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -38511,7 +38511,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[-1] if {recv} else None".to_string(),
                             ))],
@@ -38524,7 +38524,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -38546,7 +38546,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[0] if {recv} else None".to_string(),
                             ))],
@@ -38559,7 +38559,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -38581,7 +38581,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "list(enumerate({recv}))".to_string(),
                             ))],
@@ -38594,7 +38594,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -38616,7 +38616,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[ord(c) for c in {recv}]".to_string(),
                             ))],
@@ -38629,7 +38629,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -38653,7 +38653,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -38666,7 +38666,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -38686,7 +38686,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -38699,7 +38699,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -38721,7 +38721,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "sorted({recv}, key={arg})".to_string(),
                             ))],
@@ -38734,7 +38734,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -38754,7 +38754,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv} + [{arg}]".to_string(),
                             ))],
@@ -38767,7 +38767,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -38787,7 +38787,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1971),
+                            constructor: DeclarationId(1973),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg} in {recv}".to_string(),
                             ))],
@@ -38800,7 +38800,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1970),
+                            constructor: DeclarationId(1972),
                             payload: vec![],
                         },
                     ),
@@ -38853,7 +38853,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "target".to_string(),
-                    ty: DeclarationId(1296),
+                    ty: DeclarationId(1298),
                 }],
             },
             type_params: vec![],
@@ -38898,23 +38898,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LiteralValue".to_string(),
-                        ty: DeclarationId(2037),
+                        ty: DeclarationId(2039),
                     },
                     Field {
                         label: "RecordValue".to_string(),
-                        ty: DeclarationId(2039),
+                        ty: DeclarationId(2041),
                     },
                     Field {
                         label: "VariantValue".to_string(),
-                        ty: DeclarationId(2040),
+                        ty: DeclarationId(2042),
                     },
                     Field {
                         label: "NodeRef".to_string(),
-                        ty: DeclarationId(2041),
+                        ty: DeclarationId(2043),
                     },
                     Field {
                         label: "CardinalityValue".to_string(),
-                        ty: DeclarationId(2042),
+                        ty: DeclarationId(2044),
                     },
                 ],
             },
@@ -38967,7 +38967,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bindings".to_string(),
-                    ty: DeclarationId(2043),
+                    ty: DeclarationId(2045),
                 }],
             },
             type_params: vec![],
@@ -38986,7 +38986,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "frames".to_string(),
-                    ty: DeclarationId(2044),
+                    ty: DeclarationId(2046),
                 }],
             },
             type_params: vec![],
@@ -39024,7 +39024,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "ApplicativeOrder".to_string(),
-                    ty: DeclarationId(2045),
+                    ty: DeclarationId(2047),
                 }],
             },
             type_params: vec![],
@@ -39044,11 +39044,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LeftFirst".to_string(),
-                        ty: DeclarationId(2046),
+                        ty: DeclarationId(2048),
                     },
                     Field {
                         label: "RightFirst".to_string(),
-                        ty: DeclarationId(2047),
+                        ty: DeclarationId(2049),
                     },
                 ],
             },
@@ -39099,7 +39099,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1169),
             name: Some("evaluate".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(721), DeclarationId(2036)],
+                inputs: vec![DeclarationId(828), DeclarationId(721), DeclarationId(2038)],
                 output: DeclarationId(1160),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/runtime.dag", 11265, 11284)),
             },
@@ -39113,11 +39113,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/runtime.dag", 11196, 11284),
         });
-        declarations.push(Declaration { id: DeclarationId(1170), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(263)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1972), payload: vec![FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __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(1970), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3555, 4208) });
-        declarations.push(Declaration { id: DeclarationId(1171), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(249)))])), ("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(1972), 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(1970), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4210, 4705) });
-        declarations.push(Declaration { id: DeclarationId(1172), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(248)))])), ("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(1972), 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(1970), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4707, 5196) });
-        declarations.push(Declaration { id: DeclarationId(1173), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(265)))])), ("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(1972), 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(1970), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5198, 5729) });
-        declarations.push(Declaration { id: DeclarationId(1174), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(1054) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2048)), 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(258)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1971), 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(1970), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(271)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1971), 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(1970), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(295)))])), ("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(1971), 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(1970), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(273)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1971), 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(1970), 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}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1971), 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(1970), 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}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1971), 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(1970), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(252)))])), ("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(1971), 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(1970), payload: vec![] })]), FieldValue::Reference(DeclarationId(1170)), FieldValue::Reference(DeclarationId(1171)), FieldValue::Reference(DeclarationId(1172)), FieldValue::Reference(DeclarationId(1173)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(293)))])), ("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(1971), 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(1970), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(299)))])), ("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(1971), 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(1970), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5732, 8453) });
+        declarations.push(Declaration { id: DeclarationId(1170), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(263)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1974), payload: vec![FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __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(1972), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3555, 4208) });
+        declarations.push(Declaration { id: DeclarationId(1171), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(249)))])), ("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(1974), 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(1972), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4210, 4705) });
+        declarations.push(Declaration { id: DeclarationId(1172), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(248)))])), ("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(1974), 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(1972), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4707, 5196) });
+        declarations.push(Declaration { id: DeclarationId(1173), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(265)))])), ("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(1974), 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(1972), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5198, 5729) });
+        declarations.push(Declaration { id: DeclarationId(1174), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(1054) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2050)), 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(258)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1973), 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(1972), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(271)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1973), 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(1972), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(295)))])), ("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(1973), 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(1972), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(273)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1973), 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(1972), 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}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1973), 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(1972), 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}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1973), 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(1972), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(252)))])), ("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(1973), 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(1972), payload: vec![] })]), FieldValue::Reference(DeclarationId(1170)), FieldValue::Reference(DeclarationId(1171)), FieldValue::Reference(DeclarationId(1172)), FieldValue::Reference(DeclarationId(1173)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(293)))])), ("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(1973), 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(1972), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(299)))])), ("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(1973), 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(1972), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5732, 8453) });
         declarations.push(Declaration {
             id: DeclarationId(1175),
             name: Some("InputField".to_string()),
@@ -39163,7 +39163,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "decl".to_string(),
-                    ty: DeclarationId(1296),
+                    ty: DeclarationId(1298),
                 }],
             },
             type_params: vec![],
@@ -39187,7 +39187,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(2049),
+                        ty: DeclarationId(2051),
                     },
                     Field {
                         label: "endpoint".to_string(),
@@ -39209,12 +39209,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1179),
             name: Some("modeled_gunbc_ci_workflow".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1356),
+                template: DeclarationId(1358),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1356)),
+            meta_tag: Some(DeclarationId(1358)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -39231,7 +39231,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("ci_demo_timing_read".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2050),
+                output: DeclarationId(2052),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(597))),
             },
             type_params: vec![],
@@ -39249,7 +39249,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("ci_wad_modeled_workflow_timing_witness".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2051),
+                output: DeclarationId(2053),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(599))),
             },
             type_params: vec![],
@@ -39267,7 +39267,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_seed_list_declaration_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2052),
+                output: DeclarationId(2054),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(601))),
             },
             type_params: vec![],
@@ -39285,7 +39285,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_seed_list_behavior_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2053),
+                output: DeclarationId(2055),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(603))),
             },
             type_params: vec![],
@@ -39303,7 +39303,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_seed_list_dagport_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2054),
+                output: DeclarationId(2056),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(605))),
             },
             type_params: vec![],
@@ -39321,7 +39321,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_seed_list_cluster_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2055),
+                output: DeclarationId(2057),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(607))),
             },
             type_params: vec![],
@@ -39339,7 +39339,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_empty_list_diagnostic".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2056),
+                output: DeclarationId(2058),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(609))),
             },
             type_params: vec![],
@@ -39357,7 +39357,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_empty_list_witness_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2058),
+                output: DeclarationId(2060),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(611))),
             },
             type_params: vec![],
@@ -39375,7 +39375,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_witnesses_singleton_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1222)],
-                output: DeclarationId(2060),
+                output: DeclarationId(2062),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(615))),
             },
             type_params: vec![],
@@ -39393,7 +39393,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_violations_singleton".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(982)],
-                output: DeclarationId(2061),
+                output: DeclarationId(2063),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(618))),
             },
             type_params: vec![],
@@ -39411,7 +39411,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_dimension_ok_tm_payload".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1222)],
-                output: DeclarationId(2062),
+                output: DeclarationId(2064),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(622))),
             },
             type_params: vec![],
@@ -39429,7 +39429,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_dimension_fail_tm_payload".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1222), DeclarationId(982)],
-                output: DeclarationId(2063),
+                output: DeclarationId(2065),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(627))),
             },
             type_params: vec![],
@@ -39447,7 +39447,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("report_dim_ok_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(1222)],
-                output: DeclarationId(2064),
+                output: DeclarationId(2066),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(634))),
             },
             type_params: vec![],
@@ -39465,7 +39465,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("report_dim_fail_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(1222), DeclarationId(982)],
-                output: DeclarationId(2065),
+                output: DeclarationId(2067),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(641))),
             },
             type_params: vec![],
@@ -39483,7 +39483,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("report_inhabits_branch_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(1222), DeclarationId(986)],
-                output: DeclarationId(2066),
+                output: DeclarationId(2068),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(646))),
             },
             type_params: vec![],
@@ -39500,8 +39500,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1195),
             name: Some("dimension_report_tm_from_witness".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(2067)],
-                output: DeclarationId(2068),
+                inputs: vec![DeclarationId(828), DeclarationId(2069)],
+                output: DeclarationId(2070),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(656))),
             },
             type_params: vec![],
@@ -39519,7 +39519,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("demo_ci_modeled_timing_dimension_report".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2069),
+                output: DeclarationId(2071),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(664))),
             },
             type_params: vec![],
@@ -39539,15 +39539,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Strict".to_string(),
-                        ty: DeclarationId(2099),
+                        ty: DeclarationId(2101),
                     },
                     Field {
                         label: "NonIncreasing".to_string(),
-                        ty: DeclarationId(2100),
+                        ty: DeclarationId(2102),
                     },
                     Field {
                         label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2101),
+                        ty: DeclarationId(2103),
                     },
                 ],
             },
@@ -39649,8 +39649,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1202),
             name: Some("optional_evidence_meet".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2091), DeclarationId(2092)],
-                output: DeclarationId(2093),
+                inputs: vec![DeclarationId(2093), DeclarationId(2094)],
+                output: DeclarationId(2095),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2488,
@@ -39671,8 +39671,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1203),
             name: Some("map_evidence_merge_at".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2094), DeclarationId(230), DeclarationId(1197)],
-                output: DeclarationId(2095),
+                inputs: vec![DeclarationId(2096), DeclarationId(230), DeclarationId(1197)],
+                output: DeclarationId(2097),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2833,
@@ -39696,23 +39696,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "TreeSize".to_string(),
-                        ty: DeclarationId(2102),
+                        ty: DeclarationId(2104),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(2103),
+                        ty: DeclarationId(2105),
                     },
                     Field {
                         label: "ArithmeticValue".to_string(),
-                        ty: DeclarationId(2104),
+                        ty: DeclarationId(2106),
                     },
                     Field {
                         label: "TokenPosition".to_string(),
-                        ty: DeclarationId(2105),
+                        ty: DeclarationId(2107),
                     },
                     Field {
                         label: "SetCardinality".to_string(),
-                        ty: DeclarationId(2106),
+                        ty: DeclarationId(2108),
                     },
                 ],
             },
@@ -39733,11 +39733,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "OneStep".to_string(),
-                        ty: DeclarationId(2107),
+                        ty: DeclarationId(2109),
                     },
                     Field {
                         label: "AdditionalStep".to_string(),
-                        ty: DeclarationId(2108),
+                        ty: DeclarationId(2110),
                     },
                 ],
             },
@@ -39780,11 +39780,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DivideByTwo".to_string(),
-                        ty: DeclarationId(2109),
+                        ty: DeclarationId(2111),
                     },
                     Field {
                         label: "StrictlyLarger".to_string(),
-                        ty: DeclarationId(2110),
+                        ty: DeclarationId(2112),
                     },
                 ],
             },
@@ -39847,7 +39847,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(93)],
-                output: DeclarationId(2096),
+                output: DeclarationId(2098),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     6420,
@@ -39869,7 +39869,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(93)],
-                output: DeclarationId(2097),
+                output: DeclarationId(2099),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     6860,
@@ -39893,31 +39893,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ChildAccessor".to_string(),
-                        ty: DeclarationId(2111),
+                        ty: DeclarationId(2113),
                     },
                     Field {
                         label: "ListShrink".to_string(),
-                        ty: DeclarationId(2112),
+                        ty: DeclarationId(2114),
                     },
                     Field {
                         label: "ArithmeticSubtractDescent".to_string(),
-                        ty: DeclarationId(2113),
+                        ty: DeclarationId(2115),
                     },
                     Field {
                         label: "ArithmeticDivideDescent".to_string(),
-                        ty: DeclarationId(2114),
+                        ty: DeclarationId(2116),
                     },
                     Field {
                         label: "ParserAdvance".to_string(),
-                        ty: DeclarationId(2115),
+                        ty: DeclarationId(2117),
                     },
                     Field {
                         label: "SetRemoval".to_string(),
-                        ty: DeclarationId(2116),
+                        ty: DeclarationId(2118),
                     },
                     Field {
                         label: "FoldIteration".to_string(),
-                        ty: DeclarationId(2117),
+                        ty: DeclarationId(2119),
                     },
                 ],
             },
@@ -39937,7 +39937,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "dimensions".to_string(),
-                    ty: DeclarationId(2118),
+                    ty: DeclarationId(2120),
                 }],
             },
             type_params: vec![],
@@ -39965,7 +39965,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "evidence".to_string(),
-                        ty: DeclarationId(2119),
+                        ty: DeclarationId(2121),
                     },
                 ],
             },
@@ -39985,7 +39985,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Strict".to_string(),
-                    ty: DeclarationId(2120),
+                    ty: DeclarationId(2122),
                 }],
             },
             type_params: vec![],
@@ -40005,11 +40005,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NonIncreasing".to_string(),
-                        ty: DeclarationId(2121),
+                        ty: DeclarationId(2123),
                     },
                     Field {
                         label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2122),
+                        ty: DeclarationId(2124),
                     },
                 ],
             },
@@ -40030,11 +40030,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "EvidenceUnknown".to_string(),
-                        ty: DeclarationId(2123),
+                        ty: DeclarationId(2125),
                     },
                     Field {
                         label: "EvidenceIncomplete".to_string(),
-                        ty: DeclarationId(2124),
+                        ty: DeclarationId(2126),
                     },
                 ],
             },
@@ -40063,7 +40063,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "per_path".to_string(),
-                        ty: DeclarationId(2125),
+                        ty: DeclarationId(2127),
                     },
                 ],
             },
@@ -40082,7 +40082,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("descent_execution_proof".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(724), DeclarationId(722)],
-                output: DeclarationId(2098),
+                output: DeclarationId(2100),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     12400,
@@ -40143,19 +40143,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Observed".to_string(),
-                        ty: DeclarationId(2128),
+                        ty: DeclarationId(2130),
                     },
                     Field {
                         label: "Unobserved".to_string(),
-                        ty: DeclarationId(2129),
+                        ty: DeclarationId(2131),
                     },
                     Field {
                         label: "Ambiguous".to_string(),
-                        ty: DeclarationId(2130),
+                        ty: DeclarationId(2132),
                     },
                     Field {
                         label: "Stale".to_string(),
-                        ty: DeclarationId(2131),
+                        ty: DeclarationId(2133),
                     },
                 ],
             },
@@ -40220,7 +40220,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "observations".to_string(),
-                    ty: DeclarationId(2132),
+                    ty: DeclarationId(2134),
                 }],
             },
             type_params: vec![],
@@ -40410,7 +40410,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("timing_lens_empty_corrections".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2126),
+                output: DeclarationId(2128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(714))),
             },
             type_params: vec![],
@@ -40518,7 +40518,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("timing_lens_read".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2127),
+                output: DeclarationId(2129),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(793))),
             },
             type_params: vec![],
@@ -40556,183 +40556,183 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2144),
+                        ty: DeclarationId(2146),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2145),
+                        ty: DeclarationId(2147),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2146),
+                        ty: DeclarationId(2148),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2147),
+                        ty: DeclarationId(2149),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2148),
+                        ty: DeclarationId(2150),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2149),
+                        ty: DeclarationId(2151),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2150),
+                        ty: DeclarationId(2152),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2151),
+                        ty: DeclarationId(2153),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2152),
+                        ty: DeclarationId(2154),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2153),
+                        ty: DeclarationId(2155),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2154),
+                        ty: DeclarationId(2156),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2155),
+                        ty: DeclarationId(2157),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2156),
+                        ty: DeclarationId(2158),
                     },
                     Field {
                         label: "Ident".to_string(),
-                        ty: DeclarationId(2157),
+                        ty: DeclarationId(2159),
                     },
                     Field {
                         label: "IntLit".to_string(),
-                        ty: DeclarationId(2158),
+                        ty: DeclarationId(2160),
                     },
                     Field {
                         label: "StringLit".to_string(),
-                        ty: DeclarationId(2159),
+                        ty: DeclarationId(2161),
                     },
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2160),
+                        ty: DeclarationId(2162),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2161),
+                        ty: DeclarationId(2163),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2162),
+                        ty: DeclarationId(2164),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2163),
+                        ty: DeclarationId(2165),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2164),
+                        ty: DeclarationId(2166),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2165),
+                        ty: DeclarationId(2167),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2166),
+                        ty: DeclarationId(2168),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2167),
+                        ty: DeclarationId(2169),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2168),
+                        ty: DeclarationId(2170),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2169),
+                        ty: DeclarationId(2171),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2170),
+                        ty: DeclarationId(2172),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2171),
+                        ty: DeclarationId(2173),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2172),
+                        ty: DeclarationId(2174),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2173),
+                        ty: DeclarationId(2175),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2174),
+                        ty: DeclarationId(2176),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2175),
+                        ty: DeclarationId(2177),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2176),
+                        ty: DeclarationId(2178),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2177),
+                        ty: DeclarationId(2179),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2178),
+                        ty: DeclarationId(2180),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2179),
+                        ty: DeclarationId(2181),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2180),
+                        ty: DeclarationId(2182),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2181),
+                        ty: DeclarationId(2183),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2182),
+                        ty: DeclarationId(2184),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2183),
+                        ty: DeclarationId(2185),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2184),
+                        ty: DeclarationId(2186),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2185),
+                        ty: DeclarationId(2187),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2186),
+                        ty: DeclarationId(2188),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2187),
+                        ty: DeclarationId(2189),
                     },
                     Field {
                         label: "Eof".to_string(),
-                        ty: DeclarationId(2188),
+                        ty: DeclarationId(2190),
                     },
                 ],
             },
@@ -40778,55 +40778,55 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2189),
+                        ty: DeclarationId(2191),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2190),
+                        ty: DeclarationId(2192),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2191),
+                        ty: DeclarationId(2193),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2192),
+                        ty: DeclarationId(2194),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2193),
+                        ty: DeclarationId(2195),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2194),
+                        ty: DeclarationId(2196),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2195),
+                        ty: DeclarationId(2197),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2196),
+                        ty: DeclarationId(2198),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2197),
+                        ty: DeclarationId(2199),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2198),
+                        ty: DeclarationId(2200),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2199),
+                        ty: DeclarationId(2201),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2200),
+                        ty: DeclarationId(2202),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2201),
+                        ty: DeclarationId(2203),
                     },
                 ],
             },
@@ -40847,115 +40847,115 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2202),
+                        ty: DeclarationId(2204),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2203),
+                        ty: DeclarationId(2205),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2204),
+                        ty: DeclarationId(2206),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2205),
+                        ty: DeclarationId(2207),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2206),
+                        ty: DeclarationId(2208),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2207),
+                        ty: DeclarationId(2209),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2208),
+                        ty: DeclarationId(2210),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2209),
+                        ty: DeclarationId(2211),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2210),
+                        ty: DeclarationId(2212),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2211),
+                        ty: DeclarationId(2213),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2212),
+                        ty: DeclarationId(2214),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2213),
+                        ty: DeclarationId(2215),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2214),
+                        ty: DeclarationId(2216),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2215),
+                        ty: DeclarationId(2217),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2216),
+                        ty: DeclarationId(2218),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2217),
+                        ty: DeclarationId(2219),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2218),
+                        ty: DeclarationId(2220),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2219),
+                        ty: DeclarationId(2221),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2220),
+                        ty: DeclarationId(2222),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2221),
+                        ty: DeclarationId(2223),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2222),
+                        ty: DeclarationId(2224),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2223),
+                        ty: DeclarationId(2225),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2224),
+                        ty: DeclarationId(2226),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2225),
+                        ty: DeclarationId(2227),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2226),
+                        ty: DeclarationId(2228),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2227),
+                        ty: DeclarationId(2229),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2228),
+                        ty: DeclarationId(2230),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2229),
+                        ty: DeclarationId(2231),
                     },
                 ],
             },
@@ -41134,7 +41134,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(1255),
-            name: Some("CompilerStdPositiveSetRatchet".to_string()),
+            name: Some("BinShimFilesSubsetPredicate".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -41144,11 +41144,11 @@ 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", 2140, 2177),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2168, 2203),
         });
         declarations.push(Declaration {
             id: DeclarationId(1256),
-            name: Some("compiler_std_positive_set_ratchet".to_string()),
+            name: Some("bin_shim_files_subset_predicate".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1255),
                 arguments: vec![],
@@ -41161,52 +41161,83 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: Some(ValueBody::Structural { fields: vec![] }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2179, 2253),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2205, 2275),
         });
         declarations.push(Declaration {
             id: DeclarationId(1257),
+            name: Some("CompilerStdPositiveSetRatchet".to_string()),
+            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", 2354, 2391),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1258),
+            name: Some("compiler_std_positive_set_ratchet".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1257),
+                arguments: vec![],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: Some(DeclarationId(1257)),
+            specialization_parent: None,
+            inhabits: None,
+            value_body: Some(ValueBody::Structural { fields: vec![] }),
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/verification.dag", 2393, 2467),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1259),
             name: Some("DiagnosticKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-                        ty: DeclarationId(2233),
+                        ty: DeclarationId(2235),
                     },
                     Field {
                         label: "ParseError".to_string(),
-                        ty: DeclarationId(2234),
+                        ty: DeclarationId(2236),
                     },
                     Field {
                         label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(2235),
+                        ty: DeclarationId(2237),
                     },
                     Field {
                         label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(2236),
+                        ty: DeclarationId(2238),
                     },
                     Field {
                         label: "ResolveError".to_string(),
-                        ty: DeclarationId(2237),
+                        ty: DeclarationId(2239),
                     },
                     Field {
                         label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(2238),
+                        ty: DeclarationId(2240),
                     },
                     Field {
                         label: "BranchConditionNotBool".to_string(),
-                        ty: DeclarationId(2239),
+                        ty: DeclarationId(2241),
                     },
                     Field {
                         label: "MagnitudeOutOfRange".to_string(),
-                        ty: DeclarationId(2240),
+                        ty: DeclarationId(2242),
                     },
                     Field {
                         label: "MalformedIntegerRangeFact".to_string(),
-                        ty: DeclarationId(2241),
+                        ty: DeclarationId(2243),
                     },
                     Field {
                         label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(2242),
+                        ty: DeclarationId(2244),
                     },
                 ],
             },
@@ -41218,20 +41249,20 @@ 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", 2588, 2819),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2802, 3033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1258),
+            id: DeclarationId(1260),
             name: Some("DiagnosticDetailExpectation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "AnyDetail".to_string(),
-                        ty: DeclarationId(2243),
+                        ty: DeclarationId(2245),
                     },
                     Field {
                         label: "Contains".to_string(),
-                        ty: DeclarationId(2244),
+                        ty: DeclarationId(2246),
                     },
                 ],
             },
@@ -41243,20 +41274,20 @@ 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", 3188, 3255),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3402, 3469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1259),
+            id: DeclarationId(1261),
             name: Some("DiagnosticReference".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(1257),
+                        ty: DeclarationId(1259),
                     },
                     Field {
                         label: "detail_contains".to_string(),
-                        ty: DeclarationId(1258),
+                        ty: DeclarationId(1260),
                     },
                 ],
             },
@@ -41268,20 +41299,20 @@ 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", 3399, 3497),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3613, 3711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1260),
+            id: DeclarationId(1262),
             name: Some("PortStateExpectation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(2245),
+                        ty: DeclarationId(2247),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(2246),
+                        ty: DeclarationId(2248),
                     },
                 ],
             },
@@ -41293,15 +41324,15 @@ 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", 3884, 3937),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4098, 4151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1261),
+            id: DeclarationId(1263),
             name: Some("PerfBudgetComparisonOp".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "AtMostBudget".to_string(),
-                    ty: DeclarationId(2247),
+                    ty: DeclarationId(2249),
                 }],
             },
             type_params: vec![],
@@ -41312,24 +41343,24 @@ 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", 4130, 4174),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4344, 4388),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1262),
+            id: DeclarationId(1264),
             name: Some("AlgebraicLawKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Associativity".to_string(),
-                        ty: DeclarationId(2248),
+                        ty: DeclarationId(2250),
                     },
                     Field {
                         label: "Commutativity".to_string(),
-                        ty: DeclarationId(2249),
+                        ty: DeclarationId(2251),
                     },
                     Field {
                         label: "Identity".to_string(),
-                        ty: DeclarationId(2250),
+                        ty: DeclarationId(2252),
                     },
                 ],
             },
@@ -41341,15 +41372,15 @@ 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", 4963, 5033),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5177, 5247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1263),
+            id: DeclarationId(1265),
             name: Some("ProgramGenerator".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "generator".to_string(),
-                    ty: DeclarationId(1296),
+                    ty: DeclarationId(1298),
                 }],
             },
             type_params: vec![],
@@ -41360,15 +41391,15 @@ 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", 5270, 5323),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5484, 5537),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1264),
+            id: DeclarationId(1266),
             name: Some("ProgramShape".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "LiteralProgram".to_string(),
-                    ty: DeclarationId(2251),
+                    ty: DeclarationId(2253),
                 }],
             },
             type_params: vec![],
@@ -41379,15 +41410,15 @@ 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", 5556, 5645),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5770, 5859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1265),
+            id: DeclarationId(1267),
             name: Some("SymbolicCostBindParamExpected".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "LinearCostForBindParam".to_string(),
-                    ty: DeclarationId(2252),
+                    ty: DeclarationId(2254),
                 }],
             },
             type_params: vec![],
@@ -41398,15 +41429,15 @@ 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", 5647, 5739),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5861, 5953),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1266),
+            id: DeclarationId(1268),
             name: Some("BindParamSizeVariable".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "SelectedBindParamSizeVariable".to_string(),
-                    ty: DeclarationId(2253),
+                    ty: DeclarationId(2255),
                 }],
             },
             type_params: vec![],
@@ -41417,10 +41448,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", 5741, 5801),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5955, 6015),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1267),
+            id: DeclarationId(1269),
             name: Some("BindParamRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -41436,20 +41467,20 @@ 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", 5803, 5837),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6017, 6051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1268),
+            id: DeclarationId(1270),
             name: Some("LensCapabilityStructuralStatus".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "LensCapabilityStructuralTerminal".to_string(),
-                        ty: DeclarationId(2254),
+                        ty: DeclarationId(2256),
                     },
                     Field {
                         label: "LensCapabilityStructuralPartial".to_string(),
-                        ty: DeclarationId(2255),
+                        ty: DeclarationId(2257),
                     },
                 ],
             },
@@ -41461,28 +41492,28 @@ 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", 6363, 6471),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6577, 6685),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1269),
+            id: DeclarationId(1271),
             name: Some("LensCapabilityBehavioralStatus".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "LensCapabilityBehavioralComplete".to_string(),
-                        ty: DeclarationId(2256),
+                        ty: DeclarationId(2258),
                     },
                     Field {
                         label: "LensCapabilityBehavioralPartial".to_string(),
-                        ty: DeclarationId(2257),
+                        ty: DeclarationId(2259),
                     },
                     Field {
                         label: "LensCapabilityBehavioralStub".to_string(),
-                        ty: DeclarationId(2258),
+                        ty: DeclarationId(2260),
                     },
                     Field {
                         label: "LensCapabilityBehavioralNA".to_string(),
-                        ty: DeclarationId(2259),
+                        ty: DeclarationId(2261),
                     },
                 ],
             },
@@ -41494,24 +41525,24 @@ 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", 6473, 6645),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6687, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1270),
+            id: DeclarationId(1272),
             name: Some("LensCapabilityV2Counterpart".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "LensCapabilityV2RealV2".to_string(),
-                        ty: DeclarationId(2260),
+                        ty: DeclarationId(2262),
                     },
                     Field {
                         label: "LensCapabilityV2NoneV3Native".to_string(),
-                        ty: DeclarationId(2261),
+                        ty: DeclarationId(2263),
                     },
                     Field {
                         label: "LensCapabilityV2NotApplicable".to_string(),
-                        ty: DeclarationId(2262),
+                        ty: DeclarationId(2264),
                     },
                 ],
             },
@@ -41523,10 +41554,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", 6647, 6773),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6861, 6987),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1271),
+            id: DeclarationId(1273),
             name: Some("LensCapabilityRegisterRow".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -41536,15 +41567,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "structural".to_string(),
-                        ty: DeclarationId(1268),
+                        ty: DeclarationId(1270),
                     },
                     Field {
                         label: "behavioral".to_string(),
-                        ty: DeclarationId(1269),
+                        ty: DeclarationId(1271),
                     },
                     Field {
                         label: "v2_counterpart".to_string(),
-                        ty: DeclarationId(1270),
+                        ty: DeclarationId(1272),
                     },
                 ],
             },
@@ -41556,21 +41587,21 @@ 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", 6775, 6969),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6989, 7183),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1272),
+            id: DeclarationId(1274),
             name: Some("lens_capability_register_rows".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1271),
+                    value: DeclarationId(1273),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2302)),
+            meta_tag: Some(DeclarationId(2304)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -41582,21 +41613,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2254),
+                            constructor: DeclarationId(2256),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2256),
+                            constructor: DeclarationId(2258),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2260),
+                            constructor: DeclarationId(2262),
                             payload: vec![],
                         },
                     ),
@@ -41609,21 +41640,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2254),
+                            constructor: DeclarationId(2256),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2256),
+                            constructor: DeclarationId(2258),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2260),
+                            constructor: DeclarationId(2262),
                             payload: vec![],
                         },
                     ),
@@ -41638,21 +41669,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2254),
+                            constructor: DeclarationId(2256),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2259),
+                            constructor: DeclarationId(2261),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2261),
+                            constructor: DeclarationId(2263),
                             payload: vec![],
                         },
                     ),
@@ -41667,21 +41698,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2254),
+                            constructor: DeclarationId(2256),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2257),
+                            constructor: DeclarationId(2259),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2261),
+                            constructor: DeclarationId(2263),
                             payload: vec![],
                         },
                     ),
@@ -41694,21 +41725,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2254),
+                            constructor: DeclarationId(2256),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2256),
+                            constructor: DeclarationId(2258),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2261),
+                            constructor: DeclarationId(2263),
                             payload: vec![],
                         },
                     ),
@@ -41721,21 +41752,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2254),
+                            constructor: DeclarationId(2256),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2257),
+                            constructor: DeclarationId(2259),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2261),
+                            constructor: DeclarationId(2263),
                             payload: vec![],
                         },
                     ),
@@ -41748,21 +41779,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2254),
+                            constructor: DeclarationId(2256),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2256),
+                            constructor: DeclarationId(2258),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2261),
+                            constructor: DeclarationId(2263),
                             payload: vec![],
                         },
                     ),
@@ -41777,21 +41808,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2254),
+                            constructor: DeclarationId(2256),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2256),
+                            constructor: DeclarationId(2258),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2261),
+                            constructor: DeclarationId(2263),
                             payload: vec![],
                         },
                     ),
@@ -41804,21 +41835,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2254),
+                            constructor: DeclarationId(2256),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2256),
+                            constructor: DeclarationId(2258),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2261),
+                            constructor: DeclarationId(2263),
                             payload: vec![],
                         },
                     ),
@@ -41833,21 +41864,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2254),
+                            constructor: DeclarationId(2256),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2256),
+                            constructor: DeclarationId(2258),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2261),
+                            constructor: DeclarationId(2263),
                             payload: vec![],
                         },
                     ),
@@ -41860,21 +41891,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2255),
+                            constructor: DeclarationId(2257),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2259),
+                            constructor: DeclarationId(2261),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2262),
+                            constructor: DeclarationId(2264),
                             payload: vec![],
                         },
                     ),
@@ -41887,21 +41918,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2255),
+                            constructor: DeclarationId(2257),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2259),
+                            constructor: DeclarationId(2261),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2262),
+                            constructor: DeclarationId(2264),
                             payload: vec![],
                         },
                     ),
@@ -41916,21 +41947,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2254),
+                            constructor: DeclarationId(2256),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2259),
+                            constructor: DeclarationId(2261),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2262),
+                            constructor: DeclarationId(2264),
                             payload: vec![],
                         },
                     ),
@@ -41938,116 +41969,116 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ])),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 6971, 9558),
+            span: SourceSpan::new("src/v3/std/verification.dag", 7185, 9772),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1273),
+            id: DeclarationId(1275),
             name: Some("TestPredicate".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Compiles".to_string(),
-                        ty: DeclarationId(2263),
+                        ty: DeclarationId(2265),
                     },
                     Field {
                         label: "FailsWithDiagnostic".to_string(),
-                        ty: DeclarationId(2264),
+                        ty: DeclarationId(2266),
                     },
                     Field {
                         label: "OutputEquals".to_string(),
-                        ty: DeclarationId(2265),
+                        ty: DeclarationId(2267),
                     },
                     Field {
                         label: "PortHasState".to_string(),
-                        ty: DeclarationId(2266),
+                        ty: DeclarationId(2268),
                     },
                     Field {
                         label: "DeclarationHasRefinement".to_string(),
-                        ty: DeclarationId(2267),
+                        ty: DeclarationId(2269),
                     },
                     Field {
                         label: "CostBounded".to_string(),
-                        ty: DeclarationId(2268),
+                        ty: DeclarationId(2270),
                     },
                     Field {
                         label: "BehavioralObservation".to_string(),
-                        ty: DeclarationId(2269),
+                        ty: DeclarationId(2271),
                     },
                     Field {
                         label: "MockBackedInvariant".to_string(),
-                        ty: DeclarationId(2270),
+                        ty: DeclarationId(2272),
                     },
                     Field {
                         label: "ExecuteCommand".to_string(),
-                        ty: DeclarationId(2272),
+                        ty: DeclarationId(2274),
                     },
                     Field {
                         label: "ForAllTargets".to_string(),
-                        ty: DeclarationId(2274),
+                        ty: DeclarationId(2276),
                     },
                     Field {
                         label: "LensOutputEquals".to_string(),
-                        ty: DeclarationId(2275),
+                        ty: DeclarationId(2277),
                     },
                     Field {
                         label: "DifferentialEquals".to_string(),
-                        ty: DeclarationId(2276),
+                        ty: DeclarationId(2278),
                     },
                     Field {
                         label: "SymbolicCostExprEquals".to_string(),
-                        ty: DeclarationId(2277),
+                        ty: DeclarationId(2279),
                     },
                     Field {
                         label: "SymbolicCostExprEqualsForBindParam".to_string(),
-                        ty: DeclarationId(2278),
+                        ty: DeclarationId(2280),
                     },
                     Field {
                         label: "PerfWithinBaseline".to_string(),
-                        ty: DeclarationId(2279),
+                        ty: DeclarationId(2281),
                     },
                     Field {
                         label: "BinaryDimensionReportEquals".to_string(),
-                        ty: DeclarationId(2280),
+                        ty: DeclarationId(2282),
                     },
                     Field {
                         label: "AlgebraicLaw".to_string(),
-                        ty: DeclarationId(2281),
+                        ty: DeclarationId(2283),
                     },
                     Field {
                         label: "CensusBoundCheck".to_string(),
-                        ty: DeclarationId(2282),
+                        ty: DeclarationId(2284),
                     },
                     Field {
                         label: "CensusSubsetCount".to_string(),
-                        ty: DeclarationId(2283),
+                        ty: DeclarationId(2285),
                     },
                     Field {
                         label: "FixedPointConverges".to_string(),
-                        ty: DeclarationId(2284),
+                        ty: DeclarationId(2286),
                     },
                     Field {
                         label: "RatchetZero".to_string(),
-                        ty: DeclarationId(2285),
+                        ty: DeclarationId(2287),
                     },
                     Field {
                         label: "GeneratedFromDag".to_string(),
-                        ty: DeclarationId(2287),
+                        ty: DeclarationId(2289),
                     },
                     Field {
                         label: "CementingDispatchMatchesProjection".to_string(),
-                        ty: DeclarationId(2288),
+                        ty: DeclarationId(2290),
                     },
                     Field {
                         label: "ReleaseDeferredClaim".to_string(),
-                        ty: DeclarationId(2289),
+                        ty: DeclarationId(2291),
                     },
                     Field {
                         label: "SubstrateResearchDeferredClaim".to_string(),
-                        ty: DeclarationId(2290),
+                        ty: DeclarationId(2292),
                     },
                     Field {
                         label: "BridgeLedgerZero".to_string(),
-                        ty: DeclarationId(2291),
+                        ty: DeclarationId(2293),
                     },
                 ],
             },
@@ -42059,10 +42090,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", 9560, 22453),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9774, 22667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1274),
+            id: DeclarationId(1276),
             name: Some("ProgramInput".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -42073,15 +42104,15 @@ 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", 22561, 22581),
+            span: SourceSpan::new("src/v3/std/verification.dag", 22775, 22795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1275),
+            id: DeclarationId(1277),
             name: Some("ProgramOutputBind".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "output_ref".to_string(),
-                    ty: DeclarationId(1296),
+                    ty: DeclarationId(1298),
                 }],
             },
             type_params: vec![],
@@ -42092,10 +42123,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", 22724, 22779),
+            span: SourceSpan::new("src/v3/std/verification.dag", 22938, 22993),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1276),
+            id: DeclarationId(1278),
             name: Some("TestClaim".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -42113,11 +42144,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "predicate".to_string(),
-                        ty: DeclarationId(1273),
+                        ty: DeclarationId(1275),
                     },
                     Field {
                         label: "requires".to_string(),
-                        ty: DeclarationId(2292),
+                        ty: DeclarationId(2294),
                     },
                 ],
             },
@@ -42129,20 +42160,20 @@ 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", 23389, 23522),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23603, 23736),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1277),
+            id: DeclarationId(1279),
             name: Some("Quantifier".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ForAll".to_string(),
-                        ty: DeclarationId(2293),
+                        ty: DeclarationId(2295),
                     },
                     Field {
                         label: "Exists".to_string(),
-                        ty: DeclarationId(2294),
+                        ty: DeclarationId(2296),
                     },
                 ],
             },
@@ -42154,10 +42185,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", 23703, 23740),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23917, 23954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1278),
+            id: DeclarationId(1280),
             name: Some("QuantifiedTestClaim".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -42167,19 +42198,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "generator".to_string(),
-                        ty: DeclarationId(1263),
+                        ty: DeclarationId(1265),
                     },
                     Field {
                         label: "quantifier".to_string(),
-                        ty: DeclarationId(1277),
+                        ty: DeclarationId(1279),
                     },
                     Field {
                         label: "predicate".to_string(),
-                        ty: DeclarationId(1273),
+                        ty: DeclarationId(1275),
                     },
                     Field {
                         label: "requires".to_string(),
-                        ty: DeclarationId(2295),
+                        ty: DeclarationId(2297),
                     },
                 ],
             },
@@ -42191,20 +42222,20 @@ 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", 23742, 23903),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23956, 24117),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1279),
+            id: DeclarationId(1281),
             name: Some("TestNodeRef".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "EnumeratedTestNode".to_string(),
-                        ty: DeclarationId(2296),
+                        ty: DeclarationId(2298),
                     },
                     Field {
                         label: "QuantifiedTestNode".to_string(),
-                        ty: DeclarationId(2297),
+                        ty: DeclarationId(2299),
                     },
                 ],
             },
@@ -42216,16 +42247,16 @@ 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", 25603, 25697),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25817, 25911),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1280),
+            id: DeclarationId(1282),
             name: Some("TestNodeCostDimension".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "node".to_string(),
-                        ty: DeclarationId(1279),
+                        ty: DeclarationId(1281),
                     },
                     Field {
                         label: "budget".to_string(),
@@ -42245,20 +42276,20 @@ 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", 25699, 25802),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25913, 26016),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1281),
+            id: DeclarationId(1283),
             name: Some("SuiteClaim".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Enumerated".to_string(),
-                        ty: DeclarationId(2298),
+                        ty: DeclarationId(2300),
                     },
                     Field {
                         label: "Quantified".to_string(),
-                        ty: DeclarationId(2299),
+                        ty: DeclarationId(2301),
                     },
                 ],
             },
@@ -42270,10 +42301,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", 26535, 26612),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26749, 26826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1282),
+            id: DeclarationId(1284),
             name: Some("TestSuite".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -42283,7 +42314,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "claims".to_string(),
-                        ty: DeclarationId(2300),
+                        ty: DeclarationId(2302),
                     },
                 ],
             },
@@ -42295,10 +42326,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", 26614, 26674),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26828, 26888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1283),
+            id: DeclarationId(1285),
             name: Some("TestObligation".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -42308,7 +42339,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "resources".to_string(),
-                        ty: DeclarationId(2301),
+                        ty: DeclarationId(2303),
                     },
                 ],
             },
@@ -42320,18 +42351,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", 26872, 26953),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27086, 27167),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1284),
+            id: DeclarationId(1286),
             name: Some("claim_obligation_resources".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1276)],
-                output: DeclarationId(2230),
+                inputs: vec![DeclarationId(1278)],
+                output: DeclarationId(2232),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    27395,
-                    27411,
+                    27609,
+                    27625,
                 )),
             },
             type_params: vec![],
@@ -42342,18 +42373,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", 27324, 27411),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27538, 27625),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1285),
+            id: DeclarationId(1287),
             name: Some("obligation_for_claim".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1276)],
-                output: DeclarationId(1283),
+                inputs: vec![DeclarationId(1278)],
+                output: DeclarationId(1285),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    27469,
-                    27554,
+                    27683,
+                    27768,
                 )),
             },
             type_params: vec![],
@@ -42364,18 +42395,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", 27413, 27554),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27627, 27768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1286),
+            id: DeclarationId(1288),
             name: Some("obligation_for_quantified_claim".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1278)],
-                output: DeclarationId(1283),
+                inputs: vec![DeclarationId(1280)],
+                output: DeclarationId(1285),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    27861,
-                    27927,
+                    28075,
+                    28141,
                 )),
             },
             type_params: vec![],
@@ -42386,14 +42417,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", 27784, 27927),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27998, 28141),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1287),
+            id: DeclarationId(1289),
             name: Some("obligation_for_suite_claim".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1281)],
-                output: DeclarationId(1283),
+                inputs: vec![DeclarationId(1283)],
+                output: DeclarationId(1285),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(811))),
             },
             type_params: vec![],
@@ -42404,18 +42435,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", 28232, 28421),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28446, 28635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1288),
+            id: DeclarationId(1290),
             name: Some("materialize_test_obligations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2231)],
-                output: DeclarationId(2232),
+                inputs: vec![DeclarationId(2233)],
+                output: DeclarationId(2234),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    28505,
-                    28550,
+                    28719,
+                    28764,
                 )),
             },
             type_params: vec![],
@@ -42426,14 +42457,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", 28423, 28550),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28637, 28764),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1289),
+            id: DeclarationId(1291),
             name: Some("behavior_spine".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828)],
-                output: DeclarationId(2303),
+                output: DeclarationId(2305),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(813))),
             },
             type_params: vec![],
@@ -42447,7 +42478,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(1290),
+            id: DeclarationId(1292),
             name: Some("ValueBehavior".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -42461,7 +42492,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(1291),
+            id: DeclarationId(1293),
             name: Some("Transform".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -42475,7 +42506,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(1292),
+            id: DeclarationId(1294),
             name: Some("Branch".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -42489,7 +42520,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(1293),
+            id: DeclarationId(1295),
             name: Some("Loop".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -42503,7 +42534,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(1294),
+            id: DeclarationId(1296),
             name: Some("Bind".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -42517,7 +42548,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(1295),
+            id: DeclarationId(1297),
             name: Some("Main".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -42531,7 +42562,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(1296),
+            id: DeclarationId(1298),
             name: Some("DeclarationRef".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -42545,7 +42576,7 @@ 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(1297),
+            id: DeclarationId(1299),
             name: Some("CompilerHostRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -42564,21 +42595,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(1298),
+            id: DeclarationId(1300),
             name: Some("PipelineSnapshotKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "SnapshotSurface".to_string(),
-                        ty: DeclarationId(2304),
+                        ty: DeclarationId(2306),
                     },
                     Field {
                         label: "SnapshotDag".to_string(),
-                        ty: DeclarationId(2305),
+                        ty: DeclarationId(2307),
                     },
                     Field {
                         label: "SnapshotText".to_string(),
-                        ty: DeclarationId(2306),
+                        ty: DeclarationId(2308),
                     },
                 ],
             },
@@ -42593,21 +42624,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(1299),
+            id: DeclarationId(1301),
             name: Some("PipelineStageBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "stage".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "realization".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "snapshot".to_string(),
-                        ty: DeclarationId(1298),
+                        ty: DeclarationId(1300),
                     },
                 ],
             },
@@ -42622,7 +42653,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(1300),
+            id: DeclarationId(1302),
             name: Some("parse_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -42632,7 +42663,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1297)),
+            meta_tag: Some(DeclarationId(1299)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -42646,7 +42677,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(1301),
+            id: DeclarationId(1303),
             name: Some("lower_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -42656,7 +42687,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1297)),
+            meta_tag: Some(DeclarationId(1299)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -42670,7 +42701,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(1302),
+            id: DeclarationId(1304),
             name: Some("infer_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -42680,7 +42711,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1297)),
+            meta_tag: Some(DeclarationId(1299)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -42694,7 +42725,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(1303),
+            id: DeclarationId(1305),
             name: Some("compute_ownership_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -42704,7 +42735,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1297)),
+            meta_tag: Some(DeclarationId(1299)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -42720,7 +42751,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(1304),
+            id: DeclarationId(1306),
             name: Some("emit_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -42730,7 +42761,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1297)),
+            meta_tag: Some(DeclarationId(1299)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -42744,7 +42775,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(1305),
+            id: DeclarationId(1307),
             name: Some("lens_complexity_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -42754,7 +42785,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1297)),
+            meta_tag: Some(DeclarationId(1299)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -42770,31 +42801,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(1306),
+            id: DeclarationId(1308),
             name: Some("parse_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1299),
+                template: DeclarationId(1301),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1299)),
+            meta_tag: Some(DeclarationId(1301)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1312)),
+                        FieldValue::Reference(DeclarationId(1314)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1300)),
+                        FieldValue::Reference(DeclarationId(1302)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2304),
+                            constructor: DeclarationId(2306),
                             payload: vec![],
                         },
                     ),
@@ -42805,31 +42836,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(1307),
+            id: DeclarationId(1309),
             name: Some("lower_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1299),
+                template: DeclarationId(1301),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1299)),
+            meta_tag: Some(DeclarationId(1301)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1313)),
+                        FieldValue::Reference(DeclarationId(1315)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1301)),
+                        FieldValue::Reference(DeclarationId(1303)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2305),
+                            constructor: DeclarationId(2307),
                             payload: vec![],
                         },
                     ),
@@ -42840,31 +42871,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(1308),
+            id: DeclarationId(1310),
             name: Some("infer_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1299),
+                template: DeclarationId(1301),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1299)),
+            meta_tag: Some(DeclarationId(1301)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1314)),
+                        FieldValue::Reference(DeclarationId(1316)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1302)),
+                        FieldValue::Reference(DeclarationId(1304)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2305),
+                            constructor: DeclarationId(2307),
                             payload: vec![],
                         },
                     ),
@@ -42875,31 +42906,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(1309),
+            id: DeclarationId(1311),
             name: Some("compute_ownership_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1299),
+                template: DeclarationId(1301),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1299)),
+            meta_tag: Some(DeclarationId(1301)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1315)),
+                        FieldValue::Reference(DeclarationId(1317)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1303)),
+                        FieldValue::Reference(DeclarationId(1305)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2305),
+                            constructor: DeclarationId(2307),
                             payload: vec![],
                         },
                     ),
@@ -42910,31 +42941,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(1310),
+            id: DeclarationId(1312),
             name: Some("lens_complexity_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1299),
+                template: DeclarationId(1301),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1299)),
+            meta_tag: Some(DeclarationId(1301)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1316)),
+                        FieldValue::Reference(DeclarationId(1318)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1305)),
+                        FieldValue::Reference(DeclarationId(1307)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2305),
+                            constructor: DeclarationId(2307),
                             payload: vec![],
                         },
                     ),
@@ -42945,31 +42976,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(1311),
+            id: DeclarationId(1313),
             name: Some("emit_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1299),
+                template: DeclarationId(1301),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1299)),
+            meta_tag: Some(DeclarationId(1301)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1317)),
+                        FieldValue::Reference(DeclarationId(1319)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1304)),
+                        FieldValue::Reference(DeclarationId(1306)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2306),
+                            constructor: DeclarationId(2308),
                             payload: vec![],
                         },
                     ),
@@ -42980,12 +43011,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(1312),
+            id: DeclarationId(1314),
             name: Some("parse".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230), DeclarationId(230)],
                 output: DeclarationId(828),
-                body: ArrowBody::ExternalRealization(DeclarationId(1300)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1302)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -42998,12 +43029,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(1313),
+            id: DeclarationId(1315),
             name: Some("lower".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828)],
                 output: DeclarationId(828),
-                body: ArrowBody::ExternalRealization(DeclarationId(1301)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1303)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -43016,12 +43047,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(1314),
+            id: DeclarationId(1316),
             name: Some("infer".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828)],
                 output: DeclarationId(828),
-                body: ArrowBody::ExternalRealization(DeclarationId(1302)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1304)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -43034,12 +43065,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(1315),
+            id: DeclarationId(1317),
             name: Some("compute_ownership".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828)],
                 output: DeclarationId(828),
-                body: ArrowBody::ExternalRealization(DeclarationId(1303)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1305)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -43052,12 +43083,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(1316),
+            id: DeclarationId(1318),
             name: Some("lens_complexity".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828)],
                 output: DeclarationId(828),
-                body: ArrowBody::ExternalRealization(DeclarationId(1305)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1307)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -43070,7 +43101,7 @@ 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(1317),
+            id: DeclarationId(1319),
             name: Some("emit".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
@@ -43080,7 +43111,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     DeclarationId(1051),
                 ],
                 output: DeclarationId(230),
-                body: ArrowBody::ExternalRealization(DeclarationId(1304)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1306)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -43093,7 +43124,7 @@ 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(1318),
+            id: DeclarationId(1320),
             name: Some("compile".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230), DeclarationId(230), DeclarationId(1051)],
@@ -43115,11 +43146,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(1319),
+            id: DeclarationId(1321),
             name: Some("from_symbol".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230)],
-                output: DeclarationId(2307),
+                output: DeclarationId(2309),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/compiler/operators.dag",
                     156,
@@ -43137,7 +43168,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(1320),
+            id: DeclarationId(1322),
             name: Some("symbol".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(806)],
@@ -43155,7 +43186,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(1321),
+            id: DeclarationId(1323),
             name: Some("algebra_field_name".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(806)],
@@ -43173,7 +43204,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(1322),
+            id: DeclarationId(1324),
             name: Some("LensRegistryEntry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -43202,15 +43233,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2117, 2212),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1323),
+            id: DeclarationId(1325),
             name: Some("lens_cost_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1322),
+                template: DeclarationId(1324),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1322)),
+            meta_tag: Some(DeclarationId(1324)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -43238,15 +43269,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2214, 2387),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1324),
+            id: DeclarationId(1326),
             name: Some("lens_cost_symbolic_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1322),
+                template: DeclarationId(1324),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1322)),
+            meta_tag: Some(DeclarationId(1324)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -43274,15 +43305,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2389, 2577),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1325),
+            id: DeclarationId(1327),
             name: Some("lens_cost_target_realization_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1322),
+                template: DeclarationId(1324),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1322)),
+            meta_tag: Some(DeclarationId(1324)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -43313,15 +43344,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2579, 2816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1326),
+            id: DeclarationId(1328),
             name: Some("lens_effect_enumeration_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1322),
+                template: DeclarationId(1324),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1322)),
+            meta_tag: Some(DeclarationId(1324)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -43349,15 +43380,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2818, 3035),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1327),
+            id: DeclarationId(1329),
             name: Some("lens_parallelism_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1322),
+                template: DeclarationId(1324),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1322)),
+            meta_tag: Some(DeclarationId(1324)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -43385,15 +43416,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 3037, 3226),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1328),
+            id: DeclarationId(1330),
             name: Some("lens_provenance_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1322),
+                template: DeclarationId(1324),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1322)),
+            meta_tag: Some(DeclarationId(1324)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -43421,15 +43452,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 3228, 3413),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1329),
+            id: DeclarationId(1331),
             name: Some("lens_structural_resolution_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1322),
+                template: DeclarationId(1324),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1322)),
+            meta_tag: Some(DeclarationId(1324)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -43460,15 +43491,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 3415, 3644),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1330),
+            id: DeclarationId(1332),
             name: Some("lens_unused_parameters_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1322),
+                template: DeclarationId(1324),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1322)),
+            meta_tag: Some(DeclarationId(1324)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -43496,15 +43527,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 3646, 3859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1331),
+            id: DeclarationId(1333),
             name: Some("lens_infer_helpers_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1322),
+                template: DeclarationId(1324),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1322)),
+            meta_tag: Some(DeclarationId(1324)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -43532,15 +43563,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 4486, 4678),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1332),
+            id: DeclarationId(1334),
             name: Some("lens_variant_payload_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1322),
+                template: DeclarationId(1324),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1322)),
+            meta_tag: Some(DeclarationId(1324)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -43568,15 +43599,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 4680, 4880),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1333),
+            id: DeclarationId(1335),
             name: Some("lens_lower_helpers_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1322),
+                template: DeclarationId(1324),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1322)),
+            meta_tag: Some(DeclarationId(1324)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -43604,17 +43635,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 5130, 5322),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1334),
+            id: DeclarationId(1336),
             name: Some("IntegerAlgebra".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "OrderedRingAlgebra".to_string(),
-                        ty: DeclarationId(2308),
+                        ty: DeclarationId(2310),
                     },
                     Field {
                         label: "SemiringAlgebra".to_string(),
-                        ty: DeclarationId(2309),
+                        ty: DeclarationId(2311),
                     },
                 ],
             },
@@ -43629,21 +43660,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6404, 6466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1335),
+            id: DeclarationId(1337),
             name: Some("NonIntegerAlgebra".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ApproximateFieldAlgebra".to_string(),
-                        ty: DeclarationId(2310),
+                        ty: DeclarationId(2312),
                     },
                     Field {
                         label: "BooleanAlgebraAlgebra".to_string(),
-                        ty: DeclarationId(2311),
+                        ty: DeclarationId(2313),
                     },
                     Field {
                         label: "TerminalAlgebra".to_string(),
-                        ty: DeclarationId(2312),
+                        ty: DeclarationId(2314),
                     },
                 ],
             },
@@ -43658,37 +43689,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6468, 6564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1336),
+            id: DeclarationId(1338),
             name: Some("TargetCarrier".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BitCarrier".to_string(),
-                        ty: DeclarationId(2313),
+                        ty: DeclarationId(2315),
                     },
                     Field {
                         label: "ByteCarrier".to_string(),
-                        ty: DeclarationId(2314),
+                        ty: DeclarationId(2316),
                     },
                     Field {
                         label: "Word16Carrier".to_string(),
-                        ty: DeclarationId(2315),
+                        ty: DeclarationId(2317),
                     },
                     Field {
                         label: "Word32Carrier".to_string(),
-                        ty: DeclarationId(2316),
+                        ty: DeclarationId(2318),
                     },
                     Field {
                         label: "Word64Carrier".to_string(),
-                        ty: DeclarationId(2317),
+                        ty: DeclarationId(2319),
                     },
                     Field {
                         label: "Word128Carrier".to_string(),
-                        ty: DeclarationId(2318),
+                        ty: DeclarationId(2320),
                     },
                     Field {
                         label: "TerminalCarrier".to_string(),
-                        ty: DeclarationId(2319),
+                        ty: DeclarationId(2321),
                     },
                 ],
             },
@@ -43703,21 +43734,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8154, 8296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1337),
+            id: DeclarationId(1339),
             name: Some("IntegerOverflow".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TwoComplementWrap".to_string(),
-                        ty: DeclarationId(2320),
+                        ty: DeclarationId(2322),
                     },
                     Field {
                         label: "Saturating".to_string(),
-                        ty: DeclarationId(2321),
+                        ty: DeclarationId(2323),
                     },
                     Field {
                         label: "Trap".to_string(),
-                        ty: DeclarationId(2322),
+                        ty: DeclarationId(2324),
                     },
                 ],
             },
@@ -43732,17 +43763,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9013, 9079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1338),
+            id: DeclarationId(1340),
             name: Some("RustPrimitive".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IntegerPrimitive".to_string(),
-                        ty: DeclarationId(2323),
+                        ty: DeclarationId(2325),
                     },
                     Field {
                         label: "NonIntegerPrimitive".to_string(),
-                        ty: DeclarationId(2324),
+                        ty: DeclarationId(2326),
                     },
                 ],
             },
@@ -43757,94 +43788,94 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9834, 10616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1339),
+            id: DeclarationId(1341),
             name: Some("rust_pilot_primitives".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1338),
+                    value: DeclarationId(1340),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2325)),
+            meta_tag: Some(DeclarationId(2327)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
                 FieldValue::Variant {
-                    constructor: DeclarationId(2323),
+                    constructor: DeclarationId(2325),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2308),
+                            constructor: DeclarationId(2310),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2314),
+                            constructor: DeclarationId(2316),
                             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(2320),
+                            constructor: DeclarationId(2322),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2323),
+                    constructor: DeclarationId(2325),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2308),
+                            constructor: DeclarationId(2310),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2315),
+                            constructor: DeclarationId(2317),
                             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(2320),
+                            constructor: DeclarationId(2322),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2323),
+                    constructor: DeclarationId(2325),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2308),
+                            constructor: DeclarationId(2310),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2316),
+                            constructor: DeclarationId(2318),
                             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(2320),
+                            constructor: DeclarationId(2322),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2323),
+                    constructor: DeclarationId(2325),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2308),
+                            constructor: DeclarationId(2310),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2317),
+                            constructor: DeclarationId(2319),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -43853,21 +43884,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(2320),
+                            constructor: DeclarationId(2322),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2323),
+                    constructor: DeclarationId(2325),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i128".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2308),
+                            constructor: DeclarationId(2310),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2318),
+                            constructor: DeclarationId(2320),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -43878,84 +43909,84 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2320),
+                            constructor: DeclarationId(2322),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2323),
+                    constructor: DeclarationId(2325),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2309),
+                            constructor: DeclarationId(2311),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2314),
+                            constructor: DeclarationId(2316),
                             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(2320),
+                            constructor: DeclarationId(2322),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2323),
+                    constructor: DeclarationId(2325),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2309),
+                            constructor: DeclarationId(2311),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2315),
+                            constructor: DeclarationId(2317),
                             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(2320),
+                            constructor: DeclarationId(2322),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2323),
+                    constructor: DeclarationId(2325),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2309),
+                            constructor: DeclarationId(2311),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2316),
+                            constructor: DeclarationId(2318),
                             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(2320),
+                            constructor: DeclarationId(2322),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2323),
+                    constructor: DeclarationId(2325),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2309),
+                            constructor: DeclarationId(2311),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2317),
+                            constructor: DeclarationId(2319),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
@@ -43964,21 +43995,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2320),
+                            constructor: DeclarationId(2322),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2323),
+                    constructor: DeclarationId(2325),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u128".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2309),
+                            constructor: DeclarationId(2311),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2318),
+                            constructor: DeclarationId(2320),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
@@ -43987,66 +44018,66 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2320),
+                            constructor: DeclarationId(2322),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2324),
+                    constructor: DeclarationId(2326),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("f32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2310),
+                            constructor: DeclarationId(2312),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2316),
+                            constructor: DeclarationId(2318),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2324),
+                    constructor: DeclarationId(2326),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("f64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2310),
+                            constructor: DeclarationId(2312),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2317),
+                            constructor: DeclarationId(2319),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2324),
+                    constructor: DeclarationId(2326),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("bool".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2311),
+                            constructor: DeclarationId(2313),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2313),
+                            constructor: DeclarationId(2315),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2324),
+                    constructor: DeclarationId(2326),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("()".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2312),
+                            constructor: DeclarationId(2314),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2319),
+                            constructor: DeclarationId(2321),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
@@ -44058,29 +44089,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10937, 15660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1340),
+            id: DeclarationId(1342),
             name: Some("CronField".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Wildcard".to_string(),
-                        ty: DeclarationId(2326),
+                        ty: DeclarationId(2328),
                     },
                     Field {
                         label: "Exact".to_string(),
-                        ty: DeclarationId(2327),
+                        ty: DeclarationId(2329),
                     },
                     Field {
                         label: "Listed".to_string(),
-                        ty: DeclarationId(2329),
+                        ty: DeclarationId(2331),
                     },
                     Field {
                         label: "Ranged".to_string(),
-                        ty: DeclarationId(2330),
+                        ty: DeclarationId(2332),
                     },
                     Field {
                         label: "Step".to_string(),
-                        ty: DeclarationId(2331),
+                        ty: DeclarationId(2333),
                     },
                 ],
             },
@@ -44095,29 +44126,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4214, 4433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1341),
+            id: DeclarationId(1343),
             name: Some("CronSchedule".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "minute".to_string(),
-                        ty: DeclarationId(1340),
+                        ty: DeclarationId(1342),
                     },
                     Field {
                         label: "hour".to_string(),
-                        ty: DeclarationId(1340),
+                        ty: DeclarationId(1342),
                     },
                     Field {
                         label: "day_of_month".to_string(),
-                        ty: DeclarationId(1340),
+                        ty: DeclarationId(1342),
                     },
                     Field {
                         label: "month".to_string(),
-                        ty: DeclarationId(1340),
+                        ty: DeclarationId(1342),
                     },
                     Field {
                         label: "day_of_week".to_string(),
-                        ty: DeclarationId(1340),
+                        ty: DeclarationId(1342),
                     },
                 ],
             },
@@ -44132,7 +44163,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4435, 4564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1342),
+            id: DeclarationId(1344),
             name: Some("CronEntry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44142,7 +44173,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "schedule".to_string(),
-                        ty: DeclarationId(1341),
+                        ty: DeclarationId(1343),
                     },
                     Field {
                         label: "command".to_string(),
@@ -44161,10 +44192,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4566, 4641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1343),
+            id: DeclarationId(1345),
             name: Some("render_cron_field".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1340)],
+                inputs: vec![DeclarationId(1342)],
                 output: DeclarationId(230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "dsl/extdeps/cron_schedule_model.dag",
@@ -44183,10 +44214,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4643, 4963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1344),
+            id: DeclarationId(1346),
             name: Some("render_cron_schedule".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1341)],
+                inputs: vec![DeclarationId(1343)],
                 output: DeclarationId(230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "dsl/extdeps/cron_schedule_model.dag",
@@ -44205,7 +44236,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4965, 5253),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1345),
+            id: DeclarationId(1347),
             name: Some("wire_contract".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(312),
@@ -44226,21 +44257,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 684, 758),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1346),
+            id: DeclarationId(1348),
             name: Some("UserType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "User".to_string(),
-                        ty: DeclarationId(2332),
+                        ty: DeclarationId(2334),
                     },
                     Field {
                         label: "Bot".to_string(),
-                        ty: DeclarationId(2333),
+                        ty: DeclarationId(2335),
                     },
                     Field {
                         label: "Organization".to_string(),
-                        ty: DeclarationId(2334),
+                        ty: DeclarationId(2336),
                     },
                 ],
             },
@@ -44255,7 +44286,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 831, 872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1347),
+            id: DeclarationId(1349),
             name: Some("GitHubUser".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44269,7 +44300,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "type".to_string(),
-                        ty: DeclarationId(1346),
+                        ty: DeclarationId(1348),
                     },
                 ],
             },
@@ -44284,7 +44315,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 874, 936),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1348),
+            id: DeclarationId(1350),
             name: Some("Repository".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44321,7 +44352,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1009, 1120),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1349),
+            id: DeclarationId(1351),
             name: Some("GitHubAuthToken".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44331,11 +44362,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "scopes".to_string(),
-                        ty: DeclarationId(2335),
+                        ty: DeclarationId(2337),
                     },
                     Field {
                         label: "expires_at".to_string(),
-                        ty: DeclarationId(2336),
+                        ty: DeclarationId(2338),
                     },
                 ],
             },
@@ -44350,29 +44381,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1193, 1286),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1350),
+            id: DeclarationId(1352),
             name: Some("GitHubScope".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ScopeRepo".to_string(),
-                        ty: DeclarationId(2337),
+                        ty: DeclarationId(2339),
                     },
                     Field {
                         label: "ScopeGist".to_string(),
-                        ty: DeclarationId(2338),
+                        ty: DeclarationId(2340),
                     },
                     Field {
                         label: "ScopeWorkflow".to_string(),
-                        ty: DeclarationId(2339),
+                        ty: DeclarationId(2341),
                     },
                     Field {
                         label: "ScopeReadOrg".to_string(),
-                        ty: DeclarationId(2340),
+                        ty: DeclarationId(2342),
                     },
                     Field {
                         label: "ScopeReadUser".to_string(),
-                        ty: DeclarationId(2341),
+                        ty: DeclarationId(2343),
                     },
                 ],
             },
@@ -44387,7 +44418,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1288, 1385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1351),
+            id: DeclarationId(1353),
             name: Some("Pagination".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44397,7 +44428,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "cursor".to_string(),
-                        ty: DeclarationId(2342),
+                        ty: DeclarationId(2344),
                     },
                     Field {
                         label: "has_next".to_string(),
@@ -44416,21 +44447,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1510, 1580),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1352),
+            id: DeclarationId(1354),
             name: Some("GitHubPermission".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PermRead".to_string(),
-                        ty: DeclarationId(2343),
+                        ty: DeclarationId(2345),
                     },
                     Field {
                         label: "PermWrite".to_string(),
-                        ty: DeclarationId(2344),
+                        ty: DeclarationId(2346),
                     },
                     Field {
                         label: "PermAdmin".to_string(),
-                        ty: DeclarationId(2345),
+                        ty: DeclarationId(2347),
                     },
                 ],
             },
@@ -44445,7 +44476,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1653, 1709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1353),
+            id: DeclarationId(1355),
             name: Some("default_api_base".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -44464,7 +44495,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1782, 1838),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1354),
+            id: DeclarationId(1356),
             name: Some("default_per_page".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -44481,7 +44512,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1840, 1871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1355),
+            id: DeclarationId(1357),
             name: Some("max_per_page".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -44498,7 +44529,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1873, 1901),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1356),
+            id: DeclarationId(1358),
             name: Some("Workflow".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44508,23 +44539,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "on".to_string(),
-                        ty: DeclarationId(2346),
+                        ty: DeclarationId(2348),
                     },
                     Field {
                         label: "concurrency".to_string(),
-                        ty: DeclarationId(2347),
+                        ty: DeclarationId(2349),
                     },
                     Field {
                         label: "jobs".to_string(),
-                        ty: DeclarationId(2348),
+                        ty: DeclarationId(2350),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(2350),
+                        ty: DeclarationId(2352),
                     },
                     Field {
                         label: "permissions".to_string(),
-                        ty: DeclarationId(2351),
+                        ty: DeclarationId(2353),
                     },
                 ],
             },
@@ -44539,25 +44570,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1484, 1748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1357),
+            id: DeclarationId(1359),
             name: Some("WorkflowPermissions".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "contents".to_string(),
-                        ty: DeclarationId(1358),
+                        ty: DeclarationId(1360),
                     },
                     Field {
                         label: "pull_requests".to_string(),
-                        ty: DeclarationId(1358),
+                        ty: DeclarationId(1360),
                     },
                     Field {
                         label: "issues".to_string(),
-                        ty: DeclarationId(1358),
+                        ty: DeclarationId(1360),
                     },
                     Field {
                         label: "actions".to_string(),
-                        ty: DeclarationId(1358),
+                        ty: DeclarationId(1360),
                     },
                 ],
             },
@@ -44572,21 +44603,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1750, 1892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1358),
+            id: DeclarationId(1360),
             name: Some("PermissionLevel".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PermRead".to_string(),
-                        ty: DeclarationId(2352),
+                        ty: DeclarationId(2354),
                     },
                     Field {
                         label: "PermWrite".to_string(),
-                        ty: DeclarationId(2353),
+                        ty: DeclarationId(2355),
                     },
                     Field {
                         label: "PermNone".to_string(),
-                        ty: DeclarationId(2354),
+                        ty: DeclarationId(2356),
                     },
                 ],
             },
@@ -44601,29 +44632,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1894, 1948),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1359),
+            id: DeclarationId(1361),
             name: Some("WorkflowTrigger".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Push".to_string(),
-                        ty: DeclarationId(2357),
+                        ty: DeclarationId(2359),
                     },
                     Field {
                         label: "PullRequest".to_string(),
-                        ty: DeclarationId(2360),
+                        ty: DeclarationId(2362),
                     },
                     Field {
                         label: "Schedule".to_string(),
-                        ty: DeclarationId(2361),
+                        ty: DeclarationId(2363),
                     },
                     Field {
                         label: "WorkflowDispatch".to_string(),
-                        ty: DeclarationId(2363),
+                        ty: DeclarationId(2365),
                     },
                     Field {
                         label: "WorkflowCall".to_string(),
-                        ty: DeclarationId(2365),
+                        ty: DeclarationId(2367),
                     },
                 ],
             },
@@ -44638,29 +44669,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2064, 2356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1360),
+            id: DeclarationId(1362),
             name: Some("PullRequestActivity".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Opened".to_string(),
-                        ty: DeclarationId(2366),
+                        ty: DeclarationId(2368),
                     },
                     Field {
                         label: "Synchronize".to_string(),
-                        ty: DeclarationId(2367),
+                        ty: DeclarationId(2369),
                     },
                     Field {
                         label: "Reopened".to_string(),
-                        ty: DeclarationId(2368),
+                        ty: DeclarationId(2370),
                     },
                     Field {
                         label: "ReadyForReview".to_string(),
-                        ty: DeclarationId(2369),
+                        ty: DeclarationId(2371),
                     },
                     Field {
                         label: "Closed".to_string(),
-                        ty: DeclarationId(2370),
+                        ty: DeclarationId(2372),
                     },
                 ],
             },
@@ -44675,7 +44706,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2358, 2452),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1361),
+            id: DeclarationId(1363),
             name: Some("DispatchInput".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44685,7 +44716,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "description".to_string(),
-                        ty: DeclarationId(2371),
+                        ty: DeclarationId(2373),
                     },
                     Field {
                         label: "required".to_string(),
@@ -44693,11 +44724,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "default".to_string(),
-                        ty: DeclarationId(2372),
+                        ty: DeclarationId(2374),
                     },
                     Field {
                         label: "type".to_string(),
-                        ty: DeclarationId(1362),
+                        ty: DeclarationId(1364),
                     },
                 ],
             },
@@ -44712,25 +44743,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2454, 2576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1362),
+            id: DeclarationId(1364),
             name: Some("DispatchInputType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "InputString".to_string(),
-                        ty: DeclarationId(2373),
+                        ty: DeclarationId(2375),
                     },
                     Field {
                         label: "InputBoolean".to_string(),
-                        ty: DeclarationId(2374),
+                        ty: DeclarationId(2376),
                     },
                     Field {
                         label: "InputChoice".to_string(),
-                        ty: DeclarationId(2375),
+                        ty: DeclarationId(2377),
                     },
                     Field {
                         label: "InputEnvironment".to_string(),
-                        ty: DeclarationId(2376),
+                        ty: DeclarationId(2378),
                     },
                 ],
             },
@@ -44745,21 +44776,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2578, 2662),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1363),
+            id: DeclarationId(1365),
             name: Some("SecretScope".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "StepScope".to_string(),
-                        ty: DeclarationId(2377),
+                        ty: DeclarationId(2379),
                     },
                     Field {
                         label: "JobScope".to_string(),
-                        ty: DeclarationId(2378),
+                        ty: DeclarationId(2380),
                     },
                     Field {
                         label: "WorkflowScope".to_string(),
-                        ty: DeclarationId(2379),
+                        ty: DeclarationId(2381),
                     },
                 ],
             },
@@ -44774,7 +44805,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4765, 4820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1364),
+            id: DeclarationId(1366),
             name: Some("WorkflowSecret".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44784,7 +44815,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "scope".to_string(),
-                        ty: DeclarationId(1363),
+                        ty: DeclarationId(1365),
                     },
                 ],
             },
@@ -44799,7 +44830,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5095, 5158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1365),
+            id: DeclarationId(1367),
             name: Some("Job".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44809,39 +44840,39 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(2380),
+                        ty: DeclarationId(2382),
                     },
                     Field {
                         label: "runner".to_string(),
-                        ty: DeclarationId(1369),
+                        ty: DeclarationId(1371),
                     },
                     Field {
                         label: "steps".to_string(),
-                        ty: DeclarationId(2381),
+                        ty: DeclarationId(2383),
                     },
                     Field {
                         label: "needs".to_string(),
-                        ty: DeclarationId(2382),
+                        ty: DeclarationId(2384),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(2384),
+                        ty: DeclarationId(2386),
                     },
                     Field {
                         label: "outputs".to_string(),
-                        ty: DeclarationId(2386),
+                        ty: DeclarationId(2388),
                     },
                     Field {
                         label: "if_condition".to_string(),
-                        ty: DeclarationId(2387),
+                        ty: DeclarationId(2389),
                     },
                     Field {
                         label: "strategy".to_string(),
-                        ty: DeclarationId(2388),
+                        ty: DeclarationId(2390),
                     },
                     Field {
                         label: "timeout_minutes".to_string(),
-                        ty: DeclarationId(2389),
+                        ty: DeclarationId(2391),
                     },
                     Field {
                         label: "continue_on_error".to_string(),
@@ -44849,7 +44880,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "concurrency".to_string(),
-                        ty: DeclarationId(2390),
+                        ty: DeclarationId(2392),
                     },
                 ],
             },
@@ -44864,17 +44895,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5302, 5771),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1366),
+            id: DeclarationId(1368),
             name: Some("CancelInProgressSpec".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "CancelInProgressBool".to_string(),
-                        ty: DeclarationId(2391),
+                        ty: DeclarationId(2393),
                     },
                     Field {
                         label: "CancelInProgressExpression".to_string(),
-                        ty: DeclarationId(2392),
+                        ty: DeclarationId(2394),
                     },
                 ],
             },
@@ -44889,17 +44920,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6589, 6709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1367),
+            id: DeclarationId(1369),
             name: Some("CancelInProgressWhenQueueMax".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "QueueMaxCancelInProgressFalse".to_string(),
-                        ty: DeclarationId(2393),
+                        ty: DeclarationId(2395),
                     },
                     Field {
                         label: "QueueMaxCancelInProgressExpression".to_string(),
-                        ty: DeclarationId(2394),
+                        ty: DeclarationId(2396),
                     },
                 ],
             },
@@ -44914,21 +44945,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7517, 7646),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1368),
+            id: DeclarationId(1370),
             name: Some("ConcurrencySpec".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ConcurrencyScalar".to_string(),
-                        ty: DeclarationId(2395),
+                        ty: DeclarationId(2397),
                     },
                     Field {
                         label: "ConcurrencyMappingQueueMax".to_string(),
-                        ty: DeclarationId(2397),
+                        ty: DeclarationId(2399),
                     },
                     Field {
                         label: "ConcurrencyMappingQueueNotMax".to_string(),
-                        ty: DeclarationId(2400),
+                        ty: DeclarationId(2402),
                     },
                 ],
             },
@@ -44943,21 +44974,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8199, 8845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1369),
+            id: DeclarationId(1371),
             name: Some("RunnerSpec".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "HostedRunner".to_string(),
-                        ty: DeclarationId(2401),
+                        ty: DeclarationId(2403),
                     },
                     Field {
                         label: "SelfHosted".to_string(),
-                        ty: DeclarationId(2403),
+                        ty: DeclarationId(2405),
                     },
                     Field {
                         label: "RunsOnExpression".to_string(),
-                        ty: DeclarationId(2404),
+                        ty: DeclarationId(2406),
                     },
                 ],
             },
@@ -44972,33 +45003,33 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10017, 10240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1370),
+            id: DeclarationId(1372),
             name: Some("RunnerLabel".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "UbuntuLatest".to_string(),
-                        ty: DeclarationId(2405),
+                        ty: DeclarationId(2407),
                     },
                     Field {
                         label: "Ubuntu2404".to_string(),
-                        ty: DeclarationId(2406),
+                        ty: DeclarationId(2408),
                     },
                     Field {
                         label: "Ubuntu2204".to_string(),
-                        ty: DeclarationId(2407),
+                        ty: DeclarationId(2409),
                     },
                     Field {
                         label: "MacosLatest".to_string(),
-                        ty: DeclarationId(2408),
+                        ty: DeclarationId(2410),
                     },
                     Field {
                         label: "Macos14".to_string(),
-                        ty: DeclarationId(2409),
+                        ty: DeclarationId(2411),
                     },
                     Field {
                         label: "WindowsLatest".to_string(),
-                        ty: DeclarationId(2410),
+                        ty: DeclarationId(2412),
                     },
                 ],
             },
@@ -45013,17 +45044,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10242, 10351),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1371),
+            id: DeclarationId(1373),
             name: Some("Step".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "RunStep".to_string(),
-                        ty: DeclarationId(2418),
+                        ty: DeclarationId(2420),
                     },
                     Field {
                         label: "UsesStep".to_string(),
-                        ty: DeclarationId(2427),
+                        ty: DeclarationId(2429),
                     },
                 ],
             },
@@ -45038,29 +45069,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10496, 11091),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1372),
+            id: DeclarationId(1374),
             name: Some("ShellType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Bash".to_string(),
-                        ty: DeclarationId(2428),
+                        ty: DeclarationId(2430),
                     },
                     Field {
                         label: "Sh".to_string(),
-                        ty: DeclarationId(2429),
+                        ty: DeclarationId(2431),
                     },
                     Field {
                         label: "Pwsh".to_string(),
-                        ty: DeclarationId(2430),
+                        ty: DeclarationId(2432),
                     },
                     Field {
                         label: "Python".to_string(),
-                        ty: DeclarationId(2431),
+                        ty: DeclarationId(2433),
                     },
                     Field {
                         label: "Cmd".to_string(),
-                        ty: DeclarationId(2432),
+                        ty: DeclarationId(2434),
                     },
                 ],
             },
@@ -45075,7 +45106,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11093, 11141),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1373),
+            id: DeclarationId(1375),
             name: Some("ActionRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -45104,41 +45135,41 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11143, 11206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1374),
+            id: DeclarationId(1376),
             name: Some("LogAnnotation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "AnnotationError".to_string(),
-                        ty: DeclarationId(2436),
+                        ty: DeclarationId(2438),
                     },
                     Field {
                         label: "AnnotationWarning".to_string(),
-                        ty: DeclarationId(2440),
+                        ty: DeclarationId(2442),
                     },
                     Field {
                         label: "AnnotationNotice".to_string(),
-                        ty: DeclarationId(2444),
+                        ty: DeclarationId(2446),
                     },
                     Field {
                         label: "AnnotationGroup".to_string(),
-                        ty: DeclarationId(2445),
+                        ty: DeclarationId(2447),
                     },
                     Field {
                         label: "AnnotationEndGroup".to_string(),
-                        ty: DeclarationId(2446),
+                        ty: DeclarationId(2448),
                     },
                     Field {
                         label: "SetOutput".to_string(),
-                        ty: DeclarationId(2447),
+                        ty: DeclarationId(2449),
                     },
                     Field {
                         label: "AddMask".to_string(),
-                        ty: DeclarationId(2448),
+                        ty: DeclarationId(2450),
                     },
                     Field {
                         label: "StopCommands".to_string(),
-                        ty: DeclarationId(2449),
+                        ty: DeclarationId(2451),
                     },
                 ],
             },
@@ -45153,7 +45184,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11440, 11867),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1375),
+            id: DeclarationId(1377),
             name: Some("annotation_error_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45172,7 +45203,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11933, 11982),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1376),
+            id: DeclarationId(1378),
             name: Some("annotation_warning_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45191,7 +45222,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11983, 12036),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1377),
+            id: DeclarationId(1379),
             name: Some("annotation_notice_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45210,7 +45241,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12037, 12088),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1378),
+            id: DeclarationId(1380),
             name: Some("annotation_group_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45229,7 +45260,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12089, 12139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1379),
+            id: DeclarationId(1381),
             name: Some("annotation_endgroup".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45248,7 +45279,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12140, 12189),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1380),
+            id: DeclarationId(1382),
             name: Some("annotation_set_output_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45267,7 +45298,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12190, 12254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1381),
+            id: DeclarationId(1383),
             name: Some("annotation_add_mask_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45286,7 +45317,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12255, 12311),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1382),
+            id: DeclarationId(1384),
             name: Some("annotation_stop_commands_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45305,17 +45336,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12312, 12378),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1383),
+            id: DeclarationId(1385),
             name: Some("ArtifactOp".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Upload".to_string(),
-                        ty: DeclarationId(2451),
+                        ty: DeclarationId(2453),
                     },
                     Field {
                         label: "Download".to_string(),
-                        ty: DeclarationId(2453),
+                        ty: DeclarationId(2455),
                     },
                 ],
             },
@@ -45330,21 +45361,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12600, 12765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1384),
+            id: DeclarationId(1386),
             name: Some("MissingFilesBehavior".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Warn".to_string(),
-                        ty: DeclarationId(2454),
+                        ty: DeclarationId(2456),
                     },
                     Field {
                         label: "ErrorOut".to_string(),
-                        ty: DeclarationId(2455),
+                        ty: DeclarationId(2457),
                     },
                     Field {
                         label: "Ignore".to_string(),
-                        ty: DeclarationId(2456),
+                        ty: DeclarationId(2458),
                     },
                 ],
             },
@@ -45359,15 +45390,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12767, 12819),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1385),
+            id: DeclarationId(1387),
             name: Some("upload_artifact_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1373),
+                template: DeclarationId(1375),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1373)),
+            meta_tag: Some(DeclarationId(1375)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -45380,15 +45411,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12870, 12979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1386),
+            id: DeclarationId(1388),
             name: Some("download_artifact_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1373),
+                template: DeclarationId(1375),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1373)),
+            meta_tag: Some(DeclarationId(1375)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -45401,21 +45432,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12981, 13094),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1387),
+            id: DeclarationId(1389),
             name: Some("MatrixStrategy".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "dimensions".to_string(),
-                        ty: DeclarationId(2458),
+                        ty: DeclarationId(2460),
                     },
                     Field {
                         label: "include".to_string(),
-                        ty: DeclarationId(2460),
+                        ty: DeclarationId(2462),
                     },
                     Field {
                         label: "exclude".to_string(),
-                        ty: DeclarationId(2462),
+                        ty: DeclarationId(2464),
                     },
                     Field {
                         label: "fail_fast".to_string(),
@@ -45423,7 +45454,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "max_parallel".to_string(),
-                        ty: DeclarationId(2463),
+                        ty: DeclarationId(2465),
                     },
                 ],
             },
@@ -45438,33 +45469,33 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13233, 13409),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1388),
+            id: DeclarationId(1390),
             name: Some("CheckConclusion".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Success".to_string(),
-                        ty: DeclarationId(2464),
+                        ty: DeclarationId(2466),
                     },
                     Field {
                         label: "Failure".to_string(),
-                        ty: DeclarationId(2465),
+                        ty: DeclarationId(2467),
                     },
                     Field {
                         label: "Cancelled".to_string(),
-                        ty: DeclarationId(2466),
+                        ty: DeclarationId(2468),
                     },
                     Field {
                         label: "Skipped".to_string(),
-                        ty: DeclarationId(2467),
+                        ty: DeclarationId(2469),
                     },
                     Field {
                         label: "TimedOut".to_string(),
-                        ty: DeclarationId(2468),
+                        ty: DeclarationId(2470),
                     },
                     Field {
                         label: "ActionRequired".to_string(),
-                        ty: DeclarationId(2469),
+                        ty: DeclarationId(2471),
                     },
                 ],
             },
@@ -45479,15 +45510,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13538, 13640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1389),
+            id: DeclarationId(1391),
             name: Some("checkout_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1373),
+                template: DeclarationId(1375),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1373)),
+            meta_tag: Some(DeclarationId(1375)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -45500,15 +45531,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13766, 13861),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1390),
+            id: DeclarationId(1392),
             name: Some("setup_rust_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1373),
+                template: DeclarationId(1375),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1373)),
+            meta_tag: Some(DeclarationId(1375)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -45521,15 +45552,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13863, 13987),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1391),
+            id: DeclarationId(1393),
             name: Some("cache_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1373),
+                template: DeclarationId(1375),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1373)),
+            meta_tag: Some(DeclarationId(1375)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -45542,7 +45573,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13989, 14078),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1392),
+            id: DeclarationId(1394),
             name: Some("max_job_timeout_minutes".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -45559,7 +45590,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14154, 14193),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1393),
+            id: DeclarationId(1395),
             name: Some("default_job_timeout_minutes".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -45576,7 +45607,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14195, 14238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1394),
+            id: DeclarationId(1396),
             name: Some("max_matrix_combinations".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -45593,7 +45624,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14240, 14279),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1395),
+            id: DeclarationId(1397),
             name: Some("github_actions_workflows_dir".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45612,17 +45643,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1207, 1270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1396),
+            id: DeclarationId(1398),
             name: Some("GitHubActionsWorkflowExtension".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "GitHubActionsWorkflowYml".to_string(),
-                        ty: DeclarationId(2470),
+                        ty: DeclarationId(2472),
                     },
                     Field {
                         label: "GitHubActionsWorkflowYaml".to_string(),
-                        ty: DeclarationId(2471),
+                        ty: DeclarationId(2473),
                     },
                 ],
             },
@@ -45637,7 +45668,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1895, 1989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1397),
+            id: DeclarationId(1399),
             name: Some("GitHubActionsWorkflowStemSegment".to_string()),
             connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
@@ -45646,17 +45677,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(2472)),
+            refinement: Some(DeclarationId(2474)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2615, 2714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1398),
+            id: DeclarationId(1400),
             name: Some("GitHubActionsWorkflowStem".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "segment".to_string(),
-                    ty: DeclarationId(1397),
+                    ty: DeclarationId(1399),
                 }],
             },
             type_params: vec![],
@@ -45670,17 +45701,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2916, 2994),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1399),
+            id: DeclarationId(1401),
             name: Some("GitHubActionsWorkflowFileRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "stem".to_string(),
-                        ty: DeclarationId(1398),
+                        ty: DeclarationId(1400),
                     },
                     Field {
                         label: "extension".to_string(),
-                        ty: DeclarationId(1396),
+                        ty: DeclarationId(1398),
                     },
                 ],
             },
@@ -45695,7 +45726,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 3398, 3513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1400),
+            id: DeclarationId(1402),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45715,7 +45746,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(1401),
+            id: DeclarationId(1403),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45735,7 +45766,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(1402),
+            id: DeclarationId(1404),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45755,7 +45786,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(1403),
+            id: DeclarationId(1405),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45775,7 +45806,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(1404),
+            id: DeclarationId(1406),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45795,7 +45826,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(1405),
+            id: DeclarationId(1407),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(695), DeclarationId(694)],
@@ -45813,7 +45844,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(1406),
+            id: DeclarationId(1408),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45833,7 +45864,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(1407),
+            id: DeclarationId(1409),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(697), DeclarationId(698)],
@@ -45851,7 +45882,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(1408),
+            id: DeclarationId(1410),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45871,7 +45902,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(1409),
+            id: DeclarationId(1411),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45891,7 +45922,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(1410),
+            id: DeclarationId(1412),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45911,7 +45942,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(1411),
+            id: DeclarationId(1413),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45931,7 +45962,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(1412),
+            id: DeclarationId(1414),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(702)],
@@ -45949,7 +45980,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(1413),
+            id: DeclarationId(1415),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45969,7 +46000,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(1414),
+            id: DeclarationId(1416),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45989,7 +46020,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(1415),
+            id: DeclarationId(1417),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(705)],
@@ -46007,7 +46038,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(1416),
+            id: DeclarationId(1418),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46027,7 +46058,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(1417),
+            id: DeclarationId(1419),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46047,7 +46078,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(1418),
+            id: DeclarationId(1420),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46067,11 +46098,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(1419),
+            id: DeclarationId(1421),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(707)],
-                output: DeclarationId(1418),
+                output: DeclarationId(1420),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -46085,7 +46116,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(1420),
+            id: DeclarationId(1422),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46105,7 +46136,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(1421),
+            id: DeclarationId(1423),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46125,7 +46156,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(1422),
+            id: DeclarationId(1424),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46145,7 +46176,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(1423),
+            id: DeclarationId(1425),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46165,7 +46196,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(1424),
+            id: DeclarationId(1426),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(713),
@@ -46185,13 +46216,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(1425),
+            id: DeclarationId(1427),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1424),
+                    value: DeclarationId(1426),
                 }],
             },
             type_params: vec![],
@@ -46205,7 +46236,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(1426),
+            id: DeclarationId(1428),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46225,7 +46256,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(1427),
+            id: DeclarationId(1429),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(713),
@@ -46245,13 +46276,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(1428),
+            id: DeclarationId(1430),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1427),
+                    value: DeclarationId(1429),
                 }],
             },
             type_params: vec![],
@@ -46265,7 +46296,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(1429),
+            id: DeclarationId(1431),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46285,7 +46316,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(1430),
+            id: DeclarationId(1432),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -46299,7 +46330,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(1431),
+            id: DeclarationId(1433),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46319,7 +46350,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(1432),
+            id: DeclarationId(1434),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -46329,7 +46360,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "tail".to_string(),
-                        ty: DeclarationId(1431),
+                        ty: DeclarationId(1433),
                     },
                 ],
             },
@@ -46344,7 +46375,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(1433),
+            id: DeclarationId(1435),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46364,7 +46395,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(1434),
+            id: DeclarationId(1436),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46384,7 +46415,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(1435),
+            id: DeclarationId(1437),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -46403,7 +46434,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(1436),
+            id: DeclarationId(1438),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -46423,7 +46454,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 20914, 20941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1437),
+            id: DeclarationId(1439),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(713),
@@ -46443,7 +46474,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 20993, 21024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1438),
+            id: DeclarationId(1440),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -46463,11 +46494,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21056),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1439),
+            id: DeclarationId(1441),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1438),
+                    DeclarationId(1440),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -46482,7 +46513,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1440),
+            id: DeclarationId(1442),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46502,7 +46533,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 21183, 21204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1441),
+            id: DeclarationId(1443),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -46522,11 +46553,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21236),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1442),
+            id: DeclarationId(1444),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1441),
+                    DeclarationId(1443),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -46541,7 +46572,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1443),
+            id: DeclarationId(1445),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46561,7 +46592,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 22266, 22287),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1444),
+            id: DeclarationId(1446),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -46580,7 +46611,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1445),
+            id: DeclarationId(1447),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -46599,7 +46630,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1446),
+            id: DeclarationId(1448),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -46618,7 +46649,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 30660, 30667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1447),
+            id: DeclarationId(1449),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46638,7 +46669,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 36579, 36600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1448),
+            id: DeclarationId(1450),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46658,7 +46689,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 36606, 36637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1449),
+            id: DeclarationId(1451),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -46677,7 +46708,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(1450),
+            id: DeclarationId(1452),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -46696,7 +46727,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(1451),
+            id: DeclarationId(1453),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46716,7 +46747,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(1452),
+            id: DeclarationId(1454),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46736,12 +46767,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(1453),
+            id: DeclarationId(1455),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tokens".to_string(),
-                    ty: DeclarationId(1452),
+                    ty: DeclarationId(1454),
                 }],
             },
             type_params: vec![],
@@ -46755,7 +46786,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(1454),
+            id: DeclarationId(1456),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -46780,7 +46811,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(1455),
+            id: DeclarationId(1457),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -46799,7 +46830,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(1456),
+            id: DeclarationId(1458),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -46828,7 +46859,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(1457),
+            id: DeclarationId(1459),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -46842,7 +46873,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 14353, 14363),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1458),
+            id: DeclarationId(1460),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -46861,7 +46892,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 14368, 14406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1459),
+            id: DeclarationId(1461),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -46880,7 +46911,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 14411, 14449),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1460),
+            id: DeclarationId(1462),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -46899,7 +46930,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 14695, 14730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1461),
+            id: DeclarationId(1463),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -46913,7 +46944,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 14735, 14747),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1462),
+            id: DeclarationId(1464),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -46932,7 +46963,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 15169, 15198),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1463),
+            id: DeclarationId(1465),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -46951,7 +46982,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 15203, 15228),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1464),
+            id: DeclarationId(1466),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -46965,7 +46996,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 15741, 15751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1465),
+            id: DeclarationId(1467),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -46984,7 +47015,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 15756, 15794),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1466),
+            id: DeclarationId(1468),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47003,7 +47034,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 16499, 16526),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1467),
+            id: DeclarationId(1469),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47022,7 +47053,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 16531, 16559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1468),
+            id: DeclarationId(1470),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -47042,12 +47073,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 16587, 16599),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1469),
+            id: DeclarationId(1471),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "fields".to_string(),
-                    ty: DeclarationId(1468),
+                    ty: DeclarationId(1470),
                 }],
             },
             type_params: vec![],
@@ -47061,7 +47092,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 16564, 16601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1470),
+            id: DeclarationId(1472),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47075,7 +47106,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 17278, 17291),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1471),
+            id: DeclarationId(1473),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47089,7 +47120,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 17296, 17310),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1472),
+            id: DeclarationId(1474),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47108,7 +47139,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 17315, 17347),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1473),
+            id: DeclarationId(1475),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47127,7 +47158,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 19517, 19558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1474),
+            id: DeclarationId(1476),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -47152,7 +47183,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 19563, 19632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1475),
+            id: DeclarationId(1477),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -47189,7 +47220,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 19637, 19787),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1476),
+            id: DeclarationId(1478),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47203,7 +47234,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 20536, 20557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1477),
+            id: DeclarationId(1479),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -47223,12 +47254,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 20588, 20615),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1478),
+            id: DeclarationId(1480),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "first_breaker".to_string(),
-                    ty: DeclarationId(1477),
+                    ty: DeclarationId(1479),
                 }],
             },
             type_params: vec![],
@@ -47242,7 +47273,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 20562, 20617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1479),
+            id: DeclarationId(1481),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -47262,12 +47293,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 24541, 24562),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1480),
+            id: DeclarationId(1482),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "ops".to_string(),
-                    ty: DeclarationId(1479),
+                    ty: DeclarationId(1481),
                 }],
             },
             type_params: vec![],
@@ -47281,7 +47312,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 24521, 24564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1481),
+            id: DeclarationId(1483),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -47301,12 +47332,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 24590, 24617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1482),
+            id: DeclarationId(1484),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "arms".to_string(),
-                    ty: DeclarationId(1481),
+                    ty: DeclarationId(1483),
                 }],
             },
             type_params: vec![],
@@ -47320,7 +47351,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 24569, 24619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1483),
+            id: DeclarationId(1485),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47339,7 +47370,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 24624, 24659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1484),
+            id: DeclarationId(1486),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -47359,12 +47390,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 24691, 24723),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1485),
+            id: DeclarationId(1487),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "branches".to_string(),
-                    ty: DeclarationId(1484),
+                    ty: DeclarationId(1486),
                 }],
             },
             type_params: vec![],
@@ -47378,7 +47409,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 24664, 24725),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1486),
+            id: DeclarationId(1488),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47397,7 +47428,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 25362, 25408),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1487),
+            id: DeclarationId(1489),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47416,7 +47447,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 25413, 25465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1488),
+            id: DeclarationId(1490),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47430,7 +47461,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 25962, 25982),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1489),
+            id: DeclarationId(1491),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47444,7 +47475,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 25987, 26008),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1490),
+            id: DeclarationId(1492),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47458,7 +47489,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 26013, 26036),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1491),
+            id: DeclarationId(1493),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47472,7 +47503,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 26041, 26059),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1492),
+            id: DeclarationId(1494),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47486,7 +47517,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 26064, 26082),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1493),
+            id: DeclarationId(1495),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47505,7 +47536,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 26399, 26445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1494),
+            id: DeclarationId(1496),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47524,7 +47555,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 26450, 26502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1495),
+            id: DeclarationId(1497),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47538,7 +47569,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 32456, 32462),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1496),
+            id: DeclarationId(1498),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47557,7 +47588,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 32467, 32504),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1497),
+            id: DeclarationId(1499),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47576,7 +47607,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 32509, 32546),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1498),
+            id: DeclarationId(1500),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47590,7 +47621,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 33020, 33039),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1499),
+            id: DeclarationId(1501),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47609,7 +47640,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 33044, 33093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1500),
+            id: DeclarationId(1502),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -47628,7 +47659,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1501),
+            id: DeclarationId(1503),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -47647,7 +47678,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1502),
+            id: DeclarationId(1504),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -47666,7 +47697,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1503),
+            id: DeclarationId(1505),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -47685,7 +47716,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1504),
+            id: DeclarationId(1506),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -47704,7 +47735,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1505),
+            id: DeclarationId(1507),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -47723,7 +47754,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1506),
+            id: DeclarationId(1508),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -47743,7 +47774,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 28003, 28024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1507),
+            id: DeclarationId(1509),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -47763,7 +47794,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 28088, 28109),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1508),
+            id: DeclarationId(1510),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47777,7 +47808,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 754, 764),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1509),
+            id: DeclarationId(1511),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47796,7 +47827,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 769, 788),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1510),
+            id: DeclarationId(1512),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47810,7 +47841,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 793, 803),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1511),
+            id: DeclarationId(1513),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -47829,7 +47860,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1512),
+            id: DeclarationId(1514),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47848,7 +47879,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 1379, 1393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1513),
+            id: DeclarationId(1515),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47867,7 +47898,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 1398, 1411),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1514),
+            id: DeclarationId(1516),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47886,7 +47917,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 1416, 1433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1515),
+            id: DeclarationId(1517),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47905,7 +47936,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 3566, 3586),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1516),
+            id: DeclarationId(1518),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47924,7 +47955,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 3591, 3619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1517),
+            id: DeclarationId(1519),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47943,7 +47974,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 3624, 3658),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1518),
+            id: DeclarationId(1520),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47962,7 +47993,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 3663, 3692),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1519),
+            id: DeclarationId(1521),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47981,7 +48012,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 3697, 3714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1520),
+            id: DeclarationId(1522),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47995,7 +48026,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 4338, 4345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1521),
+            id: DeclarationId(1523),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48014,7 +48045,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 4350, 4400),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1522),
+            id: DeclarationId(1524),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48033,7 +48064,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 5964, 5988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1523),
+            id: DeclarationId(1525),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48047,7 +48078,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6013, 6022),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1524),
+            id: DeclarationId(1526),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48066,7 +48097,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6027, 6063),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1525),
+            id: DeclarationId(1527),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -48091,7 +48122,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6375, 6425),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1526),
+            id: DeclarationId(1528),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48105,7 +48136,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6430, 6439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1527),
+            id: DeclarationId(1529),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(786),
@@ -48125,12 +48156,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7015, 7028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1528),
+            id: DeclarationId(1530),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1527),
+                    ty: DeclarationId(1529),
                 }],
             },
             type_params: vec![],
@@ -48144,7 +48175,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7003, 7029),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1529),
+            id: DeclarationId(1531),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48158,7 +48189,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7034, 7051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1530),
+            id: DeclarationId(1532),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48177,7 +48208,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7302, 7312),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1531),
+            id: DeclarationId(1533),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48191,7 +48222,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7317, 7326),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1532),
+            id: DeclarationId(1534),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48205,7 +48236,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7331, 7340),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1533),
+            id: DeclarationId(1535),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48224,7 +48255,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7767, 7787),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1534),
+            id: DeclarationId(1536),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48243,7 +48274,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7792, 7816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1535),
+            id: DeclarationId(1537),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48263,12 +48294,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7828, 7844),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1536),
+            id: DeclarationId(1538),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1535),
+                    ty: DeclarationId(1537),
                 }],
             },
             type_params: vec![],
@@ -48282,7 +48313,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7821, 7845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1537),
+            id: DeclarationId(1539),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48302,12 +48333,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7855, 7871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1538),
+            id: DeclarationId(1540),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1537),
+                    ty: DeclarationId(1539),
                 }],
             },
             type_params: vec![],
@@ -48321,7 +48352,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7850, 7872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1539),
+            id: DeclarationId(1541),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48341,12 +48372,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7881, 7897),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1540),
+            id: DeclarationId(1542),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1539),
+                    ty: DeclarationId(1541),
                 }],
             },
             type_params: vec![],
@@ -48360,7 +48391,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7877, 7898),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1541),
+            id: DeclarationId(1543),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48380,7 +48411,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7961, 7977),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1542),
+            id: DeclarationId(1544),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -48390,7 +48421,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "payload".to_string(),
-                        ty: DeclarationId(1541),
+                        ty: DeclarationId(1543),
                     },
                 ],
             },
@@ -48405,7 +48436,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7903, 7983),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1543),
+            id: DeclarationId(1545),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48424,7 +48455,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9596, 9625),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1544),
+            id: DeclarationId(1546),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48444,12 +48475,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9660, 9676),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1545),
+            id: DeclarationId(1547),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "fields".to_string(),
-                    ty: DeclarationId(1544),
+                    ty: DeclarationId(1546),
                 }],
             },
             type_params: vec![],
@@ -48463,7 +48494,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9630, 9678),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1546),
+            id: DeclarationId(1548),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48482,7 +48513,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9683, 9711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1547),
+            id: DeclarationId(1549),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48502,12 +48533,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9730, 9746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1548),
+            id: DeclarationId(1550),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1547),
+                    ty: DeclarationId(1549),
                 }],
             },
             type_params: vec![],
@@ -48521,7 +48552,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9716, 9747),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1549),
+            id: DeclarationId(1551),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48541,12 +48572,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9765, 9781),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1550),
+            id: DeclarationId(1552),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1549),
+                    ty: DeclarationId(1551),
                 }],
             },
             type_params: vec![],
@@ -48560,7 +48591,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9752, 9782),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1551),
+            id: DeclarationId(1553),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48579,7 +48610,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11036, 11059),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1552),
+            id: DeclarationId(1554),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48598,7 +48629,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11064, 11098),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1553),
+            id: DeclarationId(1555),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48612,7 +48643,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11103, 11110),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1554),
+            id: DeclarationId(1556),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48626,7 +48657,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11115, 11121),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1555),
+            id: DeclarationId(1557),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48645,7 +48676,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11126, 11146),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1556),
+            id: DeclarationId(1558),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48664,7 +48695,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11375, 11392),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1557),
+            id: DeclarationId(1559),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48684,12 +48715,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11414, 11429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1558),
+            id: DeclarationId(1560),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "children".to_string(),
-                    ty: DeclarationId(1557),
+                    ty: DeclarationId(1559),
                 }],
             },
             type_params: vec![],
@@ -48703,7 +48734,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11397, 11431),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1559),
+            id: DeclarationId(1561),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48723,12 +48754,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11453, 11468),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1560),
+            id: DeclarationId(1562),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "variants".to_string(),
-                    ty: DeclarationId(1559),
+                    ty: DeclarationId(1561),
                 }],
             },
             type_params: vec![],
@@ -48742,7 +48773,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11436, 11470),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1561),
+            id: DeclarationId(1563),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48762,13 +48793,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11497, 11516),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1562),
+            id: DeclarationId(1564),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(1561),
+                        ty: DeclarationId(1563),
                     },
                     Field {
                         label: "output".to_string(),
@@ -48791,7 +48822,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11475, 11572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1563),
+            id: DeclarationId(1565),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -48816,7 +48847,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11577, 11655),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1564),
+            id: DeclarationId(1566),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48836,7 +48867,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11723, 11745),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1565),
+            id: DeclarationId(1567),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -48846,7 +48877,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "arguments".to_string(),
-                        ty: DeclarationId(1564),
+                        ty: DeclarationId(1566),
                     },
                 ],
             },
@@ -48861,7 +48892,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11660, 11751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1566),
+            id: DeclarationId(1568),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -48880,7 +48911,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1567),
+            id: DeclarationId(1569),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48900,7 +48931,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11852, 11871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1568),
+            id: DeclarationId(1570),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48920,7 +48951,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11890, 11912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1569),
+            id: DeclarationId(1571),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -48939,7 +48970,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1570),
+            id: DeclarationId(1572),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -48958,7 +48989,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1571),
+            id: DeclarationId(1573),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -48977,7 +49008,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1572),
+            id: DeclarationId(1574),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -48996,7 +49027,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1573),
+            id: DeclarationId(1575),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49016,7 +49047,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13149, 13168),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1574),
+            id: DeclarationId(1576),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49030,7 +49061,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13449, 13452),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1575),
+            id: DeclarationId(1577),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49044,7 +49075,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13457, 13460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1576),
+            id: DeclarationId(1578),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49058,7 +49089,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13465, 13468),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1577),
+            id: DeclarationId(1579),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49072,7 +49103,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13473, 13476),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1578),
+            id: DeclarationId(1580),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49086,7 +49117,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13600, 13602),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1579),
+            id: DeclarationId(1581),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49100,7 +49131,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13607, 13609),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1580),
+            id: DeclarationId(1582),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49114,7 +49145,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13614, 13616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1581),
+            id: DeclarationId(1583),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49128,7 +49159,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13621, 13623),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1582),
+            id: DeclarationId(1584),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49142,7 +49173,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13628, 13630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1583),
+            id: DeclarationId(1585),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49156,7 +49187,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13635, 13637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1584),
+            id: DeclarationId(1586),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49170,7 +49201,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14414, 14417),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1585),
+            id: DeclarationId(1587),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49184,7 +49215,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14422, 14424),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1586),
+            id: DeclarationId(1588),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49203,7 +49234,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14660, 14684),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1587),
+            id: DeclarationId(1589),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49222,7 +49253,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14689, 14713),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1588),
+            id: DeclarationId(1590),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49241,7 +49272,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14718, 14736),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1589),
+            id: DeclarationId(1591),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49260,7 +49291,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14923, 14946),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1590),
+            id: DeclarationId(1592),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49279,7 +49310,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14951, 15007),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1591),
+            id: DeclarationId(1593),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49298,7 +49329,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15012, 15066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1592),
+            id: DeclarationId(1594),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49317,7 +49348,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15071, 15093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1593),
+            id: DeclarationId(1595),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -49342,7 +49373,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15218, 15270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1594),
+            id: DeclarationId(1596),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49361,7 +49392,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15275, 15305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1595),
+            id: DeclarationId(1597),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49380,7 +49411,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1596),
+            id: DeclarationId(1598),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -49400,7 +49431,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 17460, 17491),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1597),
+            id: DeclarationId(1599),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(725),
@@ -49420,7 +49451,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 17515, 17545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1598),
+            id: DeclarationId(1600),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49439,7 +49470,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18168, 18197),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1599),
+            id: DeclarationId(1601),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -49464,7 +49495,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18202, 18249),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1600),
+            id: DeclarationId(1602),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49483,7 +49514,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1601),
+            id: DeclarationId(1603),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49503,7 +49534,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18607, 18619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1602),
+            id: DeclarationId(1604),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49517,7 +49548,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18860, 18869),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1603),
+            id: DeclarationId(1605),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49537,7 +49568,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18927, 18943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1604),
+            id: DeclarationId(1606),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49556,7 +49587,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1605),
+            id: DeclarationId(1607),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49570,7 +49601,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19445, 19457),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1606),
+            id: DeclarationId(1608),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49590,7 +49621,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19535, 19547),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1607),
+            id: DeclarationId(1609),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49609,7 +49640,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1608),
+            id: DeclarationId(1610),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49628,7 +49659,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1609),
+            id: DeclarationId(1611),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49647,7 +49678,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19737, 19753),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1610),
+            id: DeclarationId(1612),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49666,7 +49697,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19758, 19782),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1611),
+            id: DeclarationId(1613),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49685,7 +49716,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19787, 19805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1612),
+            id: DeclarationId(1614),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49704,7 +49735,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19810, 19824),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1613),
+            id: DeclarationId(1615),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49723,7 +49754,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19829, 19843),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1614),
+            id: DeclarationId(1616),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49743,7 +49774,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19872, 19889),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1615),
+            id: DeclarationId(1617),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49763,7 +49794,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19899, 19913),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1616),
+            id: DeclarationId(1618),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49783,7 +49814,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19923, 19936),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1617),
+            id: DeclarationId(1619),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49803,7 +49834,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19949, 19962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1618),
+            id: DeclarationId(1620),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49822,7 +49853,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 26045, 26063),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1619),
+            id: DeclarationId(1621),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49836,7 +49867,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 26068, 26074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1620),
+            id: DeclarationId(1622),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -49856,12 +49887,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 26107, 26131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1621),
+            id: DeclarationId(1623),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "candidates".to_string(),
-                    ty: DeclarationId(1620),
+                    ty: DeclarationId(1622),
                 }],
             },
             type_params: vec![],
@@ -49875,7 +49906,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 26079, 26133),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1622),
+            id: DeclarationId(1624),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -49895,7 +49926,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 10942, 10962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1623),
+            id: DeclarationId(1625),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -49915,7 +49946,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11026, 11046),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1624),
+            id: DeclarationId(1626),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -49935,7 +49966,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11114, 11144),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1625),
+            id: DeclarationId(1627),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49955,7 +49986,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11611, 11629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1626),
+            id: DeclarationId(1628),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -49975,7 +50006,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11635, 11665),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1627),
+            id: DeclarationId(1629),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49995,7 +50026,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 14162, 14180),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1628),
+            id: DeclarationId(1630),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -50015,7 +50046,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22217, 22247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1629),
+            id: DeclarationId(1631),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50035,7 +50066,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22252, 22270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1630),
+            id: DeclarationId(1632),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50055,7 +50086,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22530, 22548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1631),
+            id: DeclarationId(1633),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50075,7 +50106,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22553, 22571),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1632),
+            id: DeclarationId(1634),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50095,7 +50126,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23044, 23062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1633),
+            id: DeclarationId(1635),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50115,7 +50146,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23067, 23085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1634),
+            id: DeclarationId(1636),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50135,7 +50166,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23186, 23204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1635),
+            id: DeclarationId(1637),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50155,7 +50186,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23524, 23542),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1636),
+            id: DeclarationId(1638),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50175,7 +50206,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23547, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1637),
+            id: DeclarationId(1639),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50195,7 +50226,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 25113, 25131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1638),
+            id: DeclarationId(1640),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50215,7 +50246,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 25384, 25402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1639),
+            id: DeclarationId(1641),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50235,7 +50266,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 25850, 25868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1640),
+            id: DeclarationId(1642),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50255,7 +50286,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 27885, 27903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1641),
+            id: DeclarationId(1643),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50275,7 +50306,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 27933, 27951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1642),
+            id: DeclarationId(1644),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50295,7 +50326,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28238, 28256),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1643),
+            id: DeclarationId(1645),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50315,7 +50346,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28284, 28302),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1644),
+            id: DeclarationId(1646),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50335,7 +50366,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28662, 28680),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1645),
+            id: DeclarationId(1647),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50355,7 +50386,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28685, 28703),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1646),
+            id: DeclarationId(1648),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50369,7 +50400,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 4953, 4965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1647),
+            id: DeclarationId(1649),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50383,7 +50414,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 4970, 4986),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1648),
+            id: DeclarationId(1650),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50397,7 +50428,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 4991, 5005),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1649),
+            id: DeclarationId(1651),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50411,7 +50442,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 5855, 5868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1650),
+            id: DeclarationId(1652),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50425,7 +50456,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 5873, 5888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1651),
+            id: DeclarationId(1653),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50439,7 +50470,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 5893, 5909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1652),
+            id: DeclarationId(1654),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50453,7 +50484,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 5914, 5927),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1653),
+            id: DeclarationId(1655),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -50472,7 +50503,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1654),
+            id: DeclarationId(1656),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -50491,7 +50522,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1655),
+            id: DeclarationId(1657),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -50510,7 +50541,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1656),
+            id: DeclarationId(1658),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -50529,7 +50560,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1657),
+            id: DeclarationId(1659),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50543,7 +50574,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 8405, 8414),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1658),
+            id: DeclarationId(1660),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50562,7 +50593,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 8419, 8465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1659),
+            id: DeclarationId(1661),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50581,7 +50612,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9506, 9523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1660),
+            id: DeclarationId(1662),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50600,7 +50631,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9528, 9552),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1661),
+            id: DeclarationId(1663),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -50625,7 +50656,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9557, 9619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1662),
+            id: DeclarationId(1664),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -50645,12 +50676,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9636, 9666),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1663),
+            id: DeclarationId(1665),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1662),
+                    ty: DeclarationId(1664),
                 }],
             },
             type_params: vec![],
@@ -50664,7 +50695,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9624, 9667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1664),
+            id: DeclarationId(1666),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -50684,12 +50715,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9680, 9710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1665),
+            id: DeclarationId(1667),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1664),
+                    ty: DeclarationId(1666),
                 }],
             },
             type_params: vec![],
@@ -50703,7 +50734,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9672, 9711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1666),
+            id: DeclarationId(1668),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50722,7 +50753,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9716, 9737),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1667),
+            id: DeclarationId(1669),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50741,7 +50772,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9742, 9761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1668),
+            id: DeclarationId(1670),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(31),
@@ -50761,7 +50792,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9479, 9501),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1669),
+            id: DeclarationId(1671),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50775,7 +50806,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18143, 18156),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1670),
+            id: DeclarationId(1672),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50789,7 +50820,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18161, 18169),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1671),
+            id: DeclarationId(1673),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50803,7 +50834,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18174, 18185),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1672),
+            id: DeclarationId(1674),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50817,7 +50848,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18190, 18207),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1673),
+            id: DeclarationId(1675),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50831,7 +50862,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18212, 18226),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1674),
+            id: DeclarationId(1676),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50850,7 +50881,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18231, 18280),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1675),
+            id: DeclarationId(1677),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50864,7 +50895,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18285, 18301),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1676),
+            id: DeclarationId(1678),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50878,7 +50909,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18306, 18318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1677),
+            id: DeclarationId(1679),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(43),
@@ -50898,7 +50929,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18107, 18138),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1678),
+            id: DeclarationId(1680),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(691),
@@ -50918,7 +50949,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11495, 11507),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1679),
+            id: DeclarationId(1681),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(728)],
@@ -50936,7 +50967,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(1680),
+            id: DeclarationId(1682),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(704),
@@ -50946,7 +50977,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         value: DeclarationId(849),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1415),
+                        parameter: DeclarationId(1417),
                         value: DeclarationId(856),
                     },
                 ],
@@ -50962,7 +50993,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11488, 11535),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1681),
+            id: DeclarationId(1683),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(691),
@@ -50982,7 +51013,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11795, 11810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1682),
+            id: DeclarationId(1684),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(849), DeclarationId(849)],
@@ -51000,7 +51031,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(1683),
+            id: DeclarationId(1685),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
@@ -51014,7 +51045,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         value: DeclarationId(849),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1405),
+                        parameter: DeclarationId(1407),
                         value: DeclarationId(860),
                     },
                 ],
@@ -51030,7 +51061,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 14202, 14245),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1684),
+            id: DeclarationId(1686),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(850), DeclarationId(694)],
@@ -51048,7 +51079,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(1685),
+            id: DeclarationId(1687),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
@@ -51058,7 +51089,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         value: DeclarationId(850),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1405),
+                        parameter: DeclarationId(1407),
                         value: DeclarationId(886),
                     },
                     TemplateArgument {
@@ -51078,7 +51109,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 16911, 17021),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1686),
+            id: DeclarationId(1688),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(850), DeclarationId(694)],
@@ -51096,7 +51127,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(1687),
+            id: DeclarationId(1689),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
@@ -51106,7 +51137,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         value: DeclarationId(850),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1405),
+                        parameter: DeclarationId(1407),
                         value: DeclarationId(886),
                     },
                     TemplateArgument {
@@ -51126,7 +51157,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 17076, 17186),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1688),
+            id: DeclarationId(1690),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -51146,7 +51177,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22293, 22323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1689),
+            id: DeclarationId(1691),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -51166,7 +51197,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22275, 22324),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1690),
+            id: DeclarationId(1692),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -51186,7 +51217,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22603, 22610),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1691),
+            id: DeclarationId(1693),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -51206,7 +51237,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22737, 22789),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1692),
+            id: DeclarationId(1694),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -51226,7 +51257,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23140, 23147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1693),
+            id: DeclarationId(1695),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -51246,7 +51277,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23118, 23148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1694),
+            id: DeclarationId(1696),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -51266,7 +51297,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23597, 23604),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1695),
+            id: DeclarationId(1697),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -51286,7 +51317,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23735, 23792),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1696),
+            id: DeclarationId(1698),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -51306,7 +51337,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 25317, 25349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1697),
+            id: DeclarationId(1699),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -51326,7 +51357,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 27988, 27995),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1698),
+            id: DeclarationId(1700),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -51346,7 +51377,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28136, 28201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1699),
+            id: DeclarationId(1701),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(850), DeclarationId(849)],
@@ -51364,7 +51395,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(1700),
+            id: DeclarationId(1702),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
@@ -51378,7 +51409,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         value: DeclarationId(849),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1405),
+                        parameter: DeclarationId(1407),
                         value: DeclarationId(886),
                     },
                 ],
@@ -51394,7 +51425,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28319, 28377),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1701),
+            id: DeclarationId(1703),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -51414,7 +51445,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28403, 28449),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1702),
+            id: DeclarationId(1704),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -51434,11 +51465,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28720, 28727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1703),
+            id: DeclarationId(1705),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1645), DeclarationId(849)],
-                output: DeclarationId(1645),
+                inputs: vec![DeclarationId(1647), DeclarationId(849)],
+                output: DeclarationId(1647),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -51452,21 +51483,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(1704),
+            id: DeclarationId(1706),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
                 arguments: vec![
                     TemplateArgument {
                         parameter: DeclarationId(695),
-                        value: DeclarationId(1645),
+                        value: DeclarationId(1647),
                     },
                     TemplateArgument {
                         parameter: DeclarationId(694),
                         value: DeclarationId(849),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1405),
+                        parameter: DeclarationId(1407),
                         value: DeclarationId(889),
                     },
                 ],
@@ -51482,7 +51513,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28708, 28749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1705),
+            id: DeclarationId(1707),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -51502,7 +51533,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(1706),
+            id: DeclarationId(1708),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -51521,7 +51552,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(1707),
+            id: DeclarationId(1709),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -51540,7 +51571,7 @@ 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(1708),
+            id: DeclarationId(1710),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -51560,7 +51591,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_operations.dag", 6546, 6561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1709),
+            id: DeclarationId(1711),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -51580,12 +51611,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2718, 2749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1710),
+            id: DeclarationId(1712),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "content".to_string(),
-                    ty: DeclarationId(1709),
+                    ty: DeclarationId(1711),
                 }],
             },
             type_params: vec![],
@@ -51599,7 +51630,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2690, 2751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1711),
+            id: DeclarationId(1713),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -51619,12 +51650,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2784, 2820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1712),
+            id: DeclarationId(1714),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "content".to_string(),
-                    ty: DeclarationId(1711),
+                    ty: DeclarationId(1713),
                 }],
             },
             type_params: vec![],
@@ -51638,7 +51669,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2756, 2822),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1713),
+            id: DeclarationId(1715),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -51663,7 +51694,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3211, 3276),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1714),
+            id: DeclarationId(1716),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51682,7 +51713,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3281, 3305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1715),
+            id: DeclarationId(1717),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51701,7 +51732,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3568, 3596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1716),
+            id: DeclarationId(1718),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51720,7 +51751,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3601, 3637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1717),
+            id: DeclarationId(1719),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51739,7 +51770,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4332, 4354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1718),
+            id: DeclarationId(1720),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -51759,12 +51790,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4376, 4406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1719),
+            id: DeclarationId(1721),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1718),
+                    ty: DeclarationId(1720),
                 }],
             },
             type_params: vec![],
@@ -51778,7 +51809,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4359, 4407),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1720),
+            id: DeclarationId(1722),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51792,7 +51823,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5616, 5623),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1721),
+            id: DeclarationId(1723),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51806,7 +51837,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5749, 5761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1722),
+            id: DeclarationId(1724),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51825,7 +51856,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5979, 6014),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1723),
+            id: DeclarationId(1725),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51844,7 +51875,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6019, 6062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1724),
+            id: DeclarationId(1726),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51863,7 +51894,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6067, 6144),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1725),
+            id: DeclarationId(1727),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -51883,7 +51914,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6234, 6268),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1726),
+            id: DeclarationId(1728),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -51902,7 +51933,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1727),
+            id: DeclarationId(1729),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -51921,7 +51952,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1728),
+            id: DeclarationId(1730),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -51935,15 +51966,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(1725),
+                        ty: DeclarationId(1727),
                     },
                     Field {
                         label: "citations".to_string(),
-                        ty: DeclarationId(1726),
+                        ty: DeclarationId(1728),
                     },
                     Field {
                         label: "cache_control".to_string(),
-                        ty: DeclarationId(1727),
+                        ty: DeclarationId(1729),
                     },
                 ],
             },
@@ -51958,7 +51989,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6149, 6364),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1729),
+            id: DeclarationId(1731),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51977,7 +52008,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6369, 6418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1730),
+            id: DeclarationId(1732),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51996,7 +52027,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6926, 6962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1731),
+            id: DeclarationId(1733),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52015,7 +52046,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1732),
+            id: DeclarationId(1734),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52034,7 +52065,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1733),
+            id: DeclarationId(1735),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52044,11 +52075,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(1731),
+                        ty: DeclarationId(1733),
                     },
                     Field {
                         label: "is_error".to_string(),
-                        ty: DeclarationId(1732),
+                        ty: DeclarationId(1734),
                     },
                 ],
             },
@@ -52063,7 +52094,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6967, 7085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1734),
+            id: DeclarationId(1736),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52082,7 +52113,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7532, 7570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1735),
+            id: DeclarationId(1737),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52111,7 +52142,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7575, 7658),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1736),
+            id: DeclarationId(1738),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52125,7 +52156,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8016, 8023),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1737),
+            id: DeclarationId(1739),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52139,7 +52170,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8028, 8037),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1738),
+            id: DeclarationId(1740),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52153,7 +52184,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8042, 8054),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1739),
+            id: DeclarationId(1741),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52167,7 +52198,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8059, 8066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1740),
+            id: DeclarationId(1742),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52181,7 +52212,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8071, 8080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1741),
+            id: DeclarationId(1743),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52195,7 +52226,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8085, 8092),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1742),
+            id: DeclarationId(1744),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52209,7 +52240,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8097, 8123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1743),
+            id: DeclarationId(1745),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52228,7 +52259,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1744),
+            id: DeclarationId(1746),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52247,7 +52278,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1745),
+            id: DeclarationId(1747),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52261,11 +52292,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "document_title".to_string(),
-                        ty: DeclarationId(1743),
+                        ty: DeclarationId(1745),
                     },
                     Field {
                         label: "file_id".to_string(),
-                        ty: DeclarationId(1744),
+                        ty: DeclarationId(1746),
                     },
                     Field {
                         label: "start_char_index".to_string(),
@@ -52288,7 +52319,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8363, 8506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1746),
+            id: DeclarationId(1748),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52307,7 +52338,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1747),
+            id: DeclarationId(1749),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52326,7 +52357,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1748),
+            id: DeclarationId(1750),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52340,11 +52371,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "document_title".to_string(),
-                        ty: DeclarationId(1746),
+                        ty: DeclarationId(1748),
                     },
                     Field {
                         label: "file_id".to_string(),
-                        ty: DeclarationId(1747),
+                        ty: DeclarationId(1749),
                     },
                     Field {
                         label: "start_page_number".to_string(),
@@ -52367,7 +52398,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8511, 8656),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1749),
+            id: DeclarationId(1751),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52386,7 +52417,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1750),
+            id: DeclarationId(1752),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52405,7 +52436,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1751),
+            id: DeclarationId(1753),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52419,11 +52450,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "document_title".to_string(),
-                        ty: DeclarationId(1749),
+                        ty: DeclarationId(1751),
                     },
                     Field {
                         label: "file_id".to_string(),
-                        ty: DeclarationId(1750),
+                        ty: DeclarationId(1752),
                     },
                     Field {
                         label: "start_block_index".to_string(),
@@ -52446,7 +52477,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8661, 8814),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1752),
+            id: DeclarationId(1754),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52465,7 +52496,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1753),
+            id: DeclarationId(1755),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52479,7 +52510,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "title".to_string(),
-                        ty: DeclarationId(1752),
+                        ty: DeclarationId(1754),
                     },
                     Field {
                         label: "url".to_string(),
@@ -52498,7 +52529,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8819, 8919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1754),
+            id: DeclarationId(1756),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52517,7 +52548,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1755),
+            id: DeclarationId(1757),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52531,7 +52562,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "title".to_string(),
-                        ty: DeclarationId(1754),
+                        ty: DeclarationId(1756),
                     },
                     Field {
                         label: "search_result_index".to_string(),
@@ -52558,7 +52589,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8924, 9071),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1756),
+            id: DeclarationId(1758),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -52578,11 +52609,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1757),
+            id: DeclarationId(1759),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1756),
+                    DeclarationId(1758),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -52597,7 +52628,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1758),
+            id: DeclarationId(1760),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52607,7 +52638,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "citations".to_string(),
-                        ty: DeclarationId(1757),
+                        ty: DeclarationId(1759),
                     },
                 ],
             },
@@ -52622,7 +52653,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9650, 9732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1759),
+            id: DeclarationId(1761),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52647,7 +52678,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9737, 9798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1760),
+            id: DeclarationId(1762),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52666,7 +52697,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9803, 9858),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1761),
+            id: DeclarationId(1763),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52685,7 +52716,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1762),
+            id: DeclarationId(1764),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52703,7 +52734,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "caller".to_string(),
-                        ty: DeclarationId(1761),
+                        ty: DeclarationId(1763),
                     },
                 ],
             },
@@ -52718,7 +52749,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9863, 9940),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1763),
+            id: DeclarationId(1765),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52737,7 +52768,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1764),
+            id: DeclarationId(1766),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52755,7 +52786,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "caller".to_string(),
-                        ty: DeclarationId(1763),
+                        ty: DeclarationId(1765),
                     },
                 ],
             },
@@ -52770,7 +52801,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9945, 10045),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1765),
+            id: DeclarationId(1767),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52789,7 +52820,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1766),
+            id: DeclarationId(1768),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52803,7 +52834,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "caller".to_string(),
-                        ty: DeclarationId(1765),
+                        ty: DeclarationId(1767),
                     },
                 ],
             },
@@ -52818,7 +52849,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10050, 10136),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1767),
+            id: DeclarationId(1769),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52832,7 +52863,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10357, 10366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1768),
+            id: DeclarationId(1770),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52846,7 +52877,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10371, 10379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1769),
+            id: DeclarationId(1771),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52860,7 +52891,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10384, 10397),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1770),
+            id: DeclarationId(1772),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52874,7 +52905,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10402, 10419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1771),
+            id: DeclarationId(1773),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52888,7 +52919,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10424, 10447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1772),
+            id: DeclarationId(1774),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52902,7 +52933,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10452, 10471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1773),
+            id: DeclarationId(1775),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52916,7 +52947,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10476, 10494),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1774),
+            id: DeclarationId(1776),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52930,7 +52961,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10499, 10506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1775),
+            id: DeclarationId(1777),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52949,7 +52980,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1776),
+            id: DeclarationId(1778),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52968,7 +52999,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1777),
+            id: DeclarationId(1779),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52987,7 +53018,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1778),
+            id: DeclarationId(1780),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53001,7 +53032,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11192, 11201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1779),
+            id: DeclarationId(1781),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -53021,7 +53052,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11687, 11725),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1780),
+            id: DeclarationId(1782),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53040,7 +53071,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1781),
+            id: DeclarationId(1783),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53059,7 +53090,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1782),
+            id: DeclarationId(1784),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53073,7 +53104,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1013, 1025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1783),
+            id: DeclarationId(1785),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53087,7 +53118,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1030, 1044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1784),
+            id: DeclarationId(1786),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53101,7 +53132,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1049, 1064),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1785),
+            id: DeclarationId(1787),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53115,7 +53146,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1069, 1086),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1786),
+            id: DeclarationId(1788),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53129,7 +53160,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1091, 1114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1787),
+            id: DeclarationId(1789),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53143,7 +53174,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4719, 4726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1788),
+            id: DeclarationId(1790),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53157,7 +53188,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4731, 4735),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1789),
+            id: DeclarationId(1791),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -53177,7 +53208,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6983, 7004),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1790),
+            id: DeclarationId(1792),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53191,7 +53222,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(1791),
+            id: DeclarationId(1793),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53205,7 +53236,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(1792),
+            id: DeclarationId(1794),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53219,7 +53250,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(1793),
+            id: DeclarationId(1795),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53233,7 +53264,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(1794),
+            id: DeclarationId(1796),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53247,7 +53278,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(1795),
+            id: DeclarationId(1797),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53261,7 +53292,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(1796),
+            id: DeclarationId(1798),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53275,7 +53306,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(1797),
+            id: DeclarationId(1799),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53289,7 +53320,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(1798),
+            id: DeclarationId(1800),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53303,7 +53334,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(1799),
+            id: DeclarationId(1801),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53317,7 +53348,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(1800),
+            id: DeclarationId(1802),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53331,7 +53362,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(1801),
+            id: DeclarationId(1803),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53345,7 +53376,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(1802),
+            id: DeclarationId(1804),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53359,7 +53390,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(1803),
+            id: DeclarationId(1805),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53373,7 +53404,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(1804),
+            id: DeclarationId(1806),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53387,7 +53418,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(1805),
+            id: DeclarationId(1807),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53401,7 +53432,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(1806),
+            id: DeclarationId(1808),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53415,7 +53446,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(1807),
+            id: DeclarationId(1809),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53429,7 +53460,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(1808),
+            id: DeclarationId(1810),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53443,7 +53474,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(1809),
+            id: DeclarationId(1811),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53457,7 +53488,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(1810),
+            id: DeclarationId(1812),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53471,7 +53502,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(1811),
+            id: DeclarationId(1813),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -53491,7 +53522,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(1812),
+            id: DeclarationId(1814),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53505,7 +53536,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(1813),
+            id: DeclarationId(1815),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53519,7 +53550,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(1814),
+            id: DeclarationId(1816),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53533,7 +53564,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(1815),
+            id: DeclarationId(1817),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53547,7 +53578,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(1816),
+            id: DeclarationId(1818),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53566,7 +53597,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1817),
+            id: DeclarationId(1819),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53585,7 +53616,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1818),
+            id: DeclarationId(1820),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53604,7 +53635,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1819),
+            id: DeclarationId(1821),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53623,7 +53654,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1820),
+            id: DeclarationId(1822),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53642,7 +53673,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1821),
+            id: DeclarationId(1823),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53661,7 +53692,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1822),
+            id: DeclarationId(1824),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53680,7 +53711,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1430, 1462),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1823),
+            id: DeclarationId(1825),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53699,7 +53730,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1467, 1503),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1824),
+            id: DeclarationId(1826),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53718,7 +53749,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1508, 1545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1825),
+            id: DeclarationId(1827),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53737,7 +53768,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1550, 1576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1826),
+            id: DeclarationId(1828),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53756,7 +53787,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1581, 1614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1827),
+            id: DeclarationId(1829),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53770,7 +53801,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1619, 1636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1828),
+            id: DeclarationId(1830),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53789,7 +53820,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1641, 1695),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1829),
+            id: DeclarationId(1831),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53803,7 +53834,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1700, 1707),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1830),
+            id: DeclarationId(1832),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53822,7 +53853,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2059, 2097),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1831),
+            id: DeclarationId(1833),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -53847,7 +53878,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2102, 2176),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1832),
+            id: DeclarationId(1834),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -53872,7 +53903,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2181, 2256),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1833),
+            id: DeclarationId(1835),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -53897,7 +53928,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2261, 2334),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1834),
+            id: DeclarationId(1836),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53916,7 +53947,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2339, 2376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1835),
+            id: DeclarationId(1837),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53935,7 +53966,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2381, 2418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1836),
+            id: DeclarationId(1838),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53954,7 +53985,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2423, 2464),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1837),
+            id: DeclarationId(1839),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53968,7 +53999,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2469, 2485),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1838),
+            id: DeclarationId(1840),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53982,7 +54013,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3221, 3231),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1839),
+            id: DeclarationId(1841),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54001,7 +54032,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3236, 3283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1840),
+            id: DeclarationId(1842),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54020,7 +54051,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3288, 3339),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1841),
+            id: DeclarationId(1843),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54034,7 +54065,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3529, 3533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1842),
+            id: DeclarationId(1844),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54048,7 +54079,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3538, 3545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1843),
+            id: DeclarationId(1845),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54062,7 +54093,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3550, 3556),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1844),
+            id: DeclarationId(1846),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54081,7 +54112,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1845),
+            id: DeclarationId(1847),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54095,7 +54126,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7493, 7504),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1846),
+            id: DeclarationId(1848),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54109,7 +54140,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7553, 7567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1847),
+            id: DeclarationId(1849),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54123,7 +54154,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7632, 7648),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1848),
+            id: DeclarationId(1850),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54137,7 +54168,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(1849),
+            id: DeclarationId(1851),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54151,7 +54182,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(1850),
+            id: DeclarationId(1852),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54165,7 +54196,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(1851),
+            id: DeclarationId(1853),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54179,7 +54210,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(1852),
+            id: DeclarationId(1854),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54193,7 +54224,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(1853),
+            id: DeclarationId(1855),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54207,7 +54238,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(1854),
+            id: DeclarationId(1856),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54221,7 +54252,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(1855),
+            id: DeclarationId(1857),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54235,7 +54266,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(1856),
+            id: DeclarationId(1858),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54249,7 +54280,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(1857),
+            id: DeclarationId(1859),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54263,7 +54294,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(1858),
+            id: DeclarationId(1860),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54277,7 +54308,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(1859),
+            id: DeclarationId(1861),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54291,7 +54322,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(1860),
+            id: DeclarationId(1862),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54305,7 +54336,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(1861),
+            id: DeclarationId(1863),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54319,7 +54350,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(1862),
+            id: DeclarationId(1864),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -54339,7 +54370,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(1863),
+            id: DeclarationId(1865),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -54359,7 +54390,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(1864),
+            id: DeclarationId(1866),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54373,7 +54404,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(1865),
+            id: DeclarationId(1867),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54387,7 +54418,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(1866),
+            id: DeclarationId(1868),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54406,7 +54437,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 6759, 6786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1867),
+            id: DeclarationId(1869),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54420,7 +54451,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7611, 7616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1868),
+            id: DeclarationId(1870),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54434,7 +54465,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7621, 7630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1869),
+            id: DeclarationId(1871),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -54460,7 +54491,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 9513, 9555),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1870),
+            id: DeclarationId(1872),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54474,7 +54505,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3853, 3857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1871),
+            id: DeclarationId(1873),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54488,7 +54519,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3860, 3864),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1872),
+            id: DeclarationId(1874),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54502,7 +54533,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3867, 3871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1873),
+            id: DeclarationId(1875),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54516,7 +54547,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3874, 3879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1874),
+            id: DeclarationId(1876),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54530,7 +54561,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3882, 3893),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1875),
+            id: DeclarationId(1877),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54544,7 +54575,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3896, 3909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1876),
+            id: DeclarationId(1878),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54558,7 +54589,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4489, 4494),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1877),
+            id: DeclarationId(1879),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54572,7 +54603,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4497, 4506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1878),
+            id: DeclarationId(1880),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54586,7 +54617,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4509, 4515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1879),
+            id: DeclarationId(1881),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54600,7 +54631,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4518, 4522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1880),
+            id: DeclarationId(1882),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54614,7 +54645,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4525, 4529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1881),
+            id: DeclarationId(1883),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -54634,7 +54665,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5923, 5941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1882),
+            id: DeclarationId(1884),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -54654,7 +54685,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6396, 6424),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1883),
+            id: DeclarationId(1885),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54668,7 +54699,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1099, 1113),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1884),
+            id: DeclarationId(1886),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54682,7 +54713,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1118, 1128),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1885),
+            id: DeclarationId(1887),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54696,7 +54727,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1133, 1145),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1886),
+            id: DeclarationId(1888),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54710,7 +54741,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1150, 1163),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1887),
+            id: DeclarationId(1889),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54724,7 +54755,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1168, 1180),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1888),
+            id: DeclarationId(1890),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54738,7 +54769,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1185, 1197),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1889),
+            id: DeclarationId(1891),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54752,7 +54783,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1202, 1224),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1890),
+            id: DeclarationId(1892),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54766,7 +54797,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1229, 1248),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1891),
+            id: DeclarationId(1893),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54780,7 +54811,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1253, 1278),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1892),
+            id: DeclarationId(1894),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54794,7 +54825,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1283, 1306),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1893),
+            id: DeclarationId(1895),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54813,7 +54844,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5506, 5542),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1894),
+            id: DeclarationId(1896),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54832,7 +54863,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5547, 5588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1895),
+            id: DeclarationId(1897),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -54852,7 +54883,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 6047, 6063),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1896),
+            id: DeclarationId(1898),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54871,7 +54902,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9175, 9216),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1897),
+            id: DeclarationId(1899),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54885,7 +54916,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9513, 9525),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1898),
+            id: DeclarationId(1900),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -54905,7 +54936,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9795, 9807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1899),
+            id: DeclarationId(1901),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -54915,7 +54946,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "sites".to_string(),
-                        ty: DeclarationId(1898),
+                        ty: DeclarationId(1900),
                     },
                 ],
             },
@@ -54930,7 +54961,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9752, 9809),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1900),
+            id: DeclarationId(1902),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54949,7 +54980,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10119, 10153),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1901),
+            id: DeclarationId(1903),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54968,7 +54999,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10556, 10607),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1902),
+            id: DeclarationId(1904),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54982,7 +55013,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10950, 10968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1903),
+            id: DeclarationId(1905),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -55011,7 +55042,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 11357, 11469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1904),
+            id: DeclarationId(1906),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -55031,7 +55062,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(1905),
+            id: DeclarationId(1907),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -55057,7 +55088,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(1906),
+            id: DeclarationId(1908),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -55083,7 +55114,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(1907),
+            id: DeclarationId(1909),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -55109,7 +55140,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(1908),
+            id: DeclarationId(1910),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -55129,7 +55160,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(1909),
+            id: DeclarationId(1911),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -55155,7 +55186,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(1910),
+            id: DeclarationId(1912),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -55181,7 +55212,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(1911),
+            id: DeclarationId(1913),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -55207,7 +55238,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(1912),
+            id: DeclarationId(1914),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -55227,7 +55258,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(1913),
+            id: DeclarationId(1915),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -55253,7 +55284,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(1914),
+            id: DeclarationId(1916),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -55279,7 +55310,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(1915),
+            id: DeclarationId(1917),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -55299,7 +55330,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(1916),
+            id: DeclarationId(1918),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -55325,7 +55356,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(1917),
+            id: DeclarationId(1919),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -55351,7 +55382,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(1918),
+            id: DeclarationId(1920),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55370,7 +55401,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(1919),
+            id: DeclarationId(1921),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -55395,7 +55426,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(1920),
+            id: DeclarationId(1922),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55409,7 +55440,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(1921),
+            id: DeclarationId(1923),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55428,7 +55459,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(1922),
+            id: DeclarationId(1924),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -55448,13 +55479,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(1923),
+            id: DeclarationId(1925),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1922),
+                    value: DeclarationId(1924),
                 }],
             },
             type_params: vec![],
@@ -55468,7 +55499,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(1924),
+            id: DeclarationId(1926),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -55482,7 +55513,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "witnesses".to_string(),
-                        ty: DeclarationId(1923),
+                        ty: DeclarationId(1925),
                     },
                 ],
             },
@@ -55497,7 +55528,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(1925),
+            id: DeclarationId(1927),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -55517,7 +55548,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(1926),
+            id: DeclarationId(1928),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -55537,13 +55568,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(1927),
+            id: DeclarationId(1929),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1926),
+                    value: DeclarationId(1928),
                 }],
             },
             type_params: vec![],
@@ -55557,7 +55588,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(1928),
+            id: DeclarationId(1930),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -55567,11 +55598,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "violations".to_string(),
-                        ty: DeclarationId(1925),
+                        ty: DeclarationId(1927),
                     },
                     Field {
                         label: "witnesses".to_string(),
-                        ty: DeclarationId(1927),
+                        ty: DeclarationId(1929),
                     },
                 ],
             },
@@ -55586,7 +55617,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(1929),
+            id: DeclarationId(1931),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -55606,11 +55637,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(1930),
+            id: DeclarationId(1932),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(1929),
+                output: DeclarationId(1931),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -55624,7 +55655,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(1931),
+            id: DeclarationId(1933),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
@@ -55644,7 +55675,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(1932),
+            id: DeclarationId(1934),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(827), DeclarationId(990)],
@@ -55662,7 +55693,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(1933),
+            id: DeclarationId(1935),
             name: Some("DimensionUnitAbelianGroup".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(25),
@@ -55682,7 +55713,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(1934),
+            id: DeclarationId(1936),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55696,7 +55727,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3709, 3721),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1935),
+            id: DeclarationId(1937),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55715,7 +55746,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3726, 3762),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1936),
+            id: DeclarationId(1938),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -55735,7 +55766,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(1937),
+            id: DeclarationId(1939),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55749,7 +55780,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4373, 4389),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1938),
+            id: DeclarationId(1940),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55768,7 +55799,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4394, 4422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1939),
+            id: DeclarationId(1941),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55782,7 +55813,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4665, 4686),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1940),
+            id: DeclarationId(1942),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55801,7 +55832,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5176, 5195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1941),
+            id: DeclarationId(1943),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55820,7 +55851,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5200, 5222),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1942),
+            id: DeclarationId(1944),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -55840,7 +55871,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5591, 5614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1943),
+            id: DeclarationId(1945),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55854,7 +55885,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6611, 6619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1944),
+            id: DeclarationId(1946),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55868,7 +55899,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6624, 6632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1945),
+            id: DeclarationId(1947),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55882,7 +55913,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7073, 7078),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1946),
+            id: DeclarationId(1948),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55896,7 +55927,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7083, 7091),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1947),
+            id: DeclarationId(1949),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55910,7 +55941,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7427, 7440),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1948),
+            id: DeclarationId(1950),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55924,7 +55955,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7445, 7451),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1949),
+            id: DeclarationId(1951),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55938,7 +55969,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7709, 7717),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1950),
+            id: DeclarationId(1952),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55952,7 +55983,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7722, 7727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1951),
+            id: DeclarationId(1953),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55966,7 +55997,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7732, 7745),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1952),
+            id: DeclarationId(1954),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55980,7 +56011,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8082, 8100),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1953),
+            id: DeclarationId(1955),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55994,7 +56025,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9475, 9484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1954),
+            id: DeclarationId(1956),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56008,7 +56039,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9489, 9502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1955),
+            id: DeclarationId(1957),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56022,7 +56053,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9507, 9515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1956),
+            id: DeclarationId(1958),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56036,7 +56067,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9520, 9530),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1957),
+            id: DeclarationId(1959),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56050,7 +56081,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9535, 9545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1958),
+            id: DeclarationId(1960),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56064,7 +56095,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9550, 9561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1959),
+            id: DeclarationId(1961),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56078,7 +56109,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9566, 9574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1960),
+            id: DeclarationId(1962),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56092,7 +56123,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9579, 9586),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1961),
+            id: DeclarationId(1963),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56106,7 +56137,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9591, 9601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1962),
+            id: DeclarationId(1964),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56120,7 +56151,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9606, 9618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1963),
+            id: DeclarationId(1965),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56134,7 +56165,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12311, 12337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1964),
+            id: DeclarationId(1966),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56148,7 +56179,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12342, 12352),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1965),
+            id: DeclarationId(1967),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56162,7 +56193,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17117, 17123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1966),
+            id: DeclarationId(1968),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56176,7 +56207,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17128, 17139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1967),
+            id: DeclarationId(1969),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56190,7 +56221,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17459, 17470),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1968),
+            id: DeclarationId(1970),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56204,7 +56235,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17475, 17486),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1969),
+            id: DeclarationId(1971),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56218,7 +56249,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 19419, 19430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1970),
+            id: DeclarationId(1972),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56232,7 +56263,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 19435, 19443),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1971),
+            id: DeclarationId(1973),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56251,7 +56282,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 20606, 20641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1972),
+            id: DeclarationId(1974),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56276,7 +56307,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 20646, 20734),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1973),
+            id: DeclarationId(1975),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -56296,7 +56327,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6894, 6922),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1974),
+            id: DeclarationId(1976),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56315,7 +56346,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1975),
+            id: DeclarationId(1977),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56334,7 +56365,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1976),
+            id: DeclarationId(1978),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -56354,7 +56385,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27850, 27865),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1977),
+            id: DeclarationId(1979),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -56374,7 +56405,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 29879, 29895),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1978),
+            id: DeclarationId(1980),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -56394,7 +56425,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 29988, 30004),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1979),
+            id: DeclarationId(1981),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -56414,13 +56445,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 30102, 30118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1980),
+            id: DeclarationId(1982),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1979),
+                    value: DeclarationId(1981),
                 }],
             },
             type_params: vec![],
@@ -56434,7 +56465,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 30097, 30119),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1981),
+            id: DeclarationId(1983),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56453,7 +56484,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1982),
+            id: DeclarationId(1984),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56472,7 +56503,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1983),
+            id: DeclarationId(1985),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56491,7 +56522,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1984),
+            id: DeclarationId(1986),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56510,7 +56541,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1985),
+            id: DeclarationId(1987),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56529,7 +56560,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1986),
+            id: DeclarationId(1988),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56548,7 +56579,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1987),
+            id: DeclarationId(1989),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56562,7 +56593,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5629, 5644),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1988),
+            id: DeclarationId(1990),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56576,7 +56607,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5684, 5697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1989),
+            id: DeclarationId(1991),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56590,7 +56621,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5745, 5762),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1990),
+            id: DeclarationId(1992),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56604,7 +56635,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5801, 5813),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1991),
+            id: DeclarationId(1993),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56618,7 +56649,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5861, 5878),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1992),
+            id: DeclarationId(1994),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56643,7 +56674,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 9971, 10033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1993),
+            id: DeclarationId(1995),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56662,7 +56693,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10038, 10080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1994),
+            id: DeclarationId(1996),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56687,7 +56718,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10085, 10142),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1995),
+            id: DeclarationId(1997),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56701,7 +56732,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10147, 10161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1996),
+            id: DeclarationId(1998),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56715,7 +56746,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10166, 10181),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1997),
+            id: DeclarationId(1999),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56729,7 +56760,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24135, 24149),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1998),
+            id: DeclarationId(2000),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56748,7 +56779,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24154, 24201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1999),
+            id: DeclarationId(2001),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56773,7 +56804,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24206, 24283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2000),
+            id: DeclarationId(2002),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56798,7 +56829,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24288, 24362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2001),
+            id: DeclarationId(2003),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56823,7 +56854,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24982, 25038),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2002),
+            id: DeclarationId(2004),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56842,7 +56873,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 25054, 25079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2003),
+            id: DeclarationId(2005),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56856,7 +56887,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26728, 26741),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2004),
+            id: DeclarationId(2006),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56875,7 +56906,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26785, 26817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2005),
+            id: DeclarationId(2007),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -56895,12 +56926,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26880, 26896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2006),
+            id: DeclarationId(2008),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "factors".to_string(),
-                    ty: DeclarationId(2005),
+                    ty: DeclarationId(2007),
                 }],
             },
             type_params: vec![],
@@ -56914,7 +56945,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26856, 26898),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2007),
+            id: DeclarationId(2009),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -56934,13 +56965,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26960, 26976),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2008),
+            id: DeclarationId(2010),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2007),
+                    value: DeclarationId(2009),
                 }],
             },
             type_params: vec![],
@@ -56954,12 +56985,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26955, 26977),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2009),
+            id: DeclarationId(2011),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-                    ty: DeclarationId(2008),
+                    ty: DeclarationId(2010),
                 }],
             },
             type_params: vec![],
@@ -56973,7 +57004,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26927, 26979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2010),
+            id: DeclarationId(2012),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -56993,12 +57024,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27277, 27292),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2011),
+            id: DeclarationId(2013),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-                    ty: DeclarationId(2010),
+                    ty: DeclarationId(2012),
                 }],
             },
             type_params: vec![],
@@ -57012,7 +57043,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27259, 27294),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2012),
+            id: DeclarationId(2014),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57026,7 +57057,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27377, 27389),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2013),
+            id: DeclarationId(2015),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57040,13 +57071,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27459, 27469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2014),
+            id: DeclarationId(2016),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1296),
+                    value: DeclarationId(1298),
                 }],
             },
             type_params: vec![],
@@ -57060,13 +57091,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(2015),
+            id: DeclarationId(2017),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1296),
+                    value: DeclarationId(1298),
                 }],
             },
             type_params: vec![],
@@ -57080,7 +57111,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(2016),
+            id: DeclarationId(2018),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -57100,11 +57131,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(2017),
+            id: DeclarationId(2019),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2016),
+                output: DeclarationId(2018),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -57118,7 +57149,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(2018),
+            id: DeclarationId(2020),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
@@ -57138,7 +57169,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(2019),
+            id: DeclarationId(2021),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1129), DeclarationId(1129)],
@@ -57156,7 +57187,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(2020),
+            id: DeclarationId(2022),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1129), DeclarationId(818)],
@@ -57174,7 +57205,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(2021),
+            id: DeclarationId(2023),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(1129)],
@@ -57192,7 +57223,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(2022),
+            id: DeclarationId(2024),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57211,7 +57242,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 3305, 3352),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2023),
+            id: DeclarationId(2025),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -57236,7 +57267,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 3357, 3418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2024),
+            id: DeclarationId(2026),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57250,7 +57281,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 4297, 4302),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2025),
+            id: DeclarationId(2027),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1133)],
@@ -57268,7 +57299,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 5301, 5321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2026),
+            id: DeclarationId(2028),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1134), DeclarationId(1134)],
@@ -57286,7 +57317,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 5334, 5360),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2027),
+            id: DeclarationId(2029),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1128),
@@ -57306,7 +57337,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 7360, 7372),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2028),
+            id: DeclarationId(2030),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1132),
@@ -57332,7 +57363,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 7388, 7419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2029),
+            id: DeclarationId(2031),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1135),
@@ -57358,7 +57389,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 9093, 9124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2030),
+            id: DeclarationId(2032),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1128),
@@ -57378,7 +57409,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 10144, 10156),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2031),
+            id: DeclarationId(2033),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -57398,7 +57429,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4589, 4600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2032),
+            id: DeclarationId(2034),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -57418,7 +57449,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4642, 4653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2033),
+            id: DeclarationId(2035),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57432,7 +57463,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4544, 4548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2034),
+            id: DeclarationId(2036),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57451,7 +57482,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4553, 4563),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2035),
+            id: DeclarationId(2037),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57475,7 +57506,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2036),
+            id: DeclarationId(2038),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57495,7 +57526,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 11243, 11254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2037),
+            id: DeclarationId(2039),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57514,7 +57545,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2137, 2162),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2038),
+            id: DeclarationId(2040),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57534,12 +57565,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2179, 2195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2039),
+            id: DeclarationId(2041),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2038),
+                    ty: DeclarationId(2040),
                 }],
             },
             type_params: vec![],
@@ -57553,7 +57584,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2167, 2196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2040),
+            id: DeclarationId(2042),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -57578,7 +57609,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2201, 2252),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2041),
+            id: DeclarationId(2043),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57597,7 +57628,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2257, 2272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2042),
+            id: DeclarationId(2044),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57616,7 +57647,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2277, 2304),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2043),
+            id: DeclarationId(2045),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -57642,7 +57673,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 3936, 3954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2044),
+            id: DeclarationId(2046),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57662,7 +57693,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 4542, 4557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2045),
+            id: DeclarationId(2047),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57681,7 +57712,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 5388, 5442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2046),
+            id: DeclarationId(2048),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57695,7 +57726,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 5682, 5691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2047),
+            id: DeclarationId(2049),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57709,7 +57740,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 5694, 5704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2048),
+            id: DeclarationId(2050),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57729,7 +57760,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5769, 5797),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2049),
+            id: DeclarationId(2051),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -57755,7 +57786,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/services.dag", 6784, 6807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2050),
+            id: DeclarationId(2052),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -57775,7 +57806,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2051),
+            id: DeclarationId(2053),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -57795,7 +57826,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4626, 4652),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2052),
+            id: DeclarationId(2054),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57815,7 +57846,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4920, 4937),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2053),
+            id: DeclarationId(2055),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57835,7 +57866,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4988, 5002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2054),
+            id: DeclarationId(2056),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57855,7 +57886,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5052, 5065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2055),
+            id: DeclarationId(2057),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57875,7 +57906,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5115, 5128),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2056),
+            id: DeclarationId(2058),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57895,7 +57926,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5176, 5192),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2057),
+            id: DeclarationId(2059),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -57915,13 +57946,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5245, 5271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2058),
+            id: DeclarationId(2060),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2057),
+                    value: DeclarationId(2059),
                 }],
             },
             type_params: vec![],
@@ -57935,7 +57966,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5240, 5272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2059),
+            id: DeclarationId(2061),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -57955,13 +57986,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5346, 5372),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2060),
+            id: DeclarationId(2062),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2059),
+                    value: DeclarationId(2061),
                 }],
             },
             type_params: vec![],
@@ -57975,7 +58006,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5341, 5373),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2061),
+            id: DeclarationId(2063),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57995,7 +58026,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5498, 5514),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2062),
+            id: DeclarationId(2064),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -58015,7 +58046,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5639, 5673),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2063),
+            id: DeclarationId(2065),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -58035,7 +58066,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5885, 5919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2064),
+            id: DeclarationId(2066),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -58055,7 +58086,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6404, 6438),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2065),
+            id: DeclarationId(2067),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -58075,7 +58106,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6665, 6699),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2066),
+            id: DeclarationId(2068),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -58095,7 +58126,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6955, 6989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2067),
+            id: DeclarationId(2069),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -58115,7 +58146,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7169, 7195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2068),
+            id: DeclarationId(2070),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -58135,7 +58166,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7200, 7234),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2069),
+            id: DeclarationId(2071),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -58155,10 +58186,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8469, 8503),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2070),
+            id: DeclarationId(2072),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1918),
+                template: DeclarationId(1920),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58175,10 +58206,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2071),
+            id: DeclarationId(2073),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1918),
+                template: DeclarationId(1920),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58195,10 +58226,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2072),
+            id: DeclarationId(2074),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1918),
+                template: DeclarationId(1920),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58215,10 +58246,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2073),
+            id: DeclarationId(2075),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1918),
+                template: DeclarationId(1920),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58235,10 +58266,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2074),
+            id: DeclarationId(2076),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1918),
+                template: DeclarationId(1920),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58255,10 +58286,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2075),
+            id: DeclarationId(2077),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1918),
+                template: DeclarationId(1920),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58275,10 +58306,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2076),
+            id: DeclarationId(2078),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1918),
+                template: DeclarationId(1920),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58295,10 +58326,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2077),
+            id: DeclarationId(2079),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1918),
+                template: DeclarationId(1920),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58315,10 +58346,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2078),
+            id: DeclarationId(2080),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1918),
+                template: DeclarationId(1920),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58335,10 +58366,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2079),
+            id: DeclarationId(2081),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1918),
+                template: DeclarationId(1920),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58355,10 +58386,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2080),
+            id: DeclarationId(2082),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1430),
+                template: DeclarationId(1432),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(799),
@@ -58375,10 +58406,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4920, 4937),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2081),
+            id: DeclarationId(2083),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1430),
+                template: DeclarationId(1432),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(827),
@@ -58395,10 +58426,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4988, 5002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2082),
+            id: DeclarationId(2084),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1430),
+                template: DeclarationId(1432),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(781),
@@ -58415,10 +58446,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5052, 5065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2083),
+            id: DeclarationId(2085),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1430),
+                template: DeclarationId(1432),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(817),
@@ -58435,10 +58466,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5115, 5128),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2084),
+            id: DeclarationId(2086),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1430),
+                template: DeclarationId(1432),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(982),
@@ -58455,13 +58486,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5176, 5192),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2085),
+            id: DeclarationId(2087),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1430),
+                template: DeclarationId(1432),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2057),
+                    value: DeclarationId(2059),
                 }],
             },
             type_params: vec![],
@@ -58475,13 +58506,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5240, 5272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2086),
+            id: DeclarationId(2088),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1432),
+                template: DeclarationId(1434),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2059),
+                    value: DeclarationId(2061),
                 }],
             },
             type_params: vec![],
@@ -58495,10 +58526,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5341, 5373),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2087),
+            id: DeclarationId(2089),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1918),
+                template: DeclarationId(1920),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58515,10 +58546,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5346, 5372),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2088),
+            id: DeclarationId(2090),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1432),
+                template: DeclarationId(1434),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(982),
@@ -58535,10 +58566,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5498, 5514),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2089),
+            id: DeclarationId(2091),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1924),
+                template: DeclarationId(1926),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(988),
                     value: DeclarationId(1222),
@@ -58555,10 +58586,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5639, 5673),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2090),
+            id: DeclarationId(2092),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1928),
+                template: DeclarationId(1930),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(988),
                     value: DeclarationId(1222),
@@ -58575,7 +58606,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5885, 5919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2091),
+            id: DeclarationId(2093),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -58594,7 +58625,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2092),
+            id: DeclarationId(2094),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -58613,7 +58644,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2093),
+            id: DeclarationId(2095),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -58632,7 +58663,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2094),
+            id: DeclarationId(2096),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -58658,7 +58689,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2732, 2760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2095),
+            id: DeclarationId(2097),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -58684,7 +58715,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2804, 2832),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2096),
+            id: DeclarationId(2098),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -58703,7 +58734,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2097),
+            id: DeclarationId(2099),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -58722,7 +58753,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2098),
+            id: DeclarationId(2100),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(11),
@@ -58748,7 +58779,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 12353, 12399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2099),
+            id: DeclarationId(2101),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58762,7 +58793,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 767, 773),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2100),
+            id: DeclarationId(2102),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58776,7 +58807,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 778, 791),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2101),
+            id: DeclarationId(2103),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58790,7 +58821,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 796, 810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2102),
+            id: DeclarationId(2104),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58809,7 +58840,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3332, 3358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2103),
+            id: DeclarationId(2105),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58828,7 +58859,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3363, 3391),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2104),
+            id: DeclarationId(2106),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58847,7 +58878,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3396, 3429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2105),
+            id: DeclarationId(2107),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58866,7 +58897,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3434, 3465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2106),
+            id: DeclarationId(2108),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58885,7 +58916,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3470, 3502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2107),
+            id: DeclarationId(2109),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58899,7 +58930,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 4509, 4516),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2108),
+            id: DeclarationId(2110),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58918,7 +58949,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 4521, 4571),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2109),
+            id: DeclarationId(2111),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58932,7 +58963,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 5484, 5495),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2110),
+            id: DeclarationId(2112),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58951,7 +58982,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 5500, 5545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2111),
+            id: DeclarationId(2113),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58970,7 +59001,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7649, 7683),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2112),
+            id: DeclarationId(2114),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58989,7 +59020,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7688, 7732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2113),
+            id: DeclarationId(2115),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59008,7 +59039,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7737, 7795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2114),
+            id: DeclarationId(2116),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59027,7 +59058,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7800, 7856),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2115),
+            id: DeclarationId(2117),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59046,7 +59077,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7861, 7894),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2116),
+            id: DeclarationId(2118),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59065,7 +59096,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7899, 7929),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2117),
+            id: DeclarationId(2119),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59079,7 +59110,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7934, 7947),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2118),
+            id: DeclarationId(2120),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -59099,7 +59130,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7987, 8009),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2119),
+            id: DeclarationId(2121),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -59119,7 +59150,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 8219, 8240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2120),
+            id: DeclarationId(2122),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59133,7 +59164,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 8740, 8746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2121),
+            id: DeclarationId(2123),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59147,7 +59178,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 9139, 9152),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2122),
+            id: DeclarationId(2124),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59161,7 +59192,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 9157, 9171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2123),
+            id: DeclarationId(2125),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59180,7 +59211,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 10263, 10297),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2124),
+            id: DeclarationId(2126),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59194,7 +59225,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 10302, 10320),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2125),
+            id: DeclarationId(2127),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -59220,7 +59251,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 11234, 11261),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2126),
+            id: DeclarationId(2128),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -59240,7 +59271,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8271, 8287),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2127),
+            id: DeclarationId(2129),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -59260,7 +59291,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2128),
+            id: DeclarationId(2130),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59279,7 +59310,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4032, 4066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2129),
+            id: DeclarationId(2131),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59293,7 +59324,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4071, 4081),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2130),
+            id: DeclarationId(2132),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59307,7 +59338,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4086, 4095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2131),
+            id: DeclarationId(2133),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59321,7 +59352,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4100, 4105),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2132),
+            id: DeclarationId(2134),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -59341,10 +59372,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 5943, 5971),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2133),
+            id: DeclarationId(2135),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1430),
+                template: DeclarationId(1432),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(978),
@@ -59361,10 +59392,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8271, 8287),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2134),
+            id: DeclarationId(2136),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1918),
+                template: DeclarationId(1920),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -59381,10 +59412,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2135),
+            id: DeclarationId(2137),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1918),
+                template: DeclarationId(1920),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -59401,10 +59432,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2136),
+            id: DeclarationId(2138),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1918),
+                template: DeclarationId(1920),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -59421,10 +59452,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2137),
+            id: DeclarationId(2139),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1918),
+                template: DeclarationId(1920),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -59441,10 +59472,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2138),
+            id: DeclarationId(2140),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1918),
+                template: DeclarationId(1920),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -59461,10 +59492,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2139),
+            id: DeclarationId(2141),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1918),
+                template: DeclarationId(1920),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -59481,10 +59512,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2140),
+            id: DeclarationId(2142),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1918),
+                template: DeclarationId(1920),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -59501,10 +59532,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2141),
+            id: DeclarationId(2143),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1918),
+                template: DeclarationId(1920),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -59521,10 +59552,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2142),
+            id: DeclarationId(2144),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1918),
+                template: DeclarationId(1920),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -59541,10 +59572,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2143),
+            id: DeclarationId(2145),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1918),
+                template: DeclarationId(1920),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -59561,7 +59592,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2144),
+            id: DeclarationId(2146),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59575,7 +59606,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(2145),
+            id: DeclarationId(2147),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59589,7 +59620,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(2146),
+            id: DeclarationId(2148),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59603,7 +59634,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(2147),
+            id: DeclarationId(2149),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59617,7 +59648,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(2148),
+            id: DeclarationId(2150),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59631,7 +59662,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(2149),
+            id: DeclarationId(2151),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59645,7 +59676,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(2150),
+            id: DeclarationId(2152),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59659,7 +59690,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(2151),
+            id: DeclarationId(2153),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59673,7 +59704,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(2152),
+            id: DeclarationId(2154),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59687,7 +59718,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(2153),
+            id: DeclarationId(2155),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59701,7 +59732,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(2154),
+            id: DeclarationId(2156),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59715,7 +59746,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(2155),
+            id: DeclarationId(2157),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59729,7 +59760,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(2156),
+            id: DeclarationId(2158),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59743,7 +59774,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(2157),
+            id: DeclarationId(2159),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59762,7 +59793,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(2158),
+            id: DeclarationId(2160),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59781,7 +59812,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 889, 903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2159),
+            id: DeclarationId(2161),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59800,7 +59831,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 908, 925),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2160),
+            id: DeclarationId(2162),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59814,7 +59845,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 930, 932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2161),
+            id: DeclarationId(2163),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59828,7 +59859,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 937, 941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2162),
+            id: DeclarationId(2164),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59842,7 +59873,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 946, 951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2163),
+            id: DeclarationId(2165),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59856,7 +59887,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 956, 958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2164),
+            id: DeclarationId(2166),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59870,7 +59901,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 963, 965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2165),
+            id: DeclarationId(2167),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59884,7 +59915,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 970, 972),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2166),
+            id: DeclarationId(2168),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59898,7 +59929,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 977, 979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2167),
+            id: DeclarationId(2169),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59912,7 +59943,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 984, 988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2168),
+            id: DeclarationId(2170),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59926,7 +59957,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 993, 998),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2169),
+            id: DeclarationId(2171),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59940,7 +59971,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1003, 1007),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2170),
+            id: DeclarationId(2172),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59954,7 +59985,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1012, 1017),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2171),
+            id: DeclarationId(2173),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59968,7 +59999,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1022, 1028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2172),
+            id: DeclarationId(2174),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59982,7 +60013,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1033, 1041),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2173),
+            id: DeclarationId(2175),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59996,7 +60027,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1046, 1051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2174),
+            id: DeclarationId(2176),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60010,7 +60041,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1056, 1061),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2175),
+            id: DeclarationId(2177),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60024,7 +60055,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1066, 1074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2176),
+            id: DeclarationId(2178),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60038,7 +60069,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1079, 1088),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2177),
+            id: DeclarationId(2179),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60052,7 +60083,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1093, 1096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2178),
+            id: DeclarationId(2180),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60066,7 +60097,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1101, 1107),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2179),
+            id: DeclarationId(2181),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60080,7 +60111,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1112, 1118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2180),
+            id: DeclarationId(2182),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60094,7 +60125,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1123, 1129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2181),
+            id: DeclarationId(2183),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60108,7 +60139,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1134, 1140),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2182),
+            id: DeclarationId(2184),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60122,7 +60153,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1145, 1153),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2183),
+            id: DeclarationId(2185),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60136,7 +60167,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1158, 1166),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2184),
+            id: DeclarationId(2186),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60150,7 +60181,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1171, 1176),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2185),
+            id: DeclarationId(2187),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60164,7 +60195,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1181, 1190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2186),
+            id: DeclarationId(2188),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60178,7 +60209,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1195, 1199),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2187),
+            id: DeclarationId(2189),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60192,7 +60223,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1204, 1212),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2188),
+            id: DeclarationId(2190),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60206,7 +60237,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1217, 1220),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2189),
+            id: DeclarationId(2191),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60220,7 +60251,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1791, 1796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2190),
+            id: DeclarationId(2192),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60234,7 +60265,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1801, 1805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2191),
+            id: DeclarationId(2193),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60248,7 +60279,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1810, 1816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2192),
+            id: DeclarationId(2194),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60262,7 +60293,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1821, 1827),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2193),
+            id: DeclarationId(2195),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60276,7 +60307,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1832, 1836),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2194),
+            id: DeclarationId(2196),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60290,7 +60321,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1841, 1847),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2195),
+            id: DeclarationId(2197),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60304,7 +60335,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1852, 1860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2196),
+            id: DeclarationId(2198),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60318,7 +60349,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1865, 1873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2197),
+            id: DeclarationId(2199),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60332,7 +60363,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1878, 1885),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2198),
+            id: DeclarationId(2200),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60346,7 +60377,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1890, 1896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2199),
+            id: DeclarationId(2201),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60360,7 +60391,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1901, 1908),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2200),
+            id: DeclarationId(2202),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60374,7 +60405,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1913, 1919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2201),
+            id: DeclarationId(2203),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60388,7 +60419,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1924, 1931),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2202),
+            id: DeclarationId(2204),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60402,7 +60433,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2371, 2373),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2203),
+            id: DeclarationId(2205),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60416,7 +60447,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2378, 2382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2204),
+            id: DeclarationId(2206),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60430,7 +60461,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2387, 2392),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2205),
+            id: DeclarationId(2207),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60444,7 +60475,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2397, 2399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2206),
+            id: DeclarationId(2208),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60458,7 +60489,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2404, 2406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2207),
+            id: DeclarationId(2209),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60472,7 +60503,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2411, 2413),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2208),
+            id: DeclarationId(2210),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60486,7 +60517,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2418, 2420),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2209),
+            id: DeclarationId(2211),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60500,7 +60531,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2425, 2429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2210),
+            id: DeclarationId(2212),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60514,7 +60545,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2434, 2439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2211),
+            id: DeclarationId(2213),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60528,7 +60559,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2444, 2448),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2212),
+            id: DeclarationId(2214),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60542,7 +60573,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2453, 2458),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2213),
+            id: DeclarationId(2215),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60556,7 +60587,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2463, 2469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2214),
+            id: DeclarationId(2216),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60570,7 +60601,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2474, 2482),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2215),
+            id: DeclarationId(2217),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60584,7 +60615,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2487, 2492),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2216),
+            id: DeclarationId(2218),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60598,7 +60629,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2497, 2502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2217),
+            id: DeclarationId(2219),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60612,7 +60643,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2507, 2515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2218),
+            id: DeclarationId(2220),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60626,7 +60657,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2520, 2529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2219),
+            id: DeclarationId(2221),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60640,7 +60671,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2534, 2537),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2220),
+            id: DeclarationId(2222),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60654,7 +60685,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2542, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2221),
+            id: DeclarationId(2223),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60668,7 +60699,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2553, 2559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2222),
+            id: DeclarationId(2224),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60682,7 +60713,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2564, 2570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2223),
+            id: DeclarationId(2225),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60696,7 +60727,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2575, 2581),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2224),
+            id: DeclarationId(2226),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60710,7 +60741,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2586, 2594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2225),
+            id: DeclarationId(2227),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60724,7 +60755,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2599, 2607),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2226),
+            id: DeclarationId(2228),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60738,7 +60769,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2612, 2617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2227),
+            id: DeclarationId(2229),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60752,7 +60783,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2622, 2631),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2228),
+            id: DeclarationId(2230),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60766,7 +60797,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2636, 2640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2229),
+            id: DeclarationId(2231),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60780,7 +60811,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2645, 2653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2230),
+            id: DeclarationId(2232),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -60797,16 +60828,16 @@ 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", 27371, 27394),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27585, 27608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2231),
+            id: DeclarationId(2233),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1281),
+                    value: DeclarationId(1283),
                 }],
             },
             type_params: vec![],
@@ -60817,16 +60848,16 @@ 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", 28463, 28479),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28677, 28693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2232),
+            id: DeclarationId(2234),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1283),
+                    value: DeclarationId(1285),
                 }],
             },
             type_params: vec![],
@@ -60837,35 +60868,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", 28484, 28504),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2233),
-            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", 2612, 2626),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2234),
-            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", 2631, 2641),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28698, 28718),
         });
         declarations.push(Declaration {
             id: DeclarationId(2235),
@@ -60879,7 +60882,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", 2646, 2658),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2826, 2840),
         });
         declarations.push(Declaration {
             id: DeclarationId(2236),
@@ -60893,7 +60896,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", 2663, 2676),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2845, 2855),
         });
         declarations.push(Declaration {
             id: DeclarationId(2237),
@@ -60907,7 +60910,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", 2681, 2693),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2860, 2872),
         });
         declarations.push(Declaration {
             id: DeclarationId(2238),
@@ -60921,7 +60924,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", 2698, 2710),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2877, 2890),
         });
         declarations.push(Declaration {
             id: DeclarationId(2239),
@@ -60935,7 +60938,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", 2715, 2737),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2895, 2907),
         });
         declarations.push(Declaration {
             id: DeclarationId(2240),
@@ -60949,7 +60952,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", 2742, 2761),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2912, 2924),
         });
         declarations.push(Declaration {
             id: DeclarationId(2241),
@@ -60963,7 +60966,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", 2766, 2791),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2929, 2951),
         });
         declarations.push(Declaration {
             id: DeclarationId(2242),
@@ -60977,7 +60980,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", 2796, 2819),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2956, 2975),
         });
         declarations.push(Declaration {
             id: DeclarationId(2243),
@@ -60991,17 +60994,12 @@ 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", 3225, 3234),
+            span: SourceSpan::new("src/v3/std/verification.dag", 2980, 3005),
         });
         declarations.push(Declaration {
             id: DeclarationId(2244),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
+            connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -61010,7 +61008,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", 3239, 3255),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3010, 3033),
         });
         declarations.push(Declaration {
             id: DeclarationId(2245),
@@ -61024,12 +61022,17 @@ 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", 3914, 3922),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3439, 3448),
         });
         declarations.push(Declaration {
             id: DeclarationId(2246),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(230),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -61038,7 +61041,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", 3927, 3937),
+            span: SourceSpan::new("src/v3/std/verification.dag", 3453, 3469),
         });
         declarations.push(Declaration {
             id: DeclarationId(2247),
@@ -61052,7 +61055,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", 4162, 4174),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4128, 4136),
         });
         declarations.push(Declaration {
             id: DeclarationId(2248),
@@ -61066,7 +61069,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", 4989, 5002),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4141, 4151),
         });
         declarations.push(Declaration {
             id: DeclarationId(2249),
@@ -61080,7 +61083,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", 5007, 5020),
+            span: SourceSpan::new("src/v3/std/verification.dag", 4376, 4388),
         });
         declarations.push(Declaration {
             id: DeclarationId(2250),
@@ -61094,11 +61097,39 @@ 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", 5025, 5033),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5203, 5216),
         });
         declarations.push(Declaration {
             id: DeclarationId(2251),
             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", 5221, 5234),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2252),
+            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", 5239, 5247),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2253),
+            name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
@@ -61119,15 +61150,15 @@ 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", 5578, 5645),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5792, 5859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2252),
+            id: DeclarationId(2254),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "var".to_string(),
-                    ty: DeclarationId(1266),
+                    ty: DeclarationId(1268),
                 }],
             },
             type_params: vec![],
@@ -61138,10 +61169,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", 5686, 5739),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5900, 5953),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2253),
+            id: DeclarationId(2255),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61152,10 +61183,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", 5772, 5801),
+            span: SourceSpan::new("src/v3/std/verification.dag", 5986, 6015),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2254),
+            id: DeclarationId(2256),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61166,10 +61197,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", 6403, 6435),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6617, 6649),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2255),
+            id: DeclarationId(2257),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61180,10 +61211,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", 6440, 6471),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6654, 6685),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2256),
+            id: DeclarationId(2258),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61194,10 +61225,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", 6513, 6545),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6727, 6759),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2257),
+            id: DeclarationId(2259),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61208,10 +61239,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", 6550, 6581),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6764, 6795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2258),
+            id: DeclarationId(2260),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61222,10 +61253,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", 6586, 6614),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6800, 6828),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2259),
+            id: DeclarationId(2261),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61236,10 +61267,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", 6619, 6645),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6833, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2260),
+            id: DeclarationId(2262),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61250,10 +61281,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", 6684, 6706),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6898, 6920),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2261),
+            id: DeclarationId(2263),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61264,10 +61295,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", 6711, 6739),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6925, 6953),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2262),
+            id: DeclarationId(2264),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61278,10 +61309,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", 6744, 6773),
+            span: SourceSpan::new("src/v3/std/verification.dag", 6958, 6987),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2263),
+            id: DeclarationId(2265),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61292,15 +61323,15 @@ 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", 9583, 9591),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9797, 9805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2264),
+            id: DeclarationId(2266),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1259),
+                    ty: DeclarationId(1261),
                 }],
             },
             type_params: vec![],
@@ -61311,10 +61342,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", 9596, 9636),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9810, 9850),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2265),
+            id: DeclarationId(2267),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61330,10 +61361,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", 9641, 9674),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9855, 9888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2266),
+            id: DeclarationId(2268),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61343,7 +61374,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "state".to_string(),
-                        ty: DeclarationId(1260),
+                        ty: DeclarationId(1262),
                     },
                 ],
             },
@@ -61355,10 +61386,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", 9679, 9757),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9893, 9971),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2267),
+            id: DeclarationId(2269),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61374,10 +61405,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", 9923, 9986),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10137, 10200),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2268),
+            id: DeclarationId(2270),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61403,24 +61434,24 @@ 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", 9991, 10082),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10205, 10296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2269),
+            id: DeclarationId(2271),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "input_sample".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "expected_output".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                 ],
             },
@@ -61432,20 +61463,20 @@ 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", 10087, 10219),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10301, 10433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2270),
+            id: DeclarationId(2272),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "invariant".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                 ],
             },
@@ -61457,10 +61488,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", 10434, 10523),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10648, 10737),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2271),
+            id: DeclarationId(2273),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -61477,10 +61508,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", 11323, 11335),
+            span: SourceSpan::new("src/v3/std/verification.dag", 11537, 11549),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2272),
+            id: DeclarationId(2274),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61490,7 +61521,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2271),
+                        ty: DeclarationId(2273),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -61506,10 +61537,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", 11272, 11369),
+            span: SourceSpan::new("src/v3/std/verification.dag", 11486, 11583),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2273),
+            id: DeclarationId(2275),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -61526,10 +61557,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", 12084, 12096),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12298, 12310),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2274),
+            id: DeclarationId(2276),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61539,7 +61570,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2273),
+                        ty: DeclarationId(2275),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -61547,7 +61578,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "input_ref".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                 ],
             },
@@ -61559,24 +61590,24 @@ 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", 12034, 12162),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12248, 12376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2275),
+            id: DeclarationId(2277),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "lens_ref".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "input_ref".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "expected_ref".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                 ],
             },
@@ -61588,24 +61619,24 @@ 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", 12460, 12582),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12674, 12796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2276),
+            id: DeclarationId(2278),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject_ref".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "oracle_ref".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "input_ref".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                 ],
             },
@@ -61617,15 +61648,15 @@ 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", 12844, 12969),
+            span: SourceSpan::new("src/v3/std/verification.dag", 13058, 13183),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2277),
+            id: DeclarationId(2279),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "expected".to_string(),
-                    ty: DeclarationId(1296),
+                    ty: DeclarationId(1298),
                 }],
             },
             type_params: vec![],
@@ -61636,20 +61667,20 @@ 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", 15022, 15083),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15236, 15297),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2278),
+            id: DeclarationId(2280),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "expected".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "param".to_string(),
-                        ty: DeclarationId(1267),
+                        ty: DeclarationId(1269),
                     },
                 ],
             },
@@ -61661,24 +61692,24 @@ 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", 15088, 15187),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15302, 15401),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2279),
+            id: DeclarationId(2281),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "comparator".to_string(),
-                        ty: DeclarationId(1261),
+                        ty: DeclarationId(1263),
                     },
                     Field {
                         label: "baseline_ref".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                 ],
             },
@@ -61690,20 +61721,20 @@ 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", 15541, 15673),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15755, 15887),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2280),
+            id: DeclarationId(2282),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "left_report_ref".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "right_report_ref".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                 ],
             },
@@ -61715,20 +61746,20 @@ 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", 16240, 16352),
+            span: SourceSpan::new("src/v3/std/verification.dag", 16454, 16566),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2281),
+            id: DeclarationId(2283),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "law".to_string(),
-                        ty: DeclarationId(1262),
+                        ty: DeclarationId(1264),
                     },
                     Field {
                         label: "lens_ref".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                 ],
             },
@@ -61740,16 +61771,16 @@ 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", 17049, 17128),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17263, 17342),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2282),
+            id: DeclarationId(2284),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "list_constant".to_string(),
@@ -61769,16 +61800,16 @@ 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", 17348, 17461),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17562, 17675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2283),
+            id: DeclarationId(2285),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "list_constant".to_string(),
@@ -61786,7 +61817,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "subset_predicate".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                 ],
             },
@@ -61798,10 +61829,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", 17466, 17602),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17680, 17816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2284),
+            id: DeclarationId(2286),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61823,20 +61854,20 @@ 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", 18088, 18170),
+            span: SourceSpan::new("src/v3/std/verification.dag", 18302, 18384),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2285),
+            id: DeclarationId(2287),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "ratchet_kind".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                 ],
             },
@@ -61848,10 +61879,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", 18175, 18261),
+            span: SourceSpan::new("src/v3/std/verification.dag", 18389, 18475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2286),
+            id: DeclarationId(2288),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -61868,20 +61899,20 @@ 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", 18340, 18350),
+            span: SourceSpan::new("src/v3/std/verification.dag", 18554, 18564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2287),
+            id: DeclarationId(2289),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "generated_paths".to_string(),
-                        ty: DeclarationId(2286),
+                        ty: DeclarationId(2288),
                     },
                 ],
             },
@@ -61893,20 +61924,20 @@ 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", 18266, 18356),
+            span: SourceSpan::new("src/v3/std/verification.dag", 18480, 18570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2288),
+            id: DeclarationId(2290),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "capability_register".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "cementing_receipts".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                 ],
             },
@@ -61918,24 +61949,24 @@ 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", 19570, 19695),
+            span: SourceSpan::new("src/v3/std/verification.dag", 19784, 19909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2289),
+            id: DeclarationId(2291),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "deferred_gate".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "target_lane".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "authority_doc".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                 ],
             },
@@ -61947,24 +61978,24 @@ 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", 20637, 20771),
+            span: SourceSpan::new("src/v3/std/verification.dag", 20851, 20985),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2290),
+            id: DeclarationId(2292),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "deferred_gate".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "target_lane".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                     Field {
                         label: "authority_doc".to_string(),
-                        ty: DeclarationId(1296),
+                        ty: DeclarationId(1298),
                     },
                 ],
             },
@@ -61976,10 +62007,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", 21410, 21554),
+            span: SourceSpan::new("src/v3/std/verification.dag", 21624, 21768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2291),
+            id: DeclarationId(2293),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61995,10 +62026,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", 22399, 22453),
+            span: SourceSpan::new("src/v3/std/verification.dag", 22613, 22667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2292),
+            id: DeclarationId(2294),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -62015,10 +62046,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", 23497, 23520),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23711, 23734),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2293),
+            id: DeclarationId(2295),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62029,10 +62060,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", 23723, 23729),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23937, 23943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2294),
+            id: DeclarationId(2296),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62043,10 +62074,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", 23734, 23740),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23948, 23954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2295),
+            id: DeclarationId(2297),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -62063,15 +62094,15 @@ 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", 23878, 23901),
+            span: SourceSpan::new("src/v3/std/verification.dag", 24092, 24115),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2296),
+            id: DeclarationId(2298),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1276),
+                    ty: DeclarationId(1278),
                 }],
             },
             type_params: vec![],
@@ -62082,15 +62113,15 @@ 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", 25624, 25653),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25838, 25867),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2297),
+            id: DeclarationId(2299),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1278),
+                    ty: DeclarationId(1280),
                 }],
             },
             type_params: vec![],
@@ -62101,15 +62132,15 @@ 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", 25658, 25697),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25872, 25911),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2298),
+            id: DeclarationId(2300),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1276),
+                    ty: DeclarationId(1278),
                 }],
             },
             type_params: vec![],
@@ -62120,15 +62151,15 @@ 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", 26555, 26576),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26769, 26790),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2299),
+            id: DeclarationId(2301),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1278),
+                    ty: DeclarationId(1280),
                 }],
             },
             type_params: vec![],
@@ -62139,16 +62170,16 @@ 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", 26581, 26612),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26795, 26826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2300),
+            id: DeclarationId(2302),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1281),
+                    value: DeclarationId(1283),
                 }],
             },
             type_params: vec![],
@@ -62159,10 +62190,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", 26656, 26672),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26870, 26886),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2301),
+            id: DeclarationId(2303),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -62179,16 +62210,16 @@ 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", 26928, 26951),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27142, 27165),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2302),
+            id: DeclarationId(2304),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1271),
+                    value: DeclarationId(1273),
                 }],
             },
             type_params: vec![],
@@ -62199,10 +62230,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", 7007, 7038),
+            span: SourceSpan::new("src/v3/std/verification.dag", 7221, 7252),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2303),
+            id: DeclarationId(2305),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -62222,7 +62253,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(2304),
+            id: DeclarationId(2306),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62236,7 +62267,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(2305),
+            id: DeclarationId(2307),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62250,7 +62281,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(2306),
+            id: DeclarationId(2308),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62264,7 +62295,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(2307),
+            id: DeclarationId(2309),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -62283,7 +62314,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(2308),
+            id: DeclarationId(2310),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62297,7 +62328,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6428, 6446),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2309),
+            id: DeclarationId(2311),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62311,7 +62342,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6451, 6466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2310),
+            id: DeclarationId(2312),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62325,7 +62356,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6495, 6518),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2311),
+            id: DeclarationId(2313),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62339,7 +62370,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6523, 6544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2312),
+            id: DeclarationId(2314),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62353,7 +62384,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6549, 6564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2313),
+            id: DeclarationId(2315),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62367,7 +62398,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8177, 8187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2314),
+            id: DeclarationId(2316),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62381,7 +62412,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8192, 8203),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2315),
+            id: DeclarationId(2317),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62395,7 +62426,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8208, 8221),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2316),
+            id: DeclarationId(2318),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62409,7 +62440,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8226, 8239),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2317),
+            id: DeclarationId(2319),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62423,7 +62454,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8244, 8257),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2318),
+            id: DeclarationId(2320),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62437,7 +62468,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8262, 8276),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2319),
+            id: DeclarationId(2321),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62451,7 +62482,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8281, 8296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2320),
+            id: DeclarationId(2322),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62465,7 +62496,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9038, 9055),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2321),
+            id: DeclarationId(2323),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62479,7 +62510,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9060, 9070),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2322),
+            id: DeclarationId(2324),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62493,7 +62524,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9075, 9079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2323),
+            id: DeclarationId(2325),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62503,11 +62534,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1334),
+                        ty: DeclarationId(1336),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(1336),
+                        ty: DeclarationId(1338),
                     },
                     Field {
                         label: "range_min_inclusive".to_string(),
@@ -62523,7 +62554,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "overflow".to_string(),
-                        ty: DeclarationId(1337),
+                        ty: DeclarationId(1339),
                     },
                 ],
             },
@@ -62538,7 +62569,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9857, 10429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2324),
+            id: DeclarationId(2326),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62548,11 +62579,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1335),
+                        ty: DeclarationId(1337),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(1336),
+                        ty: DeclarationId(1338),
                     },
                     Field {
                         label: "is_copy".to_string(),
@@ -62571,13 +62602,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10434, 10616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2325),
+            id: DeclarationId(2327),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1338),
+                    value: DeclarationId(1340),
                 }],
             },
             type_params: vec![],
@@ -62591,7 +62622,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10965, 10984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2326),
+            id: DeclarationId(2328),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62605,7 +62636,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4233, 4241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2327),
+            id: DeclarationId(2329),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62624,7 +62655,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4246, 4277),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2328),
+            id: DeclarationId(2330),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -62644,12 +62675,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4299, 4319),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2329),
+            id: DeclarationId(2331),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "values".to_string(),
-                    ty: DeclarationId(2328),
+                    ty: DeclarationId(2330),
                 }],
             },
             type_params: vec![],
@@ -62663,7 +62694,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4282, 4321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2330),
+            id: DeclarationId(2332),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62688,7 +62719,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4326, 4379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2331),
+            id: DeclarationId(2333),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62713,7 +62744,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4384, 4433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2332),
+            id: DeclarationId(2334),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62727,7 +62758,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 847, 851),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2333),
+            id: DeclarationId(2335),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62741,7 +62772,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 854, 857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2334),
+            id: DeclarationId(2336),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62755,13 +62786,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 860, 872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2335),
+            id: DeclarationId(2337),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1350),
+                    value: DeclarationId(1352),
                 }],
             },
             type_params: vec![],
@@ -62775,7 +62806,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1242, 1259),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2336),
+            id: DeclarationId(2338),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -62794,7 +62825,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2337),
+            id: DeclarationId(2339),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62808,7 +62839,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1309, 1318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2338),
+            id: DeclarationId(2340),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62822,7 +62853,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1323, 1332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2339),
+            id: DeclarationId(2341),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62836,7 +62867,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1337, 1350),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2340),
+            id: DeclarationId(2342),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62850,7 +62881,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1355, 1367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2341),
+            id: DeclarationId(2343),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62864,7 +62895,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1372, 1385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2342),
+            id: DeclarationId(2344),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -62883,7 +62914,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2343),
+            id: DeclarationId(2345),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62897,7 +62928,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1677, 1685),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2344),
+            id: DeclarationId(2346),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62911,7 +62942,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1688, 1697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2345),
+            id: DeclarationId(2347),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62925,13 +62956,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1700, 1709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2346),
+            id: DeclarationId(2348),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1359),
+                    value: DeclarationId(1361),
                 }],
             },
             type_params: vec![],
@@ -62945,11 +62976,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1521, 1542),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2347),
+            id: DeclarationId(2349),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1368),
+                    DeclarationId(1370),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -62964,13 +62995,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2348),
+            id: DeclarationId(2350),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1365),
+                    value: DeclarationId(1367),
                 }],
             },
             type_params: vec![],
@@ -62984,7 +63015,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1583, 1592),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2349),
+            id: DeclarationId(2351),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -63010,11 +63041,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2350),
+            id: DeclarationId(2352),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2349),
+                    DeclarationId(2351),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63029,11 +63060,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2351),
+            id: DeclarationId(2353),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1357),
+                    DeclarationId(1359),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63048,7 +63079,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2352),
+            id: DeclarationId(2354),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63062,7 +63093,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1917, 1925),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2353),
+            id: DeclarationId(2355),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63076,7 +63107,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1928, 1937),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2354),
+            id: DeclarationId(2356),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63090,7 +63121,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1940, 1948),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2355),
+            id: DeclarationId(2357),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -63110,7 +63141,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2106, 2118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2356),
+            id: DeclarationId(2358),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -63130,17 +63161,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2127, 2139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2357),
+            id: DeclarationId(2359),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "branches".to_string(),
-                        ty: DeclarationId(2355),
+                        ty: DeclarationId(2357),
                     },
                     Field {
                         label: "paths".to_string(),
-                        ty: DeclarationId(2356),
+                        ty: DeclarationId(2358),
                     },
                 ],
             },
@@ -63155,7 +63186,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2089, 2141),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2358),
+            id: DeclarationId(2360),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -63175,13 +63206,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2170, 2182),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2359),
+            id: DeclarationId(2361),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1360),
+                    value: DeclarationId(1362),
                 }],
             },
             type_params: vec![],
@@ -63195,17 +63226,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2191, 2216),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2360),
+            id: DeclarationId(2362),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "branches".to_string(),
-                        ty: DeclarationId(2358),
+                        ty: DeclarationId(2360),
                     },
                     Field {
                         label: "types".to_string(),
-                        ty: DeclarationId(2359),
+                        ty: DeclarationId(2361),
                     },
                 ],
             },
@@ -63220,12 +63251,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2146, 2218),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2361),
+            id: DeclarationId(2363),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "cron".to_string(),
-                    ty: DeclarationId(1341),
+                    ty: DeclarationId(1343),
                 }],
             },
             type_params: vec![],
@@ -63239,13 +63270,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2223, 2254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2362),
+            id: DeclarationId(2364),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1361),
+                    value: DeclarationId(1363),
                 }],
             },
             type_params: vec![],
@@ -63259,12 +63290,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2286, 2305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2363),
+            id: DeclarationId(2365),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "inputs".to_string(),
-                    ty: DeclarationId(2362),
+                    ty: DeclarationId(2364),
                 }],
             },
             type_params: vec![],
@@ -63278,13 +63309,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2259, 2307),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2364),
+            id: DeclarationId(2366),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1361),
+                    value: DeclarationId(1363),
                 }],
             },
             type_params: vec![],
@@ -63298,12 +63329,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2335, 2354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2365),
+            id: DeclarationId(2367),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "inputs".to_string(),
-                    ty: DeclarationId(2364),
+                    ty: DeclarationId(2366),
                 }],
             },
             type_params: vec![],
@@ -63317,7 +63348,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2312, 2356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2366),
+            id: DeclarationId(2368),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63331,7 +63362,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2387, 2393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2367),
+            id: DeclarationId(2369),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63345,7 +63376,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2398, 2409),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2368),
+            id: DeclarationId(2370),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63359,7 +63390,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2414, 2422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2369),
+            id: DeclarationId(2371),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63373,7 +63404,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2427, 2441),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2370),
+            id: DeclarationId(2372),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63387,7 +63418,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2446, 2452),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2371),
+            id: DeclarationId(2373),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -63406,7 +63437,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2372),
+            id: DeclarationId(2374),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -63425,7 +63456,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2373),
+            id: DeclarationId(2375),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63439,7 +63470,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2603, 2614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2374),
+            id: DeclarationId(2376),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63453,7 +63484,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2617, 2629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2375),
+            id: DeclarationId(2377),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63467,7 +63498,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2632, 2643),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2376),
+            id: DeclarationId(2378),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63481,7 +63512,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2646, 2662),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2377),
+            id: DeclarationId(2379),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63495,7 +63526,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4784, 4793),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2378),
+            id: DeclarationId(2380),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63509,7 +63540,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4796, 4804),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2379),
+            id: DeclarationId(2381),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63523,7 +63554,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4807, 4820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2380),
+            id: DeclarationId(2382),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -63542,13 +63573,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2381),
+            id: DeclarationId(2383),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1371),
+                    value: DeclarationId(1373),
                 }],
             },
             type_params: vec![],
@@ -63562,7 +63593,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5372, 5382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2382),
+            id: DeclarationId(2384),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -63582,7 +63613,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5392, 5404),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2383),
+            id: DeclarationId(2385),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -63608,11 +63639,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2384),
+            id: DeclarationId(2386),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2383),
+                    DeclarationId(2385),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63627,7 +63658,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2385),
+            id: DeclarationId(2387),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -63653,11 +63684,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2386),
+            id: DeclarationId(2388),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2385),
+                    DeclarationId(2387),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63672,7 +63703,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2387),
+            id: DeclarationId(2389),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -63691,11 +63722,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2388),
+            id: DeclarationId(2390),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1387),
+                    DeclarationId(1389),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63710,7 +63741,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2389),
+            id: DeclarationId(2391),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -63729,11 +63760,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2390),
+            id: DeclarationId(2392),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1368),
+                    DeclarationId(1370),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63748,7 +63779,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2391),
+            id: DeclarationId(2393),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63767,7 +63798,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6619, 6655),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2392),
+            id: DeclarationId(2394),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63786,7 +63817,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6660, 6709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2393),
+            id: DeclarationId(2395),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63800,7 +63831,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7555, 7584),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2394),
+            id: DeclarationId(2396),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63819,7 +63850,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7589, 7646),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2395),
+            id: DeclarationId(2397),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63838,11 +63869,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8224, 8259),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2396),
+            id: DeclarationId(2398),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1367),
+                    DeclarationId(1369),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63857,7 +63888,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2397),
+            id: DeclarationId(2399),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -63867,7 +63898,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "cancel_in_progress".to_string(),
-                        ty: DeclarationId(2396),
+                        ty: DeclarationId(2398),
                     },
                 ],
             },
@@ -63882,11 +63913,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8264, 8453),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2398),
+            id: DeclarationId(2400),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1366),
+                    DeclarationId(1368),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63901,7 +63932,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2399),
+            id: DeclarationId(2401),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -63920,7 +63951,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2400),
+            id: DeclarationId(2402),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -63930,11 +63961,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "cancel_in_progress".to_string(),
-                        ty: DeclarationId(2398),
+                        ty: DeclarationId(2400),
                     },
                     Field {
                         label: "explicit_single".to_string(),
-                        ty: DeclarationId(2399),
+                        ty: DeclarationId(2401),
                     },
                 ],
             },
@@ -63949,12 +63980,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8458, 8845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2401),
+            id: DeclarationId(2403),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "label".to_string(),
-                    ty: DeclarationId(1370),
+                    ty: DeclarationId(1372),
                 }],
             },
             type_params: vec![],
@@ -63968,7 +63999,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10037, 10072),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2402),
+            id: DeclarationId(2404),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -63988,12 +64019,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10098, 10110),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2403),
+            id: DeclarationId(2405),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "labels".to_string(),
-                    ty: DeclarationId(2402),
+                    ty: DeclarationId(2404),
                 }],
             },
             type_params: vec![],
@@ -64007,7 +64038,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10077, 10112),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2404),
+            id: DeclarationId(2406),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -64026,7 +64057,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10201, 10240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2405),
+            id: DeclarationId(2407),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64040,7 +64071,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10263, 10275),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2406),
+            id: DeclarationId(2408),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64054,7 +64085,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10280, 10290),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2407),
+            id: DeclarationId(2409),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64068,7 +64099,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10295, 10305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2408),
+            id: DeclarationId(2410),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64082,7 +64113,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10310, 10321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2409),
+            id: DeclarationId(2411),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64096,7 +64127,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10326, 10333),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2410),
+            id: DeclarationId(2412),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64110,7 +64141,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10338, 10351),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2411),
+            id: DeclarationId(2413),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64129,7 +64160,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2412),
+            id: DeclarationId(2414),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64148,7 +64179,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2413),
+            id: DeclarationId(2415),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -64174,11 +64205,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10633),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2414),
+            id: DeclarationId(2416),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2413),
+                    DeclarationId(2415),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -64193,7 +64224,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2415),
+            id: DeclarationId(2417),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64212,7 +64243,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2416),
+            id: DeclarationId(2418),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64231,7 +64262,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2417),
+            id: DeclarationId(2419),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64250,17 +64281,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2418),
+            id: DeclarationId(2420),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(2411),
+                        ty: DeclarationId(2413),
                     },
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(2412),
+                        ty: DeclarationId(2414),
                     },
                     Field {
                         label: "run".to_string(),
@@ -64268,19 +64299,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "shell".to_string(),
-                        ty: DeclarationId(1372),
+                        ty: DeclarationId(1374),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(2414),
+                        ty: DeclarationId(2416),
                     },
                     Field {
                         label: "working_directory".to_string(),
-                        ty: DeclarationId(2415),
+                        ty: DeclarationId(2417),
                     },
                     Field {
                         label: "if_condition".to_string(),
-                        ty: DeclarationId(2416),
+                        ty: DeclarationId(2418),
                     },
                     Field {
                         label: "continue_on_error".to_string(),
@@ -64288,7 +64319,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "timeout_minutes".to_string(),
-                        ty: DeclarationId(2417),
+                        ty: DeclarationId(2419),
                     },
                 ],
             },
@@ -64303,7 +64334,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10510, 10763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2419),
+            id: DeclarationId(2421),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64322,7 +64353,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2420),
+            id: DeclarationId(2422),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64341,7 +64372,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2421),
+            id: DeclarationId(2423),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -64367,11 +64398,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2422),
+            id: DeclarationId(2424),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2421),
+                    DeclarationId(2423),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -64386,7 +64417,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2423),
+            id: DeclarationId(2425),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -64412,11 +64443,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10995),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2424),
+            id: DeclarationId(2426),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2423),
+                    DeclarationId(2425),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -64431,7 +64462,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10996),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2425),
+            id: DeclarationId(2427),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64450,7 +64481,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2426),
+            id: DeclarationId(2428),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64469,33 +64500,33 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2427),
+            id: DeclarationId(2429),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(2419),
+                        ty: DeclarationId(2421),
                     },
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(2420),
+                        ty: DeclarationId(2422),
                     },
                     Field {
                         label: "uses".to_string(),
-                        ty: DeclarationId(1373),
+                        ty: DeclarationId(1375),
                     },
                     Field {
                         label: "with".to_string(),
-                        ty: DeclarationId(2422),
+                        ty: DeclarationId(2424),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(2424),
+                        ty: DeclarationId(2426),
                     },
                     Field {
                         label: "if_condition".to_string(),
-                        ty: DeclarationId(2425),
+                        ty: DeclarationId(2427),
                     },
                     Field {
                         label: "continue_on_error".to_string(),
@@ -64503,7 +64534,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "timeout_minutes".to_string(),
-                        ty: DeclarationId(2426),
+                        ty: DeclarationId(2428),
                     },
                 ],
             },
@@ -64518,7 +64549,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10768, 11091),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2428),
+            id: DeclarationId(2430),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64532,7 +64563,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11110, 11114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2429),
+            id: DeclarationId(2431),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64546,7 +64577,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11117, 11119),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2430),
+            id: DeclarationId(2432),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64560,7 +64591,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11122, 11126),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2431),
+            id: DeclarationId(2433),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64574,7 +64605,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11129, 11135),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2432),
+            id: DeclarationId(2434),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64588,7 +64619,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11138, 11141),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2433),
+            id: DeclarationId(2435),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64607,7 +64638,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2434),
+            id: DeclarationId(2436),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64626,7 +64657,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2435),
+            id: DeclarationId(2437),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64645,7 +64676,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11530, 11534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2436),
+            id: DeclarationId(2438),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64655,15 +64686,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "file".to_string(),
-                        ty: DeclarationId(2433),
+                        ty: DeclarationId(2435),
                     },
                     Field {
                         label: "line".to_string(),
-                        ty: DeclarationId(2434),
+                        ty: DeclarationId(2436),
                     },
                     Field {
                         label: "col".to_string(),
-                        ty: DeclarationId(2435),
+                        ty: DeclarationId(2437),
                     },
                 ],
             },
@@ -64678,7 +64709,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11463, 11536),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2437),
+            id: DeclarationId(2439),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64697,7 +64728,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11584, 11591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2438),
+            id: DeclarationId(2440),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64716,7 +64747,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2439),
+            id: DeclarationId(2441),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64735,7 +64766,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11610, 11614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2440),
+            id: DeclarationId(2442),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64745,15 +64776,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "file".to_string(),
-                        ty: DeclarationId(2437),
+                        ty: DeclarationId(2439),
                     },
                     Field {
                         label: "line".to_string(),
-                        ty: DeclarationId(2438),
+                        ty: DeclarationId(2440),
                     },
                     Field {
                         label: "col".to_string(),
-                        ty: DeclarationId(2439),
+                        ty: DeclarationId(2441),
                     },
                 ],
             },
@@ -64768,7 +64799,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11541, 11616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2441),
+            id: DeclarationId(2443),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64787,7 +64818,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11663, 11670),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2442),
+            id: DeclarationId(2444),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64806,7 +64837,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11678, 11682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2443),
+            id: DeclarationId(2445),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64825,7 +64856,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11689, 11693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2444),
+            id: DeclarationId(2446),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64835,15 +64866,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "file".to_string(),
-                        ty: DeclarationId(2441),
+                        ty: DeclarationId(2443),
                     },
                     Field {
                         label: "line".to_string(),
-                        ty: DeclarationId(2442),
+                        ty: DeclarationId(2444),
                     },
                     Field {
                         label: "col".to_string(),
-                        ty: DeclarationId(2443),
+                        ty: DeclarationId(2445),
                     },
                 ],
             },
@@ -64858,7 +64889,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11621, 11695),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2445),
+            id: DeclarationId(2447),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -64877,7 +64908,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11700, 11733),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2446),
+            id: DeclarationId(2448),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64891,7 +64922,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11738, 11756),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2447),
+            id: DeclarationId(2449),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64916,7 +64947,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11761, 11802),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2448),
+            id: DeclarationId(2450),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -64935,7 +64966,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11807, 11832),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2449),
+            id: DeclarationId(2451),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -64954,7 +64985,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11837, 11867),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2450),
+            id: DeclarationId(2452),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64973,7 +65004,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12673, 12677),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2451),
+            id: DeclarationId(2453),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64987,11 +65018,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "retention_days".to_string(),
-                        ty: DeclarationId(2450),
+                        ty: DeclarationId(2452),
                     },
                     Field {
                         label: "if_no_files_found".to_string(),
-                        ty: DeclarationId(1384),
+                        ty: DeclarationId(1386),
                     },
                 ],
             },
@@ -65006,7 +65037,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12620, 12720),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2452),
+            id: DeclarationId(2454),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -65025,7 +65056,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12756, 12763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2453),
+            id: DeclarationId(2455),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65035,7 +65066,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(2452),
+                        ty: DeclarationId(2454),
                     },
                 ],
             },
@@ -65050,7 +65081,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12725, 12765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2454),
+            id: DeclarationId(2456),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65064,7 +65095,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12795, 12799),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2455),
+            id: DeclarationId(2457),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65078,7 +65109,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12802, 12810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2456),
+            id: DeclarationId(2458),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65092,7 +65123,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12813, 12819),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2457),
+            id: DeclarationId(2459),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -65112,7 +65143,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13281, 13293),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2458),
+            id: DeclarationId(2460),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -65123,7 +65154,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     TemplateArgument {
                         parameter: DeclarationId(139),
-                        value: DeclarationId(2457),
+                        value: DeclarationId(2459),
                     },
                 ],
             },
@@ -65138,7 +65169,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13269, 13294),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2459),
+            id: DeclarationId(2461),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -65164,13 +65195,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13311, 13330),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2460),
+            id: DeclarationId(2462),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2459),
+                    value: DeclarationId(2461),
                 }],
             },
             type_params: vec![],
@@ -65184,7 +65215,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13306, 13331),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2461),
+            id: DeclarationId(2463),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -65210,13 +65241,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13348, 13367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2462),
+            id: DeclarationId(2464),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2461),
+                    value: DeclarationId(2463),
                 }],
             },
             type_params: vec![],
@@ -65230,7 +65261,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13343, 13368),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2463),
+            id: DeclarationId(2465),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -65249,7 +65280,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13403, 13407),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2464),
+            id: DeclarationId(2466),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65263,7 +65294,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13563, 13570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2465),
+            id: DeclarationId(2467),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65277,7 +65308,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13575, 13582),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2466),
+            id: DeclarationId(2468),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65291,7 +65322,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13587, 13596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2467),
+            id: DeclarationId(2469),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65305,7 +65336,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13601, 13608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2468),
+            id: DeclarationId(2470),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65319,7 +65350,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13613, 13621),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2469),
+            id: DeclarationId(2471),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65333,7 +65364,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13626, 13640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2470),
+            id: DeclarationId(2472),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65347,7 +65378,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1935, 1959),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2471),
+            id: DeclarationId(2473),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65361,7 +65392,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1964, 1989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2472),
+            id: DeclarationId(2474),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(151)],
@@ -65379,7 +65410,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2673, 2714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2473),
+            id: DeclarationId(2475),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65398,7 +65429,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2474),
+            id: DeclarationId(2476),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65412,17 +65443,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2475),
+            id: DeclarationId(2477),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2473),
+                        ty: DeclarationId(2475),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2474),
+                        ty: DeclarationId(2476),
                     },
                 ],
             },
@@ -65437,7 +65468,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2476),
+            id: DeclarationId(2478),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65456,7 +65487,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2477),
+            id: DeclarationId(2479),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65470,17 +65501,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2478),
+            id: DeclarationId(2480),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2476),
+                        ty: DeclarationId(2478),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2477),
+                        ty: DeclarationId(2479),
                     },
                 ],
             },
@@ -65495,7 +65526,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2479),
+            id: DeclarationId(2481),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65514,7 +65545,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2480),
+            id: DeclarationId(2482),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65528,17 +65559,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2481),
+            id: DeclarationId(2483),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2479),
+                        ty: DeclarationId(2481),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2480),
+                        ty: DeclarationId(2482),
                     },
                 ],
             },
@@ -65553,7 +65584,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2482),
+            id: DeclarationId(2484),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65572,7 +65603,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2483),
+            id: DeclarationId(2485),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65586,17 +65617,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2484),
+            id: DeclarationId(2486),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2482),
+                        ty: DeclarationId(2484),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2483),
+                        ty: DeclarationId(2485),
                     },
                 ],
             },
@@ -65611,7 +65642,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2485),
+            id: DeclarationId(2487),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65630,7 +65661,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2486),
+            id: DeclarationId(2488),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65644,17 +65675,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2487),
+            id: DeclarationId(2489),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2485),
+                        ty: DeclarationId(2487),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2486),
+                        ty: DeclarationId(2488),
                     },
                 ],
             },
@@ -65669,7 +65700,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2488),
+            id: DeclarationId(2490),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65688,7 +65719,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2489),
+            id: DeclarationId(2491),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65702,17 +65733,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2490),
+            id: DeclarationId(2492),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2488),
+                        ty: DeclarationId(2490),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2489),
+                        ty: DeclarationId(2491),
                     },
                 ],
             },
@@ -65727,7 +65758,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2491),
+            id: DeclarationId(2493),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65746,7 +65777,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2492),
+            id: DeclarationId(2494),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65760,17 +65791,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2493),
+            id: DeclarationId(2495),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2491),
+                        ty: DeclarationId(2493),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2492),
+                        ty: DeclarationId(2494),
                     },
                 ],
             },
@@ -65785,7 +65816,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2494),
+            id: DeclarationId(2496),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65804,7 +65835,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 3781, 3785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2495),
+            id: DeclarationId(2497),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65818,17 +65849,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 3781, 3785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2496),
+            id: DeclarationId(2498),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2494),
+                        ty: DeclarationId(2496),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2495),
+                        ty: DeclarationId(2497),
                     },
                 ],
             },
@@ -65843,7 +65874,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 3781, 3785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2497),
+            id: DeclarationId(2499),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65862,7 +65893,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 4264, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2498),
+            id: DeclarationId(2500),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65876,17 +65907,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 4264, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2499),
+            id: DeclarationId(2501),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2497),
+                        ty: DeclarationId(2499),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2498),
+                        ty: DeclarationId(2500),
                     },
                 ],
             },
@@ -65901,7 +65932,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 4264, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2500),
+            id: DeclarationId(2502),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65920,7 +65951,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 6172, 6179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2501),
+            id: DeclarationId(2503),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65934,17 +65965,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 6172, 6179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2502),
+            id: DeclarationId(2504),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2500),
+                        ty: DeclarationId(2502),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2501),
+                        ty: DeclarationId(2503),
                     },
                 ],
             },
@@ -65959,7 +65990,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 6172, 6179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2503),
+            id: DeclarationId(2505),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65978,7 +66009,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16964, 16984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2504),
+            id: DeclarationId(2506),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65992,17 +66023,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16964, 16984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2505),
+            id: DeclarationId(2507),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2503),
+                        ty: DeclarationId(2505),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2504),
+                        ty: DeclarationId(2506),
                     },
                 ],
             },
@@ -66017,7 +66048,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16964, 16984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2506),
+            id: DeclarationId(2508),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66036,7 +66067,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17620, 17627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2507),
+            id: DeclarationId(2509),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66050,17 +66081,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17620, 17627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2508),
+            id: DeclarationId(2510),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2506),
+                        ty: DeclarationId(2508),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2507),
+                        ty: DeclarationId(2509),
                     },
                 ],
             },
@@ -66075,7 +66106,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17620, 17627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2509),
+            id: DeclarationId(2511),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66094,7 +66125,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21380, 21390),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2510),
+            id: DeclarationId(2512),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66108,17 +66139,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21380, 21390),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2511),
+            id: DeclarationId(2513),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2509),
+                        ty: DeclarationId(2511),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2510),
+                        ty: DeclarationId(2512),
                     },
                 ],
             },
@@ -66133,7 +66164,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21380, 21390),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2512),
+            id: DeclarationId(2514),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66152,7 +66183,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21515, 21522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2513),
+            id: DeclarationId(2515),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66166,17 +66197,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21515, 21522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2514),
+            id: DeclarationId(2516),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2512),
+                        ty: DeclarationId(2514),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2513),
+                        ty: DeclarationId(2515),
                     },
                 ],
             },
@@ -66191,7 +66222,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21515, 21522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2515),
+            id: DeclarationId(2517),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66210,7 +66241,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21589, 21593),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2516),
+            id: DeclarationId(2518),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66224,17 +66255,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21589, 21593),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2517),
+            id: DeclarationId(2519),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2515),
+                        ty: DeclarationId(2517),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2516),
+                        ty: DeclarationId(2518),
                     },
                 ],
             },
@@ -66249,7 +66280,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21589, 21593),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2518),
+            id: DeclarationId(2520),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66268,7 +66299,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23360, 23367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2519),
+            id: DeclarationId(2521),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66282,17 +66313,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23360, 23367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2520),
+            id: DeclarationId(2522),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2518),
+                        ty: DeclarationId(2520),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2519),
+                        ty: DeclarationId(2521),
                     },
                 ],
             },
@@ -66307,7 +66338,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23360, 23367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2521),
+            id: DeclarationId(2523),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66326,7 +66357,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23872, 23879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2522),
+            id: DeclarationId(2524),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66340,17 +66371,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23872, 23879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2523),
+            id: DeclarationId(2525),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2521),
+                        ty: DeclarationId(2523),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2522),
+                        ty: DeclarationId(2524),
                     },
                 ],
             },
@@ -66365,7 +66396,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23872, 23879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2524),
+            id: DeclarationId(2526),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66384,7 +66415,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23966, 23973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2525),
+            id: DeclarationId(2527),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66398,17 +66429,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23966, 23973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2526),
+            id: DeclarationId(2528),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2524),
+                        ty: DeclarationId(2526),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2525),
+                        ty: DeclarationId(2527),
                     },
                 ],
             },
@@ -66423,7 +66454,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23966, 23973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2527),
+            id: DeclarationId(2529),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66442,7 +66473,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24196, 24211),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2528),
+            id: DeclarationId(2530),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66456,17 +66487,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24196, 24211),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2529),
+            id: DeclarationId(2531),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2527),
+                        ty: DeclarationId(2529),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2528),
+                        ty: DeclarationId(2530),
                     },
                 ],
             },
@@ -66481,7 +66512,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24196, 24211),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2530),
+            id: DeclarationId(2532),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66500,7 +66531,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24222, 24235),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2531),
+            id: DeclarationId(2533),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66514,17 +66545,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24222, 24235),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2532),
+            id: DeclarationId(2534),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2530),
+                        ty: DeclarationId(2532),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2531),
+                        ty: DeclarationId(2533),
                     },
                 ],
             },
@@ -66539,7 +66570,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24222, 24235),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2533),
+            id: DeclarationId(2535),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66558,7 +66589,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24251, 24264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2534),
+            id: DeclarationId(2536),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66572,17 +66603,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24251, 24264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2535),
+            id: DeclarationId(2537),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2533),
+                        ty: DeclarationId(2535),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2534),
+                        ty: DeclarationId(2536),
                     },
                 ],
             },
@@ -66597,7 +66628,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24251, 24264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2536),
+            id: DeclarationId(2538),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66616,7 +66647,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24374, 24381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2537),
+            id: DeclarationId(2539),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66630,17 +66661,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24374, 24381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2538),
+            id: DeclarationId(2540),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2536),
+                        ty: DeclarationId(2538),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2537),
+                        ty: DeclarationId(2539),
                     },
                 ],
             },
@@ -66655,7 +66686,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24374, 24381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2539),
+            id: DeclarationId(2541),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66674,7 +66705,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(2540),
+            id: DeclarationId(2542),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66688,17 +66719,17 @@ 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(2541),
+            id: DeclarationId(2543),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2539),
+                        ty: DeclarationId(2541),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2540),
+                        ty: DeclarationId(2542),
                     },
                 ],
             },
@@ -66713,12 +66744,12 @@ 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(2542),
+            id: DeclarationId(2544),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1438),
+                    ty: DeclarationId(1440),
                 }],
             },
             type_params: vec![],
@@ -66732,7 +66763,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2543),
+            id: DeclarationId(2545),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66746,17 +66777,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2544),
+            id: DeclarationId(2546),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2542),
+                        ty: DeclarationId(2544),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2543),
+                        ty: DeclarationId(2545),
                     },
                 ],
             },
@@ -66771,12 +66802,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2545),
+            id: DeclarationId(2547),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1441),
+                    ty: DeclarationId(1443),
                 }],
             },
             type_params: vec![],
@@ -66790,7 +66821,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2546),
+            id: DeclarationId(2548),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66804,17 +66835,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2547),
+            id: DeclarationId(2549),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2545),
+                        ty: DeclarationId(2547),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2546),
+                        ty: DeclarationId(2548),
                     },
                 ],
             },
@@ -66829,7 +66860,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2548),
+            id: DeclarationId(2550),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66848,7 +66879,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2549),
+            id: DeclarationId(2551),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66862,17 +66893,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2550),
+            id: DeclarationId(2552),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2548),
+                        ty: DeclarationId(2550),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2549),
+                        ty: DeclarationId(2551),
                     },
                 ],
             },
@@ -66887,7 +66918,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2551),
+            id: DeclarationId(2553),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66906,7 +66937,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2552),
+            id: DeclarationId(2554),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66920,17 +66951,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2553),
+            id: DeclarationId(2555),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2551),
+                        ty: DeclarationId(2553),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2552),
+                        ty: DeclarationId(2554),
                     },
                 ],
             },
@@ -66945,7 +66976,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2554),
+            id: DeclarationId(2556),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66964,7 +66995,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 30660, 30667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2555),
+            id: DeclarationId(2557),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66978,17 +67009,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 30660, 30667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2556),
+            id: DeclarationId(2558),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2554),
+                        ty: DeclarationId(2556),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2555),
+                        ty: DeclarationId(2557),
                     },
                 ],
             },
@@ -67003,7 +67034,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 30660, 30667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2557),
+            id: DeclarationId(2559),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67022,7 +67053,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2558),
+            id: DeclarationId(2560),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67036,17 +67067,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2559),
+            id: DeclarationId(2561),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2557),
+                        ty: DeclarationId(2559),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2558),
+                        ty: DeclarationId(2560),
                     },
                 ],
             },
@@ -67061,7 +67092,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2560),
+            id: DeclarationId(2562),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67080,7 +67111,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2561),
+            id: DeclarationId(2563),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67094,17 +67125,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2562),
+            id: DeclarationId(2564),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2560),
+                        ty: DeclarationId(2562),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2561),
+                        ty: DeclarationId(2563),
                     },
                 ],
             },
@@ -67119,7 +67150,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2563),
+            id: DeclarationId(2565),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67138,7 +67169,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2564),
+            id: DeclarationId(2566),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67152,17 +67183,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2565),
+            id: DeclarationId(2567),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2563),
+                        ty: DeclarationId(2565),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2564),
+                        ty: DeclarationId(2566),
                     },
                 ],
             },
@@ -67177,7 +67208,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2566),
+            id: DeclarationId(2568),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67196,7 +67227,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2567),
+            id: DeclarationId(2569),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67210,17 +67241,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2568),
+            id: DeclarationId(2570),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2566),
+                        ty: DeclarationId(2568),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2567),
+                        ty: DeclarationId(2569),
                     },
                 ],
             },
@@ -67235,7 +67266,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2569),
+            id: DeclarationId(2571),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67254,7 +67285,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2570),
+            id: DeclarationId(2572),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67268,17 +67299,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2571),
+            id: DeclarationId(2573),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2569),
+                        ty: DeclarationId(2571),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2570),
+                        ty: DeclarationId(2572),
                     },
                 ],
             },
@@ -67293,7 +67324,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2572),
+            id: DeclarationId(2574),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67312,7 +67343,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2573),
+            id: DeclarationId(2575),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67326,17 +67357,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2574),
+            id: DeclarationId(2576),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2572),
+                        ty: DeclarationId(2574),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2573),
+                        ty: DeclarationId(2575),
                     },
                 ],
             },
@@ -67351,7 +67382,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2575),
+            id: DeclarationId(2577),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67370,7 +67401,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2576),
+            id: DeclarationId(2578),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67384,17 +67415,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2577),
+            id: DeclarationId(2579),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2575),
+                        ty: DeclarationId(2577),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2576),
+                        ty: DeclarationId(2578),
                     },
                 ],
             },
@@ -67409,7 +67440,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2578),
+            id: DeclarationId(2580),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67428,7 +67459,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2579),
+            id: DeclarationId(2581),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67442,17 +67473,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2580),
+            id: DeclarationId(2582),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2578),
+                        ty: DeclarationId(2580),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2579),
+                        ty: DeclarationId(2581),
                     },
                 ],
             },
@@ -67467,7 +67498,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2581),
+            id: DeclarationId(2583),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67486,7 +67517,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2582),
+            id: DeclarationId(2584),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67500,17 +67531,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2583),
+            id: DeclarationId(2585),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2581),
+                        ty: DeclarationId(2583),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2582),
+                        ty: DeclarationId(2584),
                     },
                 ],
             },
@@ -67525,7 +67556,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2584),
+            id: DeclarationId(2586),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67544,7 +67575,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2585),
+            id: DeclarationId(2587),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67558,17 +67589,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2586),
+            id: DeclarationId(2588),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2584),
+                        ty: DeclarationId(2586),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2585),
+                        ty: DeclarationId(2587),
                     },
                 ],
             },
@@ -67583,7 +67614,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2587),
+            id: DeclarationId(2589),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67602,7 +67633,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2588),
+            id: DeclarationId(2590),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67616,17 +67647,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2589),
+            id: DeclarationId(2591),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2587),
+                        ty: DeclarationId(2589),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2588),
+                        ty: DeclarationId(2590),
                     },
                 ],
             },
@@ -67641,7 +67672,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2590),
+            id: DeclarationId(2592),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67660,7 +67691,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2591),
+            id: DeclarationId(2593),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67674,17 +67705,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2592),
+            id: DeclarationId(2594),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2590),
+                        ty: DeclarationId(2592),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2591),
+                        ty: DeclarationId(2593),
                     },
                 ],
             },
@@ -67699,7 +67730,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2593),
+            id: DeclarationId(2595),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67718,7 +67749,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2594),
+            id: DeclarationId(2596),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67732,17 +67763,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2595),
+            id: DeclarationId(2597),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2593),
+                        ty: DeclarationId(2595),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2594),
+                        ty: DeclarationId(2596),
                     },
                 ],
             },
@@ -67757,7 +67788,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2596),
+            id: DeclarationId(2598),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67776,7 +67807,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2597),
+            id: DeclarationId(2599),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67790,17 +67821,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2598),
+            id: DeclarationId(2600),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2596),
+                        ty: DeclarationId(2598),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2597),
+                        ty: DeclarationId(2599),
                     },
                 ],
             },
@@ -67815,7 +67846,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2599),
+            id: DeclarationId(2601),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67834,7 +67865,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2600),
+            id: DeclarationId(2602),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67848,17 +67879,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2601),
+            id: DeclarationId(2603),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2599),
+                        ty: DeclarationId(2601),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2600),
+                        ty: DeclarationId(2602),
                     },
                 ],
             },
@@ -67873,7 +67904,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2602),
+            id: DeclarationId(2604),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67892,7 +67923,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2603),
+            id: DeclarationId(2605),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67906,17 +67937,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2604),
+            id: DeclarationId(2606),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2602),
+                        ty: DeclarationId(2604),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2603),
+                        ty: DeclarationId(2605),
                     },
                 ],
             },
@@ -67931,7 +67962,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2605),
+            id: DeclarationId(2607),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67950,7 +67981,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2606),
+            id: DeclarationId(2608),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67964,17 +67995,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2607),
+            id: DeclarationId(2609),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2605),
+                        ty: DeclarationId(2607),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2606),
+                        ty: DeclarationId(2608),
                     },
                 ],
             },
@@ -67989,7 +68020,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2608),
+            id: DeclarationId(2610),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68008,7 +68039,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2609),
+            id: DeclarationId(2611),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68022,17 +68053,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2610),
+            id: DeclarationId(2612),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2608),
+                        ty: DeclarationId(2610),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2609),
+                        ty: DeclarationId(2611),
                     },
                 ],
             },
@@ -68047,7 +68078,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2611),
+            id: DeclarationId(2613),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68066,7 +68097,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2612),
+            id: DeclarationId(2614),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68080,17 +68111,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2613),
+            id: DeclarationId(2615),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2611),
+                        ty: DeclarationId(2613),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2612),
+                        ty: DeclarationId(2614),
                     },
                 ],
             },
@@ -68105,7 +68136,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2614),
+            id: DeclarationId(2616),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68124,7 +68155,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2615),
+            id: DeclarationId(2617),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68138,17 +68169,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2616),
+            id: DeclarationId(2618),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2614),
+                        ty: DeclarationId(2616),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2615),
+                        ty: DeclarationId(2617),
                     },
                 ],
             },
@@ -68163,7 +68194,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2617),
+            id: DeclarationId(2619),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68182,7 +68213,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2618),
+            id: DeclarationId(2620),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68196,17 +68227,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2619),
+            id: DeclarationId(2621),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2617),
+                        ty: DeclarationId(2619),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2618),
+                        ty: DeclarationId(2620),
                     },
                 ],
             },
@@ -68221,7 +68252,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2620),
+            id: DeclarationId(2622),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68240,7 +68271,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(2621),
+            id: DeclarationId(2623),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68254,17 +68285,17 @@ 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(2622),
+            id: DeclarationId(2624),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2620),
+                        ty: DeclarationId(2622),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2621),
+                        ty: DeclarationId(2623),
                     },
                 ],
             },
@@ -68279,7 +68310,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(2623),
+            id: DeclarationId(2625),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68298,7 +68329,7 @@ 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(2624),
+            id: DeclarationId(2626),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68312,17 +68343,17 @@ 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(2625),
+            id: DeclarationId(2627),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2623),
+                        ty: DeclarationId(2625),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2624),
+                        ty: DeclarationId(2626),
                     },
                 ],
             },
@@ -68337,7 +68368,7 @@ 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(2626),
+            id: DeclarationId(2628),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68356,7 +68387,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2627),
+            id: DeclarationId(2629),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68370,17 +68401,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2628),
+            id: DeclarationId(2630),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2626),
+                        ty: DeclarationId(2628),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2627),
+                        ty: DeclarationId(2629),
                     },
                 ],
             },
@@ -68395,7 +68426,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2629),
+            id: DeclarationId(2631),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68414,7 +68445,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2630),
+            id: DeclarationId(2632),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68428,17 +68459,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2631),
+            id: DeclarationId(2633),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2629),
+                        ty: DeclarationId(2631),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2630),
+                        ty: DeclarationId(2632),
                     },
                 ],
             },
@@ -68453,7 +68484,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2632),
+            id: DeclarationId(2634),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68472,7 +68503,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2633),
+            id: DeclarationId(2635),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68486,17 +68517,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2634),
+            id: DeclarationId(2636),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2632),
+                        ty: DeclarationId(2634),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2633),
+                        ty: DeclarationId(2635),
                     },
                 ],
             },
@@ -68511,7 +68542,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2635),
+            id: DeclarationId(2637),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68530,7 +68561,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2636),
+            id: DeclarationId(2638),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68544,17 +68575,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2637),
+            id: DeclarationId(2639),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2635),
+                        ty: DeclarationId(2637),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2636),
+                        ty: DeclarationId(2638),
                     },
                 ],
             },
@@ -68569,7 +68600,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2638),
+            id: DeclarationId(2640),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68588,7 +68619,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2639),
+            id: DeclarationId(2641),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68602,17 +68633,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2640),
+            id: DeclarationId(2642),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2638),
+                        ty: DeclarationId(2640),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2639),
+                        ty: DeclarationId(2641),
                     },
                 ],
             },
@@ -68627,7 +68658,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2641),
+            id: DeclarationId(2643),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68646,7 +68677,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2642),
+            id: DeclarationId(2644),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68660,17 +68691,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2643),
+            id: DeclarationId(2645),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2641),
+                        ty: DeclarationId(2643),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2642),
+                        ty: DeclarationId(2644),
                     },
                 ],
             },
@@ -68685,7 +68716,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2644),
+            id: DeclarationId(2646),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68704,7 +68735,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2645),
+            id: DeclarationId(2647),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68718,17 +68749,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2646),
+            id: DeclarationId(2648),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2644),
+                        ty: DeclarationId(2646),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2645),
+                        ty: DeclarationId(2647),
                     },
                 ],
             },
@@ -68743,7 +68774,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2647),
+            id: DeclarationId(2649),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68762,7 +68793,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2648),
+            id: DeclarationId(2650),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68776,17 +68807,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2649),
+            id: DeclarationId(2651),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2647),
+                        ty: DeclarationId(2649),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2648),
+                        ty: DeclarationId(2650),
                     },
                 ],
             },
@@ -68801,7 +68832,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2650),
+            id: DeclarationId(2652),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68820,7 +68851,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2651),
+            id: DeclarationId(2653),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68834,17 +68865,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2652),
+            id: DeclarationId(2654),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2650),
+                        ty: DeclarationId(2652),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2651),
+                        ty: DeclarationId(2653),
                     },
                 ],
             },
@@ -68859,7 +68890,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2653),
+            id: DeclarationId(2655),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68878,7 +68909,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2654),
+            id: DeclarationId(2656),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68892,17 +68923,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2655),
+            id: DeclarationId(2657),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2653),
+                        ty: DeclarationId(2655),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2654),
+                        ty: DeclarationId(2656),
                     },
                 ],
             },
@@ -68917,7 +68948,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2656),
+            id: DeclarationId(2658),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68936,7 +68967,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2657),
+            id: DeclarationId(2659),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68950,17 +68981,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2658),
+            id: DeclarationId(2660),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2656),
+                        ty: DeclarationId(2658),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2657),
+                        ty: DeclarationId(2659),
                     },
                 ],
             },
@@ -68975,7 +69006,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2659),
+            id: DeclarationId(2661),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68994,7 +69025,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2660),
+            id: DeclarationId(2662),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69008,17 +69039,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2661),
+            id: DeclarationId(2663),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2659),
+                        ty: DeclarationId(2661),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2660),
+                        ty: DeclarationId(2662),
                     },
                 ],
             },
@@ -69033,12 +69064,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2662),
+            id: DeclarationId(2664),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1756),
+                    ty: DeclarationId(1758),
                 }],
             },
             type_params: vec![],
@@ -69052,7 +69083,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2663),
+            id: DeclarationId(2665),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69066,17 +69097,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2664),
+            id: DeclarationId(2666),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2662),
+                        ty: DeclarationId(2664),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2663),
+                        ty: DeclarationId(2665),
                     },
                 ],
             },
@@ -69091,7 +69122,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2665),
+            id: DeclarationId(2667),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69110,7 +69141,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2666),
+            id: DeclarationId(2668),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69124,17 +69155,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2667),
+            id: DeclarationId(2669),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2665),
+                        ty: DeclarationId(2667),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2666),
+                        ty: DeclarationId(2668),
                     },
                 ],
             },
@@ -69149,7 +69180,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2668),
+            id: DeclarationId(2670),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69168,7 +69199,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2669),
+            id: DeclarationId(2671),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69182,17 +69213,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2670),
+            id: DeclarationId(2672),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2668),
+                        ty: DeclarationId(2670),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2669),
+                        ty: DeclarationId(2671),
                     },
                 ],
             },
@@ -69207,7 +69238,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2671),
+            id: DeclarationId(2673),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69226,7 +69257,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2672),
+            id: DeclarationId(2674),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69240,17 +69271,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2673),
+            id: DeclarationId(2675),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2671),
+                        ty: DeclarationId(2673),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2672),
+                        ty: DeclarationId(2674),
                     },
                 ],
             },
@@ -69265,7 +69296,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2674),
+            id: DeclarationId(2676),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69284,7 +69315,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2675),
+            id: DeclarationId(2677),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69298,17 +69329,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2676),
+            id: DeclarationId(2678),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2674),
+                        ty: DeclarationId(2676),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2675),
+                        ty: DeclarationId(2677),
                     },
                 ],
             },
@@ -69323,7 +69354,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2677),
+            id: DeclarationId(2679),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69342,7 +69373,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2678),
+            id: DeclarationId(2680),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69356,17 +69387,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2679),
+            id: DeclarationId(2681),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2677),
+                        ty: DeclarationId(2679),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2678),
+                        ty: DeclarationId(2680),
                     },
                 ],
             },
@@ -69381,7 +69412,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2680),
+            id: DeclarationId(2682),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69400,7 +69431,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2681),
+            id: DeclarationId(2683),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69414,17 +69445,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2682),
+            id: DeclarationId(2684),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2680),
+                        ty: DeclarationId(2682),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2681),
+                        ty: DeclarationId(2683),
                     },
                 ],
             },
@@ -69439,7 +69470,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2683),
+            id: DeclarationId(2685),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69458,7 +69489,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2684),
+            id: DeclarationId(2686),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69472,17 +69503,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2685),
+            id: DeclarationId(2687),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2683),
+                        ty: DeclarationId(2685),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2684),
+                        ty: DeclarationId(2686),
                     },
                 ],
             },
@@ -69497,7 +69528,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2686),
+            id: DeclarationId(2688),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69516,7 +69547,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2687),
+            id: DeclarationId(2689),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69530,17 +69561,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2688),
+            id: DeclarationId(2690),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2686),
+                        ty: DeclarationId(2688),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2687),
+                        ty: DeclarationId(2689),
                     },
                 ],
             },
@@ -69555,7 +69586,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2689),
+            id: DeclarationId(2691),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69574,7 +69605,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2690),
+            id: DeclarationId(2692),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69588,17 +69619,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2691),
+            id: DeclarationId(2693),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2689),
+                        ty: DeclarationId(2691),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2690),
+                        ty: DeclarationId(2692),
                     },
                 ],
             },
@@ -69613,7 +69644,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2692),
+            id: DeclarationId(2694),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69632,7 +69663,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2693),
+            id: DeclarationId(2695),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69646,17 +69677,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2694),
+            id: DeclarationId(2696),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2692),
+                        ty: DeclarationId(2694),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2693),
+                        ty: DeclarationId(2695),
                     },
                 ],
             },
@@ -69671,7 +69702,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2695),
+            id: DeclarationId(2697),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69690,7 +69721,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2696),
+            id: DeclarationId(2698),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69704,17 +69735,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2697),
+            id: DeclarationId(2699),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2695),
+                        ty: DeclarationId(2697),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2696),
+                        ty: DeclarationId(2698),
                     },
                 ],
             },
@@ -69729,7 +69760,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2698),
+            id: DeclarationId(2700),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69748,7 +69779,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2699),
+            id: DeclarationId(2701),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69762,17 +69793,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2700),
+            id: DeclarationId(2702),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2698),
+                        ty: DeclarationId(2700),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2699),
+                        ty: DeclarationId(2701),
                     },
                 ],
             },
@@ -69787,7 +69818,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2701),
+            id: DeclarationId(2703),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69806,7 +69837,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2702),
+            id: DeclarationId(2704),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69820,17 +69851,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2703),
+            id: DeclarationId(2705),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2701),
+                        ty: DeclarationId(2703),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2702),
+                        ty: DeclarationId(2704),
                     },
                 ],
             },
@@ -69845,7 +69876,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2704),
+            id: DeclarationId(2706),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69864,7 +69895,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2705),
+            id: DeclarationId(2707),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69878,17 +69909,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2706),
+            id: DeclarationId(2708),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2704),
+                        ty: DeclarationId(2706),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2705),
+                        ty: DeclarationId(2707),
                     },
                 ],
             },
@@ -69903,7 +69934,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2707),
+            id: DeclarationId(2709),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69922,7 +69953,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2708),
+            id: DeclarationId(2710),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69936,17 +69967,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2709),
+            id: DeclarationId(2711),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2707),
+                        ty: DeclarationId(2709),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2708),
+                        ty: DeclarationId(2710),
                     },
                 ],
             },
@@ -69961,7 +69992,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2710),
+            id: DeclarationId(2712),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69980,7 +70011,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2711),
+            id: DeclarationId(2713),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69994,17 +70025,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2712),
+            id: DeclarationId(2714),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2710),
+                        ty: DeclarationId(2712),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2711),
+                        ty: DeclarationId(2713),
                     },
                 ],
             },
@@ -70019,7 +70050,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2713),
+            id: DeclarationId(2715),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70038,7 +70069,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2714),
+            id: DeclarationId(2716),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70052,17 +70083,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2715),
+            id: DeclarationId(2717),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2713),
+                        ty: DeclarationId(2715),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2714),
+                        ty: DeclarationId(2716),
                     },
                 ],
             },
@@ -70077,7 +70108,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2716),
+            id: DeclarationId(2718),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70096,7 +70127,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2717),
+            id: DeclarationId(2719),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70110,17 +70141,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2718),
+            id: DeclarationId(2720),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2716),
+                        ty: DeclarationId(2718),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2717),
+                        ty: DeclarationId(2719),
                     },
                 ],
             },
@@ -70135,7 +70166,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2719),
+            id: DeclarationId(2721),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70154,7 +70185,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2720),
+            id: DeclarationId(2722),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70168,17 +70199,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2721),
+            id: DeclarationId(2723),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2719),
+                        ty: DeclarationId(2721),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2720),
+                        ty: DeclarationId(2722),
                     },
                 ],
             },
@@ -70193,7 +70224,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2722),
+            id: DeclarationId(2724),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70212,7 +70243,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2723),
+            id: DeclarationId(2725),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70226,17 +70257,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2724),
+            id: DeclarationId(2726),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2722),
+                        ty: DeclarationId(2724),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2723),
+                        ty: DeclarationId(2725),
                     },
                 ],
             },
@@ -70251,7 +70282,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2725),
+            id: DeclarationId(2727),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70270,7 +70301,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2726),
+            id: DeclarationId(2728),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70284,17 +70315,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2727),
+            id: DeclarationId(2729),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2725),
+                        ty: DeclarationId(2727),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2726),
+                        ty: DeclarationId(2728),
                     },
                 ],
             },
@@ -70309,7 +70340,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2728),
+            id: DeclarationId(2730),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70328,7 +70359,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2729),
+            id: DeclarationId(2731),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70342,17 +70373,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2730),
+            id: DeclarationId(2732),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2728),
+                        ty: DeclarationId(2730),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2729),
+                        ty: DeclarationId(2731),
                     },
                 ],
             },
@@ -70367,7 +70398,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2731),
+            id: DeclarationId(2733),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70386,7 +70417,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2732),
+            id: DeclarationId(2734),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70400,17 +70431,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2733),
+            id: DeclarationId(2735),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2731),
+                        ty: DeclarationId(2733),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2732),
+                        ty: DeclarationId(2734),
                     },
                 ],
             },
@@ -70425,7 +70456,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2734),
+            id: DeclarationId(2736),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70444,7 +70475,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2735),
+            id: DeclarationId(2737),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70458,17 +70489,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2736),
+            id: DeclarationId(2738),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2734),
+                        ty: DeclarationId(2736),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2735),
+                        ty: DeclarationId(2737),
                     },
                 ],
             },
@@ -70483,7 +70514,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2737),
+            id: DeclarationId(2739),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70502,7 +70533,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2738),
+            id: DeclarationId(2740),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70516,17 +70547,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2739),
+            id: DeclarationId(2741),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2737),
+                        ty: DeclarationId(2739),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2738),
+                        ty: DeclarationId(2740),
                     },
                 ],
             },
@@ -70541,7 +70572,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2740),
+            id: DeclarationId(2742),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70560,7 +70591,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2741),
+            id: DeclarationId(2743),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70574,17 +70605,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2742),
+            id: DeclarationId(2744),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2740),
+                        ty: DeclarationId(2742),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2741),
+                        ty: DeclarationId(2743),
                     },
                 ],
             },
@@ -70599,7 +70630,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2743),
+            id: DeclarationId(2745),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70618,7 +70649,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2744),
+            id: DeclarationId(2746),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70632,17 +70663,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2745),
+            id: DeclarationId(2747),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2743),
+                        ty: DeclarationId(2745),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2744),
+                        ty: DeclarationId(2746),
                     },
                 ],
             },
@@ -70657,7 +70688,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2746),
+            id: DeclarationId(2748),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70676,7 +70707,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2747),
+            id: DeclarationId(2749),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70690,17 +70721,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2748),
+            id: DeclarationId(2750),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2746),
+                        ty: DeclarationId(2748),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2747),
+                        ty: DeclarationId(2749),
                     },
                 ],
             },
@@ -70715,7 +70746,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2749),
+            id: DeclarationId(2751),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70734,7 +70765,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(2750),
+            id: DeclarationId(2752),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70748,17 +70779,17 @@ 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(2751),
+            id: DeclarationId(2753),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2749),
+                        ty: DeclarationId(2751),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2750),
+                        ty: DeclarationId(2752),
                     },
                 ],
             },
@@ -70773,7 +70804,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(2752),
+            id: DeclarationId(2754),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70792,7 +70823,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2753),
+            id: DeclarationId(2755),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70806,17 +70837,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2754),
+            id: DeclarationId(2756),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2752),
+                        ty: DeclarationId(2754),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2753),
+                        ty: DeclarationId(2755),
                     },
                 ],
             },
@@ -70831,7 +70862,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2755),
+            id: DeclarationId(2757),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70850,7 +70881,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2756),
+            id: DeclarationId(2758),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70864,17 +70895,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2757),
+            id: DeclarationId(2759),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2755),
+                        ty: DeclarationId(2757),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2756),
+                        ty: DeclarationId(2758),
                     },
                 ],
             },
@@ -70889,12 +70920,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2758),
+            id: DeclarationId(2760),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1368),
+                    ty: DeclarationId(1370),
                 }],
             },
             type_params: vec![],
@@ -70908,7 +70939,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2759),
+            id: DeclarationId(2761),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70922,17 +70953,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2760),
+            id: DeclarationId(2762),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2758),
+                        ty: DeclarationId(2760),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2759),
+                        ty: DeclarationId(2761),
                     },
                 ],
             },
@@ -70947,12 +70978,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2761),
+            id: DeclarationId(2763),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2349),
+                    ty: DeclarationId(2351),
                 }],
             },
             type_params: vec![],
@@ -70966,7 +70997,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2762),
+            id: DeclarationId(2764),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70980,17 +71011,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2763),
+            id: DeclarationId(2765),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2761),
+                        ty: DeclarationId(2763),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2762),
+                        ty: DeclarationId(2764),
                     },
                 ],
             },
@@ -71005,12 +71036,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2764),
+            id: DeclarationId(2766),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1357),
+                    ty: DeclarationId(1359),
                 }],
             },
             type_params: vec![],
@@ -71024,7 +71055,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2765),
+            id: DeclarationId(2767),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71038,17 +71069,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2766),
+            id: DeclarationId(2768),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2764),
+                        ty: DeclarationId(2766),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2765),
+                        ty: DeclarationId(2767),
                     },
                 ],
             },
@@ -71063,7 +71094,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2767),
+            id: DeclarationId(2769),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71082,7 +71113,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2768),
+            id: DeclarationId(2770),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71096,17 +71127,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2769),
+            id: DeclarationId(2771),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2767),
+                        ty: DeclarationId(2769),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2768),
+                        ty: DeclarationId(2770),
                     },
                 ],
             },
@@ -71121,7 +71152,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2770),
+            id: DeclarationId(2772),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71140,7 +71171,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2771),
+            id: DeclarationId(2773),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71154,17 +71185,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2772),
+            id: DeclarationId(2774),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2770),
+                        ty: DeclarationId(2772),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2771),
+                        ty: DeclarationId(2773),
                     },
                 ],
             },
@@ -71179,7 +71210,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2773),
+            id: DeclarationId(2775),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71198,7 +71229,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2774),
+            id: DeclarationId(2776),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71212,17 +71243,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2775),
+            id: DeclarationId(2777),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2773),
+                        ty: DeclarationId(2775),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2774),
+                        ty: DeclarationId(2776),
                     },
                 ],
             },
@@ -71237,12 +71268,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2776),
+            id: DeclarationId(2778),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2383),
+                    ty: DeclarationId(2385),
                 }],
             },
             type_params: vec![],
@@ -71256,7 +71287,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2777),
+            id: DeclarationId(2779),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71270,17 +71301,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2778),
+            id: DeclarationId(2780),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2776),
+                        ty: DeclarationId(2778),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2777),
+                        ty: DeclarationId(2779),
                     },
                 ],
             },
@@ -71295,12 +71326,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2779),
+            id: DeclarationId(2781),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2385),
+                    ty: DeclarationId(2387),
                 }],
             },
             type_params: vec![],
@@ -71314,7 +71345,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2780),
+            id: DeclarationId(2782),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71328,17 +71359,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2781),
+            id: DeclarationId(2783),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2779),
+                        ty: DeclarationId(2781),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2780),
+                        ty: DeclarationId(2782),
                     },
                 ],
             },
@@ -71353,7 +71384,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2782),
+            id: DeclarationId(2784),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71372,7 +71403,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2783),
+            id: DeclarationId(2785),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71386,17 +71417,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2784),
+            id: DeclarationId(2786),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2782),
+                        ty: DeclarationId(2784),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2783),
+                        ty: DeclarationId(2785),
                     },
                 ],
             },
@@ -71411,12 +71442,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2785),
+            id: DeclarationId(2787),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1387),
+                    ty: DeclarationId(1389),
                 }],
             },
             type_params: vec![],
@@ -71430,7 +71461,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2786),
+            id: DeclarationId(2788),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71444,17 +71475,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2787),
+            id: DeclarationId(2789),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2785),
+                        ty: DeclarationId(2787),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2786),
+                        ty: DeclarationId(2788),
                     },
                 ],
             },
@@ -71469,7 +71500,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2788),
+            id: DeclarationId(2790),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71488,7 +71519,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2789),
+            id: DeclarationId(2791),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71502,17 +71533,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2790),
+            id: DeclarationId(2792),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2788),
+                        ty: DeclarationId(2790),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2789),
+                        ty: DeclarationId(2791),
                     },
                 ],
             },
@@ -71527,12 +71558,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2791),
+            id: DeclarationId(2793),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1368),
+                    ty: DeclarationId(1370),
                 }],
             },
             type_params: vec![],
@@ -71546,7 +71577,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2792),
+            id: DeclarationId(2794),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71560,17 +71591,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2793),
+            id: DeclarationId(2795),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2791),
+                        ty: DeclarationId(2793),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2792),
+                        ty: DeclarationId(2794),
                     },
                 ],
             },
@@ -71585,12 +71616,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2794),
+            id: DeclarationId(2796),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1367),
+                    ty: DeclarationId(1369),
                 }],
             },
             type_params: vec![],
@@ -71604,7 +71635,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2795),
+            id: DeclarationId(2797),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71618,17 +71649,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2796),
+            id: DeclarationId(2798),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2794),
+                        ty: DeclarationId(2796),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2795),
+                        ty: DeclarationId(2797),
                     },
                 ],
             },
@@ -71643,12 +71674,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2797),
+            id: DeclarationId(2799),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1366),
+                    ty: DeclarationId(1368),
                 }],
             },
             type_params: vec![],
@@ -71662,7 +71693,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2798),
+            id: DeclarationId(2800),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71676,17 +71707,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2799),
+            id: DeclarationId(2801),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2797),
+                        ty: DeclarationId(2799),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2798),
+                        ty: DeclarationId(2800),
                     },
                 ],
             },
@@ -71701,7 +71732,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2800),
+            id: DeclarationId(2802),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71720,7 +71751,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2801),
+            id: DeclarationId(2803),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71734,17 +71765,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2802),
+            id: DeclarationId(2804),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2800),
+                        ty: DeclarationId(2802),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2801),
+                        ty: DeclarationId(2803),
                     },
                 ],
             },
@@ -71759,7 +71790,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2803),
+            id: DeclarationId(2805),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71778,7 +71809,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2804),
+            id: DeclarationId(2806),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71792,17 +71823,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2805),
+            id: DeclarationId(2807),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2803),
+                        ty: DeclarationId(2805),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2804),
+                        ty: DeclarationId(2806),
                     },
                 ],
             },
@@ -71817,7 +71848,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2806),
+            id: DeclarationId(2808),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71836,7 +71867,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2807),
+            id: DeclarationId(2809),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71850,17 +71881,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2808),
+            id: DeclarationId(2810),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2806),
+                        ty: DeclarationId(2808),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2807),
+                        ty: DeclarationId(2809),
                     },
                 ],
             },
@@ -71875,12 +71906,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2809),
+            id: DeclarationId(2811),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2413),
+                    ty: DeclarationId(2415),
                 }],
             },
             type_params: vec![],
@@ -71894,7 +71925,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2810),
+            id: DeclarationId(2812),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71908,17 +71939,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2811),
+            id: DeclarationId(2813),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2809),
+                        ty: DeclarationId(2811),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2810),
+                        ty: DeclarationId(2812),
                     },
                 ],
             },
@@ -71933,7 +71964,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2812),
+            id: DeclarationId(2814),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71952,7 +71983,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2813),
+            id: DeclarationId(2815),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71966,17 +71997,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2814),
+            id: DeclarationId(2816),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2812),
+                        ty: DeclarationId(2814),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2813),
+                        ty: DeclarationId(2815),
                     },
                 ],
             },
@@ -71991,7 +72022,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2815),
+            id: DeclarationId(2817),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72010,7 +72041,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2816),
+            id: DeclarationId(2818),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72024,17 +72055,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2817),
+            id: DeclarationId(2819),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2815),
+                        ty: DeclarationId(2817),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2816),
+                        ty: DeclarationId(2818),
                     },
                 ],
             },
@@ -72049,7 +72080,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2818),
+            id: DeclarationId(2820),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72068,7 +72099,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2819),
+            id: DeclarationId(2821),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72082,17 +72113,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2820),
+            id: DeclarationId(2822),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2818),
+                        ty: DeclarationId(2820),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2819),
+                        ty: DeclarationId(2821),
                     },
                 ],
             },
@@ -72107,7 +72138,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2821),
+            id: DeclarationId(2823),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72126,7 +72157,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2822),
+            id: DeclarationId(2824),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72140,17 +72171,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2823),
+            id: DeclarationId(2825),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2821),
+                        ty: DeclarationId(2823),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2822),
+                        ty: DeclarationId(2824),
                     },
                 ],
             },
@@ -72165,7 +72196,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2824),
+            id: DeclarationId(2826),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72184,7 +72215,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2825),
+            id: DeclarationId(2827),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72198,17 +72229,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2826),
+            id: DeclarationId(2828),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2824),
+                        ty: DeclarationId(2826),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2825),
+                        ty: DeclarationId(2827),
                     },
                 ],
             },
@@ -72223,12 +72254,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2827),
+            id: DeclarationId(2829),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2421),
+                    ty: DeclarationId(2423),
                 }],
             },
             type_params: vec![],
@@ -72242,7 +72273,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2828),
+            id: DeclarationId(2830),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72256,17 +72287,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2829),
+            id: DeclarationId(2831),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2827),
+                        ty: DeclarationId(2829),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2828),
+                        ty: DeclarationId(2830),
                     },
                 ],
             },
@@ -72281,12 +72312,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2830),
+            id: DeclarationId(2832),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2423),
+                    ty: DeclarationId(2425),
                 }],
             },
             type_params: vec![],
@@ -72300,7 +72331,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10996),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2831),
+            id: DeclarationId(2833),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72314,17 +72345,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10996),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2832),
+            id: DeclarationId(2834),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2830),
+                        ty: DeclarationId(2832),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2831),
+                        ty: DeclarationId(2833),
                     },
                 ],
             },
@@ -72339,7 +72370,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10996),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2833),
+            id: DeclarationId(2835),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72358,7 +72389,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2834),
+            id: DeclarationId(2836),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72372,17 +72403,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2835),
+            id: DeclarationId(2837),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2833),
+                        ty: DeclarationId(2835),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2834),
+                        ty: DeclarationId(2836),
                     },
                 ],
             },
@@ -72397,7 +72428,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2836),
+            id: DeclarationId(2838),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72416,7 +72447,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2837),
+            id: DeclarationId(2839),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72430,17 +72461,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2838),
+            id: DeclarationId(2840),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2836),
+                        ty: DeclarationId(2838),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2837),
+                        ty: DeclarationId(2839),
                     },
                 ],
             },
@@ -72455,7 +72486,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2839),
+            id: DeclarationId(2841),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72474,7 +72505,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2840),
+            id: DeclarationId(2842),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72488,17 +72519,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2841),
+            id: DeclarationId(2843),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2839),
+                        ty: DeclarationId(2841),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2840),
+                        ty: DeclarationId(2842),
                     },
                 ],
             },
@@ -72513,7 +72544,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2842),
+            id: DeclarationId(2844),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72532,7 +72563,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2843),
+            id: DeclarationId(2845),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72546,17 +72577,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2844),
+            id: DeclarationId(2846),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2842),
+                        ty: DeclarationId(2844),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2843),
+                        ty: DeclarationId(2845),
                     },
                 ],
             },
@@ -72571,7 +72602,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2845),
+            id: DeclarationId(2847),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72590,7 +72621,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11530, 11534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2846),
+            id: DeclarationId(2848),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72604,17 +72635,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11530, 11534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2847),
+            id: DeclarationId(2849),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2845),
+                        ty: DeclarationId(2847),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2846),
+                        ty: DeclarationId(2848),
                     },
                 ],
             },
@@ -72629,7 +72660,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11530, 11534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2848),
+            id: DeclarationId(2850),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72648,7 +72679,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11584, 11591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2849),
+            id: DeclarationId(2851),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72662,17 +72693,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11584, 11591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2850),
+            id: DeclarationId(2852),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2848),
+                        ty: DeclarationId(2850),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2849),
+                        ty: DeclarationId(2851),
                     },
                 ],
             },
@@ -72687,7 +72718,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11584, 11591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2851),
+            id: DeclarationId(2853),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72706,7 +72737,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2852),
+            id: DeclarationId(2854),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72720,17 +72751,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2853),
+            id: DeclarationId(2855),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2851),
+                        ty: DeclarationId(2853),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2852),
+                        ty: DeclarationId(2854),
                     },
                 ],
             },
@@ -72745,7 +72776,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2854),
+            id: DeclarationId(2856),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72764,7 +72795,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11610, 11614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2855),
+            id: DeclarationId(2857),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72778,17 +72809,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11610, 11614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2856),
+            id: DeclarationId(2858),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2854),
+                        ty: DeclarationId(2856),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2855),
+                        ty: DeclarationId(2857),
                     },
                 ],
             },
@@ -72803,7 +72834,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11610, 11614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2857),
+            id: DeclarationId(2859),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72822,7 +72853,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11663, 11670),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2858),
+            id: DeclarationId(2860),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72836,17 +72867,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11663, 11670),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2859),
+            id: DeclarationId(2861),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2857),
+                        ty: DeclarationId(2859),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2858),
+                        ty: DeclarationId(2860),
                     },
                 ],
             },
@@ -72861,7 +72892,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11663, 11670),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2860),
+            id: DeclarationId(2862),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72880,7 +72911,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11678, 11682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2861),
+            id: DeclarationId(2863),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72894,17 +72925,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11678, 11682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2862),
+            id: DeclarationId(2864),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2860),
+                        ty: DeclarationId(2862),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2861),
+                        ty: DeclarationId(2863),
                     },
                 ],
             },
@@ -72919,7 +72950,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11678, 11682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2863),
+            id: DeclarationId(2865),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72938,7 +72969,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11689, 11693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2864),
+            id: DeclarationId(2866),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72952,17 +72983,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11689, 11693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2865),
+            id: DeclarationId(2867),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2863),
+                        ty: DeclarationId(2865),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2864),
+                        ty: DeclarationId(2866),
                     },
                 ],
             },
@@ -72977,7 +73008,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11689, 11693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2866),
+            id: DeclarationId(2868),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72996,7 +73027,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12673, 12677),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2867),
+            id: DeclarationId(2869),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73010,17 +73041,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12673, 12677),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2868),
+            id: DeclarationId(2870),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2866),
+                        ty: DeclarationId(2868),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2867),
+                        ty: DeclarationId(2869),
                     },
                 ],
             },
@@ -73035,7 +73066,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12673, 12677),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2869),
+            id: DeclarationId(2871),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -73054,7 +73085,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12756, 12763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2870),
+            id: DeclarationId(2872),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73068,17 +73099,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12756, 12763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2871),
+            id: DeclarationId(2873),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2869),
+                        ty: DeclarationId(2871),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2870),
+                        ty: DeclarationId(2872),
                     },
                 ],
             },
@@ -73093,7 +73124,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12756, 12763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2872),
+            id: DeclarationId(2874),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -73112,7 +73143,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13403, 13407),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2873),
+            id: DeclarationId(2875),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73126,17 +73157,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13403, 13407),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2874),
+            id: DeclarationId(2876),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2872),
+                        ty: DeclarationId(2874),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2873),
+                        ty: DeclarationId(2875),
                     },
                 ],
             },
@@ -74673,7 +74704,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(189),
             Port {
                 id: PortId(189),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1624))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1626))),
                 produced_by: Some(NodeId(184)),
             },
         );
@@ -74697,7 +74728,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(192),
             Port {
                 id: PortId(192),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1625))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1627))),
                 produced_by: None,
             },
         );
@@ -74705,7 +74736,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(193),
             Port {
                 id: PortId(193),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1626))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1628))),
                 produced_by: Some(NodeId(186)),
             },
         );
@@ -74993,7 +75024,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(229),
             Port {
                 id: PortId(229),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1627))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1629))),
                 produced_by: None,
             },
         );
@@ -76545,7 +76576,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(423),
             Port {
                 id: PortId(423),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1628))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1630))),
                 produced_by: None,
             },
         );
@@ -76569,7 +76600,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(426),
             Port {
                 id: PortId(426),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1625))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1627))),
                 produced_by: Some(NodeId(363)),
             },
         );
@@ -76585,7 +76616,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(428),
             Port {
                 id: PortId(428),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1629))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1631))),
                 produced_by: Some(NodeId(365)),
             },
         );
@@ -76593,7 +76624,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(429),
             Port {
                 id: PortId(429),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1630))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1632))),
                 produced_by: None,
             },
         );
@@ -76697,7 +76728,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(442),
             Port {
                 id: PortId(442),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1631))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1633))),
                 produced_by: Some(NodeId(378)),
             },
         );
@@ -76705,7 +76736,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(443),
             Port {
                 id: PortId(443),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1632))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1634))),
                 produced_by: None,
             },
         );
@@ -76753,7 +76784,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(449),
             Port {
                 id: PortId(449),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1633))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1635))),
                 produced_by: Some(NodeId(385)),
             },
         );
@@ -76761,7 +76792,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(450),
             Port {
                 id: PortId(450),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1634))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1636))),
                 produced_by: None,
             },
         );
@@ -76841,7 +76872,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(460),
             Port {
                 id: PortId(460),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1635))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1637))),
                 produced_by: None,
             },
         );
@@ -76945,7 +76976,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(473),
             Port {
                 id: PortId(473),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1636))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1638))),
                 produced_by: Some(NodeId(407)),
             },
         );
@@ -77225,7 +77256,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(508),
             Port {
                 id: PortId(508),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1637))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1639))),
                 produced_by: None,
             },
         );
@@ -77337,7 +77368,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(522),
             Port {
                 id: PortId(522),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1638))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1640))),
                 produced_by: None,
             },
         );
@@ -77449,7 +77480,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(536),
             Port {
                 id: PortId(536),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1639))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1641))),
                 produced_by: None,
             },
         );
@@ -78065,7 +78096,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(613),
             Port {
                 id: PortId(613),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1640))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1642))),
                 produced_by: None,
             },
         );
@@ -78177,7 +78208,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(627),
             Port {
                 id: PortId(627),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1641))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1643))),
                 produced_by: Some(NodeId(516)),
             },
         );
@@ -78185,7 +78216,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(628),
             Port {
                 id: PortId(628),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1642))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1644))),
                 produced_by: None,
             },
         );
@@ -78241,7 +78272,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(635),
             Port {
                 id: PortId(635),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1643))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1645))),
                 produced_by: Some(NodeId(523)),
             },
         );
@@ -78249,7 +78280,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(636),
             Port {
                 id: PortId(636),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1644))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1646))),
                 produced_by: None,
             },
         );
@@ -78265,7 +78296,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(638),
             Port {
                 id: PortId(638),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1645))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1647))),
                 produced_by: Some(NodeId(526)),
             },
         );
@@ -78529,7 +78560,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(671),
             Port {
                 id: PortId(671),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1978))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1980))),
                 produced_by: None,
             },
         );
@@ -78961,7 +78992,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(725),
             Port {
                 id: PortId(725),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2050))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2052))),
                 produced_by: Some(NodeId(596)),
             },
         );
@@ -78985,7 +79016,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(728),
             Port {
                 id: PortId(728),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2051))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2053))),
                 produced_by: Some(NodeId(598)),
             },
         );
@@ -78993,7 +79024,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(729),
             Port {
                 id: PortId(729),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2052))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2054))),
                 produced_by: Some(NodeId(600)),
             },
         );
@@ -79001,7 +79032,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(730),
             Port {
                 id: PortId(730),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2053))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2055))),
                 produced_by: Some(NodeId(602)),
             },
         );
@@ -79009,7 +79040,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(731),
             Port {
                 id: PortId(731),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2054))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2056))),
                 produced_by: Some(NodeId(604)),
             },
         );
@@ -79017,7 +79048,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(732),
             Port {
                 id: PortId(732),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2055))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2057))),
                 produced_by: Some(NodeId(606)),
             },
         );
@@ -79025,7 +79056,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(733),
             Port {
                 id: PortId(733),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2056))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2058))),
                 produced_by: Some(NodeId(608)),
             },
         );
@@ -79033,7 +79064,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(734),
             Port {
                 id: PortId(734),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2058))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2060))),
                 produced_by: Some(NodeId(610)),
             },
         );
@@ -79065,7 +79096,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(738),
             Port {
                 id: PortId(738),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2060))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2062))),
                 produced_by: Some(NodeId(614)),
             },
         );
@@ -79089,7 +79120,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(741),
             Port {
                 id: PortId(741),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2061))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2063))),
                 produced_by: Some(NodeId(617)),
             },
         );
@@ -79121,7 +79152,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(745),
             Port {
                 id: PortId(745),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2062))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2064))),
                 produced_by: Some(NodeId(621)),
             },
         );
@@ -79169,7 +79200,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(751),
             Port {
                 id: PortId(751),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2063))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2065))),
                 produced_by: Some(NodeId(626)),
             },
         );
@@ -79241,7 +79272,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(760),
             Port {
                 id: PortId(760),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2064))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2066))),
                 produced_by: Some(NodeId(633)),
             },
         );
@@ -79321,7 +79352,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(770),
             Port {
                 id: PortId(770),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2065))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2067))),
                 produced_by: Some(NodeId(640)),
             },
         );
@@ -79385,7 +79416,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(778),
             Port {
                 id: PortId(778),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2066))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2068))),
                 produced_by: Some(NodeId(645)),
             },
         );
@@ -79401,7 +79432,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(780),
             Port {
                 id: PortId(780),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2067))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2069))),
                 produced_by: None,
             },
         );
@@ -79489,7 +79520,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(791),
             Port {
                 id: PortId(791),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2068))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2070))),
                 produced_by: Some(NodeId(655)),
             },
         );
@@ -79561,7 +79592,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(800),
             Port {
                 id: PortId(800),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2069))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2071))),
                 produced_by: Some(NodeId(663)),
             },
         );
@@ -79985,7 +80016,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(853),
             Port {
                 id: PortId(853),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2126))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2128))),
                 produced_by: Some(NodeId(713)),
             },
         );
@@ -80193,7 +80224,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(879),
             Port {
                 id: PortId(879),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1614))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1616))),
                 produced_by: Some(NodeId(733)),
             },
         );
@@ -80761,7 +80792,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(950),
             Port {
                 id: PortId(950),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2127))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2129))),
                 produced_by: Some(NodeId(792)),
             },
         );
@@ -80897,7 +80928,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(967),
             Port {
                 id: PortId(967),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1281))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1283))),
                 produced_by: None,
             },
         );
@@ -80937,7 +80968,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(972),
             Port {
                 id: PortId(972),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1283))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1285))),
                 produced_by: Some(NodeId(810)),
             },
         );
@@ -80953,7 +80984,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(974),
             Port {
                 id: PortId(974),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2303))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2305))),
                 produced_by: Some(NodeId(812)),
             },
         );
@@ -81341,140 +81372,140 @@ fn bootstrapped_fixture_without_parse_surface_dag_optional_match_disjs(
 ) -> HashMap<DeclarationId, DeclarationId> {
     {
         let mut map = HashMap::new();
-        map.insert(DeclarationId(389), DeclarationId(2475));
-        map.insert(DeclarationId(391), DeclarationId(2478));
-        map.insert(DeclarationId(423), DeclarationId(2481));
-        map.insert(DeclarationId(426), DeclarationId(2484));
-        map.insert(DeclarationId(471), DeclarationId(2487));
-        map.insert(DeclarationId(472), DeclarationId(2490));
-        map.insert(DeclarationId(473), DeclarationId(2493));
-        map.insert(DeclarationId(513), DeclarationId(2496));
-        map.insert(DeclarationId(515), DeclarationId(2499));
-        map.insert(DeclarationId(516), DeclarationId(2502));
-        map.insert(DeclarationId(539), DeclarationId(2505));
-        map.insert(DeclarationId(582), DeclarationId(2508));
-        map.insert(DeclarationId(602), DeclarationId(2511));
-        map.insert(DeclarationId(603), DeclarationId(2514));
-        map.insert(DeclarationId(605), DeclarationId(2517));
-        map.insert(DeclarationId(608), DeclarationId(2520));
-        map.insert(DeclarationId(613), DeclarationId(2523));
-        map.insert(DeclarationId(614), DeclarationId(2526));
-        map.insert(DeclarationId(618), DeclarationId(2529));
-        map.insert(DeclarationId(619), DeclarationId(2532));
-        map.insert(DeclarationId(620), DeclarationId(2535));
-        map.insert(DeclarationId(625), DeclarationId(2538));
-        map.insert(DeclarationId(1435), DeclarationId(2541));
-        map.insert(DeclarationId(1439), DeclarationId(2544));
-        map.insert(DeclarationId(1442), DeclarationId(2547));
-        map.insert(DeclarationId(1444), DeclarationId(2550));
-        map.insert(DeclarationId(1445), DeclarationId(2553));
-        map.insert(DeclarationId(1446), DeclarationId(2556));
-        map.insert(DeclarationId(1500), DeclarationId(2559));
-        map.insert(DeclarationId(1501), DeclarationId(2562));
-        map.insert(DeclarationId(1502), DeclarationId(2565));
-        map.insert(DeclarationId(1503), DeclarationId(2568));
-        map.insert(DeclarationId(1504), DeclarationId(2571));
-        map.insert(DeclarationId(1505), DeclarationId(2574));
-        map.insert(DeclarationId(1511), DeclarationId(2577));
-        map.insert(DeclarationId(1566), DeclarationId(2580));
-        map.insert(DeclarationId(1569), DeclarationId(2583));
-        map.insert(DeclarationId(1570), DeclarationId(2586));
-        map.insert(DeclarationId(1571), DeclarationId(2589));
-        map.insert(DeclarationId(1572), DeclarationId(2592));
-        map.insert(DeclarationId(1595), DeclarationId(2595));
-        map.insert(DeclarationId(1600), DeclarationId(2598));
-        map.insert(DeclarationId(1604), DeclarationId(2601));
-        map.insert(DeclarationId(1607), DeclarationId(2604));
-        map.insert(DeclarationId(1608), DeclarationId(2607));
-        map.insert(DeclarationId(1653), DeclarationId(2610));
-        map.insert(DeclarationId(1654), DeclarationId(2613));
-        map.insert(DeclarationId(1655), DeclarationId(2616));
-        map.insert(DeclarationId(1656), DeclarationId(2619));
-        map.insert(DeclarationId(1706), DeclarationId(2622));
-        map.insert(DeclarationId(1707), DeclarationId(2625));
-        map.insert(DeclarationId(1726), DeclarationId(2628));
-        map.insert(DeclarationId(1727), DeclarationId(2631));
-        map.insert(DeclarationId(1731), DeclarationId(2634));
-        map.insert(DeclarationId(1732), DeclarationId(2637));
-        map.insert(DeclarationId(1743), DeclarationId(2640));
-        map.insert(DeclarationId(1744), DeclarationId(2643));
-        map.insert(DeclarationId(1746), DeclarationId(2646));
-        map.insert(DeclarationId(1747), DeclarationId(2649));
-        map.insert(DeclarationId(1749), DeclarationId(2652));
-        map.insert(DeclarationId(1750), DeclarationId(2655));
-        map.insert(DeclarationId(1752), DeclarationId(2658));
-        map.insert(DeclarationId(1754), DeclarationId(2661));
-        map.insert(DeclarationId(1757), DeclarationId(2664));
-        map.insert(DeclarationId(1761), DeclarationId(2667));
-        map.insert(DeclarationId(1763), DeclarationId(2670));
-        map.insert(DeclarationId(1765), DeclarationId(2673));
-        map.insert(DeclarationId(1775), DeclarationId(2676));
-        map.insert(DeclarationId(1776), DeclarationId(2679));
-        map.insert(DeclarationId(1777), DeclarationId(2682));
-        map.insert(DeclarationId(1780), DeclarationId(2685));
-        map.insert(DeclarationId(1781), DeclarationId(2688));
-        map.insert(DeclarationId(1816), DeclarationId(2691));
-        map.insert(DeclarationId(1817), DeclarationId(2694));
-        map.insert(DeclarationId(1818), DeclarationId(2697));
-        map.insert(DeclarationId(1819), DeclarationId(2700));
-        map.insert(DeclarationId(1820), DeclarationId(2703));
-        map.insert(DeclarationId(1821), DeclarationId(2706));
-        map.insert(DeclarationId(1844), DeclarationId(2709));
-        map.insert(DeclarationId(1974), DeclarationId(2712));
-        map.insert(DeclarationId(1975), DeclarationId(2715));
-        map.insert(DeclarationId(1981), DeclarationId(2718));
-        map.insert(DeclarationId(1982), DeclarationId(2721));
-        map.insert(DeclarationId(1983), DeclarationId(2724));
-        map.insert(DeclarationId(1984), DeclarationId(2727));
-        map.insert(DeclarationId(1985), DeclarationId(2730));
-        map.insert(DeclarationId(1986), DeclarationId(2733));
-        map.insert(DeclarationId(2091), DeclarationId(2736));
-        map.insert(DeclarationId(2092), DeclarationId(2739));
-        map.insert(DeclarationId(2093), DeclarationId(2742));
-        map.insert(DeclarationId(2096), DeclarationId(2745));
-        map.insert(DeclarationId(2097), DeclarationId(2748));
-        map.insert(DeclarationId(2307), DeclarationId(2751));
-        map.insert(DeclarationId(2336), DeclarationId(2754));
-        map.insert(DeclarationId(2342), DeclarationId(2757));
-        map.insert(DeclarationId(2347), DeclarationId(2760));
-        map.insert(DeclarationId(2350), DeclarationId(2763));
-        map.insert(DeclarationId(2351), DeclarationId(2766));
-        map.insert(DeclarationId(2371), DeclarationId(2769));
-        map.insert(DeclarationId(2372), DeclarationId(2772));
-        map.insert(DeclarationId(2380), DeclarationId(2775));
-        map.insert(DeclarationId(2384), DeclarationId(2778));
-        map.insert(DeclarationId(2386), DeclarationId(2781));
-        map.insert(DeclarationId(2387), DeclarationId(2784));
-        map.insert(DeclarationId(2388), DeclarationId(2787));
-        map.insert(DeclarationId(2389), DeclarationId(2790));
-        map.insert(DeclarationId(2390), DeclarationId(2793));
-        map.insert(DeclarationId(2396), DeclarationId(2796));
-        map.insert(DeclarationId(2398), DeclarationId(2799));
-        map.insert(DeclarationId(2399), DeclarationId(2802));
-        map.insert(DeclarationId(2411), DeclarationId(2805));
-        map.insert(DeclarationId(2412), DeclarationId(2808));
-        map.insert(DeclarationId(2414), DeclarationId(2811));
-        map.insert(DeclarationId(2415), DeclarationId(2814));
-        map.insert(DeclarationId(2416), DeclarationId(2817));
-        map.insert(DeclarationId(2417), DeclarationId(2820));
-        map.insert(DeclarationId(2419), DeclarationId(2823));
-        map.insert(DeclarationId(2420), DeclarationId(2826));
-        map.insert(DeclarationId(2422), DeclarationId(2829));
-        map.insert(DeclarationId(2424), DeclarationId(2832));
-        map.insert(DeclarationId(2425), DeclarationId(2835));
-        map.insert(DeclarationId(2426), DeclarationId(2838));
-        map.insert(DeclarationId(2433), DeclarationId(2841));
-        map.insert(DeclarationId(2434), DeclarationId(2844));
-        map.insert(DeclarationId(2435), DeclarationId(2847));
-        map.insert(DeclarationId(2437), DeclarationId(2850));
-        map.insert(DeclarationId(2438), DeclarationId(2853));
-        map.insert(DeclarationId(2439), DeclarationId(2856));
-        map.insert(DeclarationId(2441), DeclarationId(2859));
-        map.insert(DeclarationId(2442), DeclarationId(2862));
-        map.insert(DeclarationId(2443), DeclarationId(2865));
-        map.insert(DeclarationId(2450), DeclarationId(2868));
-        map.insert(DeclarationId(2452), DeclarationId(2871));
-        map.insert(DeclarationId(2463), DeclarationId(2874));
+        map.insert(DeclarationId(389), DeclarationId(2477));
+        map.insert(DeclarationId(391), DeclarationId(2480));
+        map.insert(DeclarationId(423), DeclarationId(2483));
+        map.insert(DeclarationId(426), DeclarationId(2486));
+        map.insert(DeclarationId(471), DeclarationId(2489));
+        map.insert(DeclarationId(472), DeclarationId(2492));
+        map.insert(DeclarationId(473), DeclarationId(2495));
+        map.insert(DeclarationId(513), DeclarationId(2498));
+        map.insert(DeclarationId(515), DeclarationId(2501));
+        map.insert(DeclarationId(516), DeclarationId(2504));
+        map.insert(DeclarationId(539), DeclarationId(2507));
+        map.insert(DeclarationId(582), DeclarationId(2510));
+        map.insert(DeclarationId(602), DeclarationId(2513));
+        map.insert(DeclarationId(603), DeclarationId(2516));
+        map.insert(DeclarationId(605), DeclarationId(2519));
+        map.insert(DeclarationId(608), DeclarationId(2522));
+        map.insert(DeclarationId(613), DeclarationId(2525));
+        map.insert(DeclarationId(614), DeclarationId(2528));
+        map.insert(DeclarationId(618), DeclarationId(2531));
+        map.insert(DeclarationId(619), DeclarationId(2534));
+        map.insert(DeclarationId(620), DeclarationId(2537));
+        map.insert(DeclarationId(625), DeclarationId(2540));
+        map.insert(DeclarationId(1437), DeclarationId(2543));
+        map.insert(DeclarationId(1441), DeclarationId(2546));
+        map.insert(DeclarationId(1444), DeclarationId(2549));
+        map.insert(DeclarationId(1446), DeclarationId(2552));
+        map.insert(DeclarationId(1447), DeclarationId(2555));
+        map.insert(DeclarationId(1448), DeclarationId(2558));
+        map.insert(DeclarationId(1502), DeclarationId(2561));
+        map.insert(DeclarationId(1503), DeclarationId(2564));
+        map.insert(DeclarationId(1504), DeclarationId(2567));
+        map.insert(DeclarationId(1505), DeclarationId(2570));
+        map.insert(DeclarationId(1506), DeclarationId(2573));
+        map.insert(DeclarationId(1507), DeclarationId(2576));
+        map.insert(DeclarationId(1513), DeclarationId(2579));
+        map.insert(DeclarationId(1568), DeclarationId(2582));
+        map.insert(DeclarationId(1571), DeclarationId(2585));
+        map.insert(DeclarationId(1572), DeclarationId(2588));
+        map.insert(DeclarationId(1573), DeclarationId(2591));
+        map.insert(DeclarationId(1574), DeclarationId(2594));
+        map.insert(DeclarationId(1597), DeclarationId(2597));
+        map.insert(DeclarationId(1602), DeclarationId(2600));
+        map.insert(DeclarationId(1606), DeclarationId(2603));
+        map.insert(DeclarationId(1609), DeclarationId(2606));
+        map.insert(DeclarationId(1610), DeclarationId(2609));
+        map.insert(DeclarationId(1655), DeclarationId(2612));
+        map.insert(DeclarationId(1656), DeclarationId(2615));
+        map.insert(DeclarationId(1657), DeclarationId(2618));
+        map.insert(DeclarationId(1658), DeclarationId(2621));
+        map.insert(DeclarationId(1708), DeclarationId(2624));
+        map.insert(DeclarationId(1709), DeclarationId(2627));
+        map.insert(DeclarationId(1728), DeclarationId(2630));
+        map.insert(DeclarationId(1729), DeclarationId(2633));
+        map.insert(DeclarationId(1733), DeclarationId(2636));
+        map.insert(DeclarationId(1734), DeclarationId(2639));
+        map.insert(DeclarationId(1745), DeclarationId(2642));
+        map.insert(DeclarationId(1746), DeclarationId(2645));
+        map.insert(DeclarationId(1748), DeclarationId(2648));
+        map.insert(DeclarationId(1749), DeclarationId(2651));
+        map.insert(DeclarationId(1751), DeclarationId(2654));
+        map.insert(DeclarationId(1752), DeclarationId(2657));
+        map.insert(DeclarationId(1754), DeclarationId(2660));
+        map.insert(DeclarationId(1756), DeclarationId(2663));
+        map.insert(DeclarationId(1759), DeclarationId(2666));
+        map.insert(DeclarationId(1763), DeclarationId(2669));
+        map.insert(DeclarationId(1765), DeclarationId(2672));
+        map.insert(DeclarationId(1767), DeclarationId(2675));
+        map.insert(DeclarationId(1777), DeclarationId(2678));
+        map.insert(DeclarationId(1778), DeclarationId(2681));
+        map.insert(DeclarationId(1779), DeclarationId(2684));
+        map.insert(DeclarationId(1782), DeclarationId(2687));
+        map.insert(DeclarationId(1783), DeclarationId(2690));
+        map.insert(DeclarationId(1818), DeclarationId(2693));
+        map.insert(DeclarationId(1819), DeclarationId(2696));
+        map.insert(DeclarationId(1820), DeclarationId(2699));
+        map.insert(DeclarationId(1821), DeclarationId(2702));
+        map.insert(DeclarationId(1822), DeclarationId(2705));
+        map.insert(DeclarationId(1823), DeclarationId(2708));
+        map.insert(DeclarationId(1846), DeclarationId(2711));
+        map.insert(DeclarationId(1976), DeclarationId(2714));
+        map.insert(DeclarationId(1977), DeclarationId(2717));
+        map.insert(DeclarationId(1983), DeclarationId(2720));
+        map.insert(DeclarationId(1984), DeclarationId(2723));
+        map.insert(DeclarationId(1985), DeclarationId(2726));
+        map.insert(DeclarationId(1986), DeclarationId(2729));
+        map.insert(DeclarationId(1987), DeclarationId(2732));
+        map.insert(DeclarationId(1988), DeclarationId(2735));
+        map.insert(DeclarationId(2093), DeclarationId(2738));
+        map.insert(DeclarationId(2094), DeclarationId(2741));
+        map.insert(DeclarationId(2095), DeclarationId(2744));
+        map.insert(DeclarationId(2098), DeclarationId(2747));
+        map.insert(DeclarationId(2099), DeclarationId(2750));
+        map.insert(DeclarationId(2309), DeclarationId(2753));
+        map.insert(DeclarationId(2338), DeclarationId(2756));
+        map.insert(DeclarationId(2344), DeclarationId(2759));
+        map.insert(DeclarationId(2349), DeclarationId(2762));
+        map.insert(DeclarationId(2352), DeclarationId(2765));
+        map.insert(DeclarationId(2353), DeclarationId(2768));
+        map.insert(DeclarationId(2373), DeclarationId(2771));
+        map.insert(DeclarationId(2374), DeclarationId(2774));
+        map.insert(DeclarationId(2382), DeclarationId(2777));
+        map.insert(DeclarationId(2386), DeclarationId(2780));
+        map.insert(DeclarationId(2388), DeclarationId(2783));
+        map.insert(DeclarationId(2389), DeclarationId(2786));
+        map.insert(DeclarationId(2390), DeclarationId(2789));
+        map.insert(DeclarationId(2391), DeclarationId(2792));
+        map.insert(DeclarationId(2392), DeclarationId(2795));
+        map.insert(DeclarationId(2398), DeclarationId(2798));
+        map.insert(DeclarationId(2400), DeclarationId(2801));
+        map.insert(DeclarationId(2401), DeclarationId(2804));
+        map.insert(DeclarationId(2413), DeclarationId(2807));
+        map.insert(DeclarationId(2414), DeclarationId(2810));
+        map.insert(DeclarationId(2416), DeclarationId(2813));
+        map.insert(DeclarationId(2417), DeclarationId(2816));
+        map.insert(DeclarationId(2418), DeclarationId(2819));
+        map.insert(DeclarationId(2419), DeclarationId(2822));
+        map.insert(DeclarationId(2421), DeclarationId(2825));
+        map.insert(DeclarationId(2422), DeclarationId(2828));
+        map.insert(DeclarationId(2424), DeclarationId(2831));
+        map.insert(DeclarationId(2426), DeclarationId(2834));
+        map.insert(DeclarationId(2427), DeclarationId(2837));
+        map.insert(DeclarationId(2428), DeclarationId(2840));
+        map.insert(DeclarationId(2435), DeclarationId(2843));
+        map.insert(DeclarationId(2436), DeclarationId(2846));
+        map.insert(DeclarationId(2437), DeclarationId(2849));
+        map.insert(DeclarationId(2439), DeclarationId(2852));
+        map.insert(DeclarationId(2440), DeclarationId(2855));
+        map.insert(DeclarationId(2441), DeclarationId(2858));
+        map.insert(DeclarationId(2443), DeclarationId(2861));
+        map.insert(DeclarationId(2444), DeclarationId(2864));
+        map.insert(DeclarationId(2445), DeclarationId(2867));
+        map.insert(DeclarationId(2452), DeclarationId(2870));
+        map.insert(DeclarationId(2454), DeclarationId(2873));
+        map.insert(DeclarationId(2465), DeclarationId(2876));
         map
     }
 }

From 4eeb7b55cc1221b01481d935175ee1fa96c9736f Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gmail.com>
Date: Wed, 13 May 2026 00:21:57 -0400
Subject: [PATCH 16/17] =?UTF-8?q?WIP:=20T-Cluster-F-=CE=B1=20S1=20#81=20pa?=
 =?UTF-8?q?rallelism=20walker=20port=20(src/v3/compiler/src/workfl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/v3/compiler/src/bootstrap_generated.rs    | 23223 +---------------
 ...otstrap_generated_without_parse_surface.rs | 16823 +----------
 2 files changed, 1823 insertions(+), 38223 deletions(-)

diff --git a/src/v3/compiler/src/bootstrap_generated.rs b/src/v3/compiler/src/bootstrap_generated.rs
index 567ff0ed797..6293dd08bee 100644
--- a/src/v3/compiler/src/bootstrap_generated.rs
+++ b/src/v3/compiler/src/bootstrap_generated.rs
@@ -7,15 +7,9 @@ pub(crate) fn bootstrapped_fixture_dag() -> Dag {
         declarations: bootstrapped_fixture_dag_declarations(),
         ports: bootstrapped_fixture_dag_ports(),
         diagnostics: bootstrapped_fixture_dag_diagnostics(),
-<<<<<<< HEAD
-        next_node_id: 854,
-        next_declaration_id: 3348,
-        next_port_id: 1021,
-=======
         next_node_id: 856,
         next_declaration_id: 3352,
         next_port_id: 1027,
->>>>>>> origin/main
         primitives: PrimitiveCache::default(),
         substrate_markers: SubstrateMarkers::default(),
         realization_metas: RealizationMetaCache::default(),
@@ -30,11 +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(),
-<<<<<<< HEAD
-        declaration_append_begin_after_bootstrap: 3348,
-=======
         declaration_append_begin_after_bootstrap: 3352,
->>>>>>> origin/main
     }
 }
 
@@ -1412,33 +1402,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(182),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2064)),
-=======
             target: TransformTarget::Callable(DeclarationId(2066)),
->>>>>>> origin/main
             inputs: vec![PortId(185)],
             output: PortId(187),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11495, 11507),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(183),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2066)),
-=======
             target: TransformTarget::Callable(DeclarationId(2068)),
->>>>>>> origin/main
             inputs: vec![PortId(187)],
             output: PortId(188),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11488, 11535),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(184),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2010)),
-=======
             target: TransformTarget::Callable(DeclarationId(2012)),
->>>>>>> origin/main
             inputs: vec![PortId(185), PortId(186), PortId(188)],
             output: PortId(189),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11149, 11539),
@@ -1454,11 +1432,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(186),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2012)),
-=======
             target: TransformTarget::Callable(DeclarationId(2014)),
->>>>>>> origin/main
             inputs: vec![PortId(190), PortId(191), PortId(192)],
             output: PortId(193),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11670, 11726),
@@ -1474,11 +1448,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(188),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2067)),
-=======
             target: TransformTarget::Callable(DeclarationId(2069)),
->>>>>>> origin/main
             inputs: vec![PortId(194)],
             output: PortId(195),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11795, 11810),
@@ -1630,11 +1600,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(202),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2051)),
-=======
             target: TransformTarget::Callable(DeclarationId(2053)),
->>>>>>> origin/main
             inputs: vec![PortId(211)],
             output: PortId(212),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12325, 12349),
@@ -1664,11 +1630,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(206),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2049)),
-=======
             target: TransformTarget::Callable(DeclarationId(2051)),
->>>>>>> origin/main
             inputs: vec![PortId(216)],
             output: PortId(217),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12618, 12653),
@@ -1798,22 +1760,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(218),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2045)),
-=======
             target: TransformTarget::Callable(DeclarationId(2047)),
->>>>>>> origin/main
             inputs: vec![PortId(230)],
             output: PortId(231),
             span: SourceSpan::new("src/v3/std/algebra.dag", 14214, 14229),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(219),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2069)),
-=======
             target: TransformTarget::Callable(DeclarationId(2071)),
->>>>>>> origin/main
             inputs: vec![PortId(229), PortId(231)],
             output: PortId(232),
             span: SourceSpan::new("src/v3/std/algebra.dag", 14202, 14245),
@@ -2518,11 +2472,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(266),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2071)),
-=======
             target: TransformTarget::Callable(DeclarationId(2073)),
->>>>>>> origin/main
             inputs: vec![PortId(312), PortId(313)],
             output: PortId(314),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16911, 17021),
@@ -2550,11 +2500,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(270),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2073)),
-=======
             target: TransformTarget::Callable(DeclarationId(2075)),
->>>>>>> origin/main
             inputs: vec![PortId(317), PortId(318)],
             output: PortId(319),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17076, 17186),
@@ -4047,22 +3993,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(364),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2074)),
-=======
             target: TransformTarget::Callable(DeclarationId(2076)),
->>>>>>> origin/main
             inputs: vec![PortId(425), PortId(426)],
             output: PortId(427),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22293, 22323),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(365),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2075)),
-=======
             target: TransformTarget::Callable(DeclarationId(2077)),
->>>>>>> origin/main
             inputs: vec![PortId(424), PortId(427)],
             output: PortId(428),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22275, 22324),
@@ -4078,11 +4016,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(367),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2076)),
-=======
             target: TransformTarget::Callable(DeclarationId(2078)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(430),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22603, 22610),
@@ -4146,11 +4080,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(375),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2077)),
-=======
             target: TransformTarget::Callable(DeclarationId(2079)),
->>>>>>> origin/main
             inputs: vec![PortId(436), PortId(438)],
             output: PortId(439),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22737, 22789),
@@ -4246,33 +4176,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(382),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2045)),
-=======
             target: TransformTarget::Callable(DeclarationId(2047)),
->>>>>>> origin/main
             inputs: vec![PortId(445)],
             output: PortId(446),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23123, 23138),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(383),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2078)),
-=======
             target: TransformTarget::Callable(DeclarationId(2080)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(447),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23140, 23147),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(384),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2079)),
-=======
             target: TransformTarget::Callable(DeclarationId(2081)),
->>>>>>> origin/main
             inputs: vec![PortId(446), PortId(447)],
             output: PortId(448),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23118, 23148),
@@ -4409,11 +4327,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(396),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2080)),
-=======
             target: TransformTarget::Callable(DeclarationId(2082)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(461),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23597, 23604),
@@ -4477,11 +4391,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(404),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2081)),
-=======
             target: TransformTarget::Callable(DeclarationId(2083)),
->>>>>>> origin/main
             inputs: vec![PortId(467), PortId(469)],
             output: PortId(470),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23735, 23792),
@@ -4886,11 +4796,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(430),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2045)),
-=======
             target: TransformTarget::Callable(DeclarationId(2047)),
->>>>>>> origin/main
             inputs: vec![PortId(509)],
             output: PortId(510),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25180, 25195),
@@ -4933,11 +4839,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(435),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2082)),
-=======
             target: TransformTarget::Callable(DeclarationId(2084)),
->>>>>>> origin/main
             inputs: vec![PortId(515), PortId(516)],
             output: PortId(517),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25317, 25349),
@@ -5034,11 +4936,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(442),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2045)),
-=======
             target: TransformTarget::Callable(DeclarationId(2047)),
->>>>>>> origin/main
             inputs: vec![PortId(523)],
             output: PortId(524),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25451, 25466),
@@ -5097,11 +4995,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(449),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2051)),
-=======
             target: TransformTarget::Callable(DeclarationId(2053)),
->>>>>>> origin/main
             inputs: vec![PortId(532)],
             output: PortId(533),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25569, 25628),
@@ -5184,11 +5078,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(454),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2045)),
-=======
             target: TransformTarget::Callable(DeclarationId(2047)),
->>>>>>> origin/main
             inputs: vec![PortId(537)],
             output: PortId(538),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25917, 25932),
@@ -5281,11 +5171,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(465),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2049)),
-=======
             target: TransformTarget::Callable(DeclarationId(2051)),
->>>>>>> origin/main
             inputs: vec![PortId(551)],
             output: PortId(552),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26159, 26222),
@@ -5757,11 +5643,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(494),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2049)),
-=======
             target: TransformTarget::Callable(DeclarationId(2051)),
->>>>>>> origin/main
             inputs: vec![PortId(601)],
             output: PortId(602),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27605, 27633),
@@ -5852,11 +5734,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(505),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2083)),
-=======
             target: TransformTarget::Callable(DeclarationId(2085)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(615),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27988, 27995),
@@ -5920,11 +5798,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(513),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2084)),
-=======
             target: TransformTarget::Callable(DeclarationId(2086)),
->>>>>>> origin/main
             inputs: vec![PortId(621), PortId(623)],
             output: PortId(624),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28136, 28201),
@@ -6013,11 +5887,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(519),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2086)),
-=======
             target: TransformTarget::Callable(DeclarationId(2088)),
->>>>>>> origin/main
             inputs: vec![PortId(628), PortId(630)],
             output: PortId(631),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28319, 28377),
@@ -6038,11 +5908,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(522),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2087)),
-=======
             target: TransformTarget::Callable(DeclarationId(2089)),
->>>>>>> origin/main
             inputs: vec![PortId(629), PortId(633)],
             output: PortId(634),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28403, 28449),
@@ -6085,22 +5951,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(525),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2088)),
-=======
             target: TransformTarget::Callable(DeclarationId(2090)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(637),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28720, 28727),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(526),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2090)),
-=======
             target: TransformTarget::Callable(DeclarationId(2092)),
->>>>>>> origin/main
             inputs: vec![PortId(636), PortId(637)],
             output: PortId(638),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28708, 28749),
@@ -6123,11 +5981,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(529),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2045)),
-=======
             target: TransformTarget::Callable(DeclarationId(2047)),
->>>>>>> origin/main
             inputs: vec![PortId(640)],
             output: PortId(641),
             span: SourceSpan::new("src/v3/std/induction.dag", 29099, 29114),
@@ -6200,11 +6054,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(538),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2053)),
-=======
             target: TransformTarget::Callable(DeclarationId(2055)),
->>>>>>> origin/main
             inputs: vec![PortId(653)],
             output: PortId(654),
             span: SourceSpan::new("src/v3/std/induction.dag", 29338, 29412),
@@ -6218,11 +6068,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(540),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2053)),
-=======
             target: TransformTarget::Callable(DeclarationId(2055)),
->>>>>>> origin/main
             inputs: vec![PortId(655)],
             output: PortId(656),
             span: SourceSpan::new("src/v3/std/induction.dag", 29433, 29461),
@@ -6236,11 +6082,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(542),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2053)),
-=======
             target: TransformTarget::Callable(DeclarationId(2055)),
->>>>>>> origin/main
             inputs: vec![PortId(657)],
             output: PortId(658),
             span: SourceSpan::new("src/v3/std/induction.dag", 29480, 29513),
@@ -6367,11 +6209,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(548),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2053)),
-=======
             target: TransformTarget::Callable(DeclarationId(2055)),
->>>>>>> origin/main
             inputs: vec![PortId(664)],
             output: PortId(665),
             span: SourceSpan::new("src/v3/std/induction.dag", 29645, 29726),
@@ -6396,11 +6234,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(551),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2053)),
-=======
             target: TransformTarget::Callable(DeclarationId(2055)),
->>>>>>> origin/main
             inputs: vec![PortId(668)],
             output: PortId(669),
             span: SourceSpan::new("src/v3/std/induction.dag", 29761, 29835),
@@ -6486,11 +6320,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(559),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2528)),
-=======
             target: TransformTarget::Callable(DeclarationId(2532)),
->>>>>>> origin/main
             inputs: vec![PortId(678)],
             output: PortId(679),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3203, 3241),
@@ -6513,11 +6343,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(562),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2529)),
-=======
             target: TransformTarget::Callable(DeclarationId(2533)),
->>>>>>> origin/main
             inputs: vec![PortId(682)],
             output: PortId(683),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3281, 3319),
@@ -6583,11 +6409,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(567),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2530)),
-=======
             target: TransformTarget::Callable(DeclarationId(2534)),
->>>>>>> origin/main
             inputs: vec![PortId(688)],
             output: PortId(689),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3440, 3478),
@@ -6610,11 +6432,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(570),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2531)),
-=======
             target: TransformTarget::Callable(DeclarationId(2535)),
->>>>>>> origin/main
             inputs: vec![PortId(692)],
             output: PortId(693),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3518, 3556),
@@ -6680,11 +6498,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(575),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2532)),
-=======
             target: TransformTarget::Callable(DeclarationId(2536)),
->>>>>>> origin/main
             inputs: vec![PortId(698)],
             output: PortId(699),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3674, 3712),
@@ -6707,11 +6521,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(578),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2533)),
-=======
             target: TransformTarget::Callable(DeclarationId(2537)),
->>>>>>> origin/main
             inputs: vec![PortId(702)],
             output: PortId(703),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3752, 3790),
@@ -6777,11 +6587,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(583),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2534)),
-=======
             target: TransformTarget::Callable(DeclarationId(2538)),
->>>>>>> origin/main
             inputs: vec![PortId(708)],
             output: PortId(709),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3906, 3944),
@@ -6804,11 +6610,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(586),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2535)),
-=======
             target: TransformTarget::Callable(DeclarationId(2539)),
->>>>>>> origin/main
             inputs: vec![PortId(712)],
             output: PortId(713),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3984, 4022),
@@ -6874,11 +6676,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(591),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2536)),
-=======
             target: TransformTarget::Callable(DeclarationId(2540)),
->>>>>>> origin/main
             inputs: vec![PortId(718)],
             output: PortId(719),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4138, 4176),
@@ -6901,11 +6699,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(594),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2537)),
-=======
             target: TransformTarget::Callable(DeclarationId(2541)),
->>>>>>> origin/main
             inputs: vec![PortId(722)],
             output: PortId(723),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4216, 4254),
@@ -7064,11 +6858,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(600),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2538)),
-=======
             target: TransformTarget::Callable(DeclarationId(2542)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(729),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4940, 4945),
@@ -7084,11 +6874,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(602),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2539)),
-=======
             target: TransformTarget::Callable(DeclarationId(2543)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(730),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5005, 5010),
@@ -7104,11 +6890,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(604),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2540)),
-=======
             target: TransformTarget::Callable(DeclarationId(2544)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(731),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5068, 5073),
@@ -7124,11 +6906,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(606),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2541)),
-=======
             target: TransformTarget::Callable(DeclarationId(2545)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(732),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5131, 5136),
@@ -7144,11 +6922,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(608),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2542)),
-=======
             target: TransformTarget::Callable(DeclarationId(2546)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(733),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5195, 5200),
@@ -7164,11 +6938,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(610),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2543)),
-=======
             target: TransformTarget::Callable(DeclarationId(2547)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(734),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5275, 5280),
@@ -7184,11 +6954,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(612),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2545)),
-=======
             target: TransformTarget::Callable(DeclarationId(2549)),
->>>>>>> origin/main
             inputs: vec![PortId(735)],
             output: PortId(736),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5391, 5402),
@@ -7202,11 +6968,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(614),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2544)),
-=======
             target: TransformTarget::Callable(DeclarationId(2548)),
->>>>>>> origin/main
             inputs: vec![PortId(736), PortId(737)],
             output: PortId(738),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5378, 5443),
@@ -7229,11 +6991,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(617),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2546)),
-=======
             target: TransformTarget::Callable(DeclarationId(2550)),
->>>>>>> origin/main
             inputs: vec![PortId(739), PortId(740)],
             output: PortId(741),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5519, 5577),
@@ -7263,11 +7021,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(621),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2547)),
-=======
             target: TransformTarget::Callable(DeclarationId(2551)),
->>>>>>> origin/main
             inputs: vec![PortId(743), PortId(742), PortId(744)],
             output: PortId(745),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5678, 5803),
@@ -7304,11 +7058,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(626),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2548)),
-=======
             target: TransformTarget::Callable(DeclarationId(2552)),
->>>>>>> origin/main
             inputs: vec![PortId(748), PortId(749), PortId(750)],
             output: PortId(751),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5924, 6086),
@@ -7778,12 +7528,6 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(667),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2587)),
-            inputs: vec![],
-            output: PortId(802),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 6612, 6622),
-=======
             target: TransformTarget::Callable(DeclarationId(1240)),
             inputs: vec![
                 PortId(802),
@@ -7794,7 +7538,6 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
             ],
             output: PortId(807),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7332, 7475),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Bind(BindNode {
             id: NodeId(668),
@@ -7813,27 +7556,13 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(669),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2587)),
-=======
             target: TransformTarget::Callable(DeclarationId(2591)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(808),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8272, 8282),
         }));
         nodes.push(Behavior::Bind(BindNode {
             id: NodeId(670),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2587)),
-            inputs: vec![],
-            output: PortId(807),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 6992, 7002),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(671),
-            target: TransformTarget::Callable(DeclarationId(2589)),
-=======
             name: "timing_measurement_unobserved".to_string(),
             value: PortId(808),
             params: vec![],
@@ -7844,18 +7573,13 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(671),
             target: TransformTarget::Callable(DeclarationId(2591)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(812),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8590, 8600),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(672),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2589)),
-=======
             target: TransformTarget::Callable(DeclarationId(2591)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(813),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8652, 8662),
@@ -7869,11 +7593,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(674),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2589)),
-=======
             target: TransformTarget::Callable(DeclarationId(2593)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(815),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8707, 8712),
@@ -7943,27 +7663,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-<<<<<<< HEAD
-            id: NodeId(676),
-            target: TransformTarget::Callable(DeclarationId(2587)),
-            inputs: vec![],
-            output: PortId(814),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7158, 7168),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(677),
-            target: TransformTarget::Callable(DeclarationId(2589)),
-            inputs: vec![],
-            output: PortId(815),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7186, 7191),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(678),
-            target: TransformTarget::Callable(DeclarationId(2588)),
-=======
             id: NodeId(678),
             target: TransformTarget::Callable(DeclarationId(2591)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(820),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8818, 8828),
@@ -7977,11 +7678,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(680),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2588)),
-=======
             target: TransformTarget::Callable(DeclarationId(2592)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(822),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8873, 8882),
@@ -8055,29 +7752,6 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
             target: TransformTarget::UnresolvedFieldProject {
                 field_label: "duration".to_string(),
             },
-<<<<<<< HEAD
-            inputs: vec![PortId(821)],
-            output: PortId(822),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7292, 7304),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(683),
-            target: TransformTarget::Callable(DeclarationId(2587)),
-            inputs: vec![],
-            output: PortId(823),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7348, 7358),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(684),
-            target: TransformTarget::Callable(DeclarationId(2589)),
-            inputs: vec![],
-            output: PortId(824),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7376, 7381),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(685),
-            target: TransformTarget::Callable(DeclarationId(2588)),
-=======
             inputs: vec![PortId(827)],
             output: PortId(828),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8952, 8964),
@@ -8085,7 +7759,6 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(685),
             target: TransformTarget::Callable(DeclarationId(2591)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(829),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9008, 9018),
@@ -8133,17 +7806,10 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(691),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2586)),
-            inputs: vec![PortId(831)],
-            output: PortId(832),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7491, 7544),
-=======
             target: TransformTarget::Operator(OperatorKind::Arithmetic(ArithmeticOp::Add)),
             inputs: vec![PortId(834), PortId(835)],
             output: PortId(836),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9181, 9200),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(692),
@@ -8179,17 +7845,10 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(696),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2586)),
-            inputs: vec![PortId(836)],
-            output: PortId(837),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7572, 7660),
-=======
             target: TransformTarget::Operator(OperatorKind::Comparison(ComparisonOp::Gt)),
             inputs: vec![PortId(839), PortId(840)],
             output: PortId(841),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9270, 9289),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Branch(BranchNode {
             id: NodeId(697),
@@ -8389,24 +8048,10 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(707),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1246)),
-            inputs: vec![],
-            output: PortId(847),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8018, 8036),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(708),
-            target: TransformTarget::Callable(DeclarationId(2586)),
-            inputs: vec![PortId(847)],
-            output: PortId(848),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7997, 8038),
-=======
             target: TransformTarget::Callable(DeclarationId(1237)),
             inputs: vec![PortId(851)],
             output: PortId(852),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9586, 9598),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Bind(BindNode {
             id: NodeId(708),
@@ -8449,17 +8094,10 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(713),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2591)),
-            inputs: vec![],
-            output: PortId(853),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8292, 8297),
-=======
             target: TransformTarget::Callable(DeclarationId(1247)),
             inputs: vec![PortId(855), PortId(856), PortId(857)],
             output: PortId(858),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9847, 9891),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Bind(BindNode {
             id: NodeId(714),
@@ -8610,23 +8248,6 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-<<<<<<< HEAD
-            id: NodeId(722),
-            target: TransformTarget::Callable(DeclarationId(2273)),
-            inputs: vec![],
-            output: PortId(868),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9047, 9059),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(723),
-            target: TransformTarget::Callable(DeclarationId(2279)),
-            inputs: vec![PortId(868)],
-            output: PortId(869),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9034, 9060),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-=======
->>>>>>> origin/main
             id: NodeId(724),
             target: TransformTarget::Callable(DeclarationId(2275)),
             inputs: vec![],
@@ -8689,145 +8310,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
             target: TransformTarget::Callable(DeclarationId(159)),
             inputs: vec![PortId(878), PortId(879), PortId(880)],
             output: PortId(881),
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10241, 10245),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(735),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "span".to_string(),
-            },
-            inputs: vec![PortId(881)],
-            output: PortId(882),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10246, 10250),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(736),
-            target: TransformTarget::Callable(DeclarationId(1251)),
-            inputs: vec![PortId(877), PortId(882)],
-            output: PortId(883),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10187, 10251),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(737),
-            target: TransformTarget::Callable(DeclarationId(2307)),
-            inputs: vec![PortId(883)],
-            output: PortId(884),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10151, 10263),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(738),
-            target: TransformTarget::Callable(DeclarationId(1252)),
-            inputs: vec![],
-            output: PortId(885),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10407, 10446),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(739),
-            target: TransformTarget::Callable(DeclarationId(1251)),
-            inputs: vec![PortId(877), PortId(885)],
-            output: PortId(886),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10327, 10460),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(740),
-            target: TransformTarget::Callable(DeclarationId(2307)),
-            inputs: vec![PortId(886)],
-            output: PortId(887),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10291, 10472),
-        }));
-        nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(741),
-            input: PortId(879),
-            paths: vec![
-                Path {
-                    body: NodeId(737),
-                    output: PortId(884),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Cons".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10129, 10137),
-                    },
-                    binding: Some(PayloadBinding {
-                        binding_name: "dd".to_string(),
-                        payload_port: PortId(880),
-                    }),
-                },
-                Path {
-                    body: NodeId(740),
-                    output: PortId(887),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Empty".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10272, 10277),
-                    },
-                    binding: None,
-                },
-            ],
-            output: PortId(888),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10098, 10480),
-            emit_participation: Some(BranchEmitParticipation::UserMatch),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(742),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "head".to_string(),
-            },
-            inputs: vec![PortId(889)],
-            output: PortId(890),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10646, 10650),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(743),
-            target: TransformTarget::Callable(DeclarationId(1250)),
-            inputs: vec![PortId(890)],
-            output: PortId(891),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10612, 10651),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(744),
-            target: TransformTarget::Callable(DeclarationId(1251)),
-            inputs: vec![PortId(877), PortId(891)],
-            output: PortId(892),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10540, 10661),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(745),
-            target: TransformTarget::Callable(DeclarationId(2307)),
-            inputs: vec![PortId(892)],
-            output: PortId(893),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10508, 10669),
-        }));
-        nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(746),
-            input: PortId(878),
-            paths: vec![
-                Path {
-                    body: NodeId(741),
-                    output: PortId(888),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Empty".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10083, 10088),
-                    },
-                    binding: None,
-                },
-                Path {
-                    body: NodeId(745),
-                    output: PortId(893),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Cons".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10485, 10498),
-                    },
-                    binding: Some(PayloadBinding {
-                        binding_name: "payload".to_string(),
-                        payload_port: PortId(889),
-                    }),
-                },
-            ],
-            output: PortId(894),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10053, 10673),
-            emit_participation: Some(BranchEmitParticipation::UserMatch),
-=======
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11093, 11166),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Bind(BindNode {
             id: NodeId(733),
@@ -8938,27 +8421,6 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-<<<<<<< HEAD
-            id: NodeId(752),
-            target: TransformTarget::Callable(DeclarationId(2587)),
-            inputs: vec![],
-            output: PortId(904),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11299, 11309),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(753),
-            target: TransformTarget::Callable(DeclarationId(2588)),
-            inputs: vec![],
-            output: PortId(905),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11327, 11336),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(754),
-            target: TransformTarget::Callable(DeclarationId(2589)),
-            inputs: vec![],
-            output: PortId(906),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11350, 11355),
-=======
             id: NodeId(744),
             target: TransformTarget::UnresolvedFieldProject {
                 field_label: "head".to_string(),
@@ -8987,7 +8449,6 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
             inputs: vec![PortId(898)],
             output: PortId(899),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12168, 12329),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Branch(BranchNode {
             id: NodeId(748),
@@ -9171,17 +8632,10 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(760),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2592)),
-            inputs: vec![PortId(913)],
-            output: PortId(914),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12279, 12320),
-=======
             target: TransformTarget::Callable(DeclarationId(711)),
             inputs: vec![PortId(917)],
             output: PortId(918),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13906, 13933),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(761),
@@ -9192,17 +8646,10 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(762),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2593)),
-            inputs: vec![PortId(915)],
-            output: PortId(916),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12326, 12367),
-=======
             target: TransformTarget::Callable(DeclarationId(2596)),
             inputs: vec![PortId(919)],
             output: PortId(920),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13939, 13980),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(763),
@@ -9254,17 +8701,10 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(767),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2594)),
-            inputs: vec![PortId(921)],
-            output: PortId(922),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12430, 12471),
-=======
             target: TransformTarget::Callable(DeclarationId(711)),
             inputs: vec![PortId(925)],
             output: PortId(926),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14057, 14084),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(768),
@@ -9275,17 +8715,10 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(769),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2595)),
-            inputs: vec![PortId(923)],
-            output: PortId(924),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12477, 12518),
-=======
             target: TransformTarget::Callable(DeclarationId(2598)),
             inputs: vec![PortId(927)],
             output: PortId(928),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14090, 14131),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(770),
@@ -9337,17 +8770,10 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(774),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2596)),
-            inputs: vec![PortId(929)],
-            output: PortId(930),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12578, 12619),
-=======
             target: TransformTarget::Callable(DeclarationId(711)),
             inputs: vec![PortId(933)],
             output: PortId(934),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14205, 14232),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(775),
@@ -9358,17 +8784,10 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(776),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2597)),
-            inputs: vec![PortId(931)],
-            output: PortId(932),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12625, 12666),
-=======
             target: TransformTarget::Callable(DeclarationId(2600)),
             inputs: vec![PortId(935)],
             output: PortId(936),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14238, 14279),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(777),
@@ -9420,17 +8839,10 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(781),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2598)),
-            inputs: vec![PortId(937)],
-            output: PortId(938),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12724, 12765),
-=======
             target: TransformTarget::Callable(DeclarationId(711)),
             inputs: vec![PortId(941)],
             output: PortId(942),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14351, 14378),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(782),
@@ -9441,17 +8853,10 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(783),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2599)),
-            inputs: vec![PortId(939)],
-            output: PortId(940),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12771, 12812),
-=======
             target: TransformTarget::Callable(DeclarationId(2602)),
             inputs: vec![PortId(943)],
             output: PortId(944),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14384, 14425),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(784),
@@ -9503,17 +8908,10 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(788),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2600)),
-            inputs: vec![PortId(945)],
-            output: PortId(946),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12870, 12911),
-=======
             target: TransformTarget::Callable(DeclarationId(711)),
             inputs: vec![PortId(949)],
             output: PortId(950),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14497, 14524),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(789),
@@ -9524,12 +8922,6 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(790),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2601)),
-            inputs: vec![PortId(947)],
-            output: PortId(948),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12917, 12958),
-=======
             target: TransformTarget::Callable(DeclarationId(2604)),
             inputs: vec![PortId(951)],
             output: PortId(952),
@@ -9548,7 +8940,6 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
             inputs: vec![PortId(953)],
             output: PortId(954),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14577, 14618),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Branch(BranchNode {
             id: NodeId(793),
@@ -9666,16 +9057,6 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(797),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2306)),
-            inputs: vec![],
-            output: PortId(957),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13142, 13154),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(798),
-            target: TransformTarget::Callable(DeclarationId(2306)),
-=======
             target: TransformTarget::Callable(DeclarationId(1309)),
             inputs: vec![PortId(957)],
             output: PortId(961),
@@ -9691,7 +9072,6 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(799),
             target: TransformTarget::Callable(DeclarationId(2308)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(963),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14802, 14814),
@@ -9812,20 +9192,6 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-<<<<<<< HEAD
-            id: NodeId(808),
-            target: TransformTarget::Callable(DeclarationId(1302)),
-            inputs: vec![PortId(968)],
-            output: PortId(969),
-            span: SourceSpan::new("src/v3/std/verification.dag", 28552, 28575),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(809),
-            target: TransformTarget::Callable(DeclarationId(1303)),
-            inputs: vec![PortId(970)],
-            output: PortId(971),
-            span: SourceSpan::new("src/v3/std/verification.dag", 28597, 28631),
-=======
             id: NodeId(810),
             target: TransformTarget::Callable(DeclarationId(1305)),
             inputs: vec![PortId(974)],
@@ -9838,7 +9204,6 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
             inputs: vec![PortId(976)],
             output: PortId(977),
             span: SourceSpan::new("src/v3/std/verification.dag", 28593, 28627),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Branch(BranchNode {
             id: NodeId(812),
@@ -9849,7 +9214,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     output: PortId(975),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Enumerated".to_string(),
-                        span: SourceSpan::new("src/v3/std/verification.dag", 28535, 28548),
+                        span: SourceSpan::new("src/v3/std/verification.dag", 28531, 28544),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "c".to_string(),
@@ -9861,7 +9226,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     output: PortId(977),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Quantified".to_string(),
-                        span: SourceSpan::new("src/v3/std/verification.dag", 28580, 28593),
+                        span: SourceSpan::new("src/v3/std/verification.dag", 28576, 28589),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "q".to_string(),
@@ -9869,27 +9234,16 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     }),
                 },
             ],
-<<<<<<< HEAD
-            output: PortId(972),
-            span: SourceSpan::new("src/v3/std/verification.dag", 28517, 28635),
-=======
             output: PortId(978),
             span: SourceSpan::new("src/v3/std/verification.dag", 28513, 28631),
->>>>>>> origin/main
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Bind(BindNode {
             id: NodeId(813),
             name: "obligation_for_suite_claim".to_string(),
-<<<<<<< HEAD
-            value: PortId(972),
-            params: vec![PortId(967)],
-            span: SourceSpan::new("src/v3/std/verification.dag", 28517, 28635),
-=======
             value: PortId(978),
             params: vec![PortId(973)],
             span: SourceSpan::new("src/v3/std/verification.dag", 28513, 28631),
->>>>>>> origin/main
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
@@ -10508,11 +9862,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
 #[allow(clippy::vec_init_then_push)]
 fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
     {
-<<<<<<< HEAD
-        let mut declarations = Vec::with_capacity(3348);
-=======
         let mut declarations = Vec::with_capacity(3352);
->>>>>>> origin/main
         declarations.push(Declaration {
             id: DeclarationId(0),
             name: Some("Classical".to_string()),
@@ -24720,19 +24070,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Empty".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1816),
-                    },
-                    Field {
-                        label: "Cons".to_string(),
-                        ty: DeclarationId(1818),
-=======
                         ty: DeclarationId(1818),
                     },
                     Field {
                         label: "Cons".to_string(),
                         ty: DeclarationId(1820),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -24765,11 +24107,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-<<<<<<< HEAD
-                output: DeclarationId(1786),
-=======
                 output: DeclarationId(1788),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3273, 3284)),
             },
             type_params: vec![DeclarationId(688)],
@@ -24800,13 +24138,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(689),
             name: Some("cons".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(690), DeclarationId(1787)],
-                output: DeclarationId(1788),
-=======
                 inputs: vec![DeclarationId(690), DeclarationId(1789)],
                 output: DeclarationId(1790),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3453, 3475)),
             },
             type_params: vec![DeclarationId(690)],
@@ -24838,11 +24171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("singleton".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(692)],
-<<<<<<< HEAD
-                output: DeclarationId(1789),
-=======
                 output: DeclarationId(1791),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3570, 3590)),
             },
             type_params: vec![DeclarationId(692)],
@@ -24873,11 +24202,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(693),
             name: Some("fold".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1790), DeclarationId(695), DeclarationId(1791)],
-=======
                 inputs: vec![DeclarationId(1792), DeclarationId(695), DeclarationId(1793)],
->>>>>>> origin/main
                 output: DeclarationId(695),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4203, 4307)),
             },
@@ -24923,11 +24248,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(696),
             name: Some("fold_right".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1792), DeclarationId(698), DeclarationId(1793)],
-=======
                 inputs: vec![DeclarationId(1794), DeclarationId(698), DeclarationId(1795)],
->>>>>>> origin/main
                 output: DeclarationId(698),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4658, 4768)),
             },
@@ -24973,13 +24294,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(699),
             name: Some("concat".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1794), DeclarationId(1795)],
-                output: DeclarationId(1796),
-=======
                 inputs: vec![DeclarationId(1796), DeclarationId(1797)],
                 output: DeclarationId(1798),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5386, 5414)),
             },
             type_params: vec![DeclarationId(700)],
@@ -25010,13 +24326,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(701),
             name: Some("map".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1797), DeclarationId(1798)],
-                output: DeclarationId(1799),
-=======
                 inputs: vec![DeclarationId(1799), DeclarationId(1800)],
                 output: DeclarationId(1801),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5721, 5778)),
             },
             type_params: vec![DeclarationId(702), DeclarationId(703)],
@@ -25061,13 +24372,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(704),
             name: Some("filter".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1800), DeclarationId(1801)],
-                output: DeclarationId(1802),
-=======
                 inputs: vec![DeclarationId(1802), DeclarationId(1803)],
                 output: DeclarationId(1804),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5905, 5988)),
             },
             type_params: vec![DeclarationId(705)],
@@ -25098,13 +24404,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(706),
             name: Some("flat_map".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1803), DeclarationId(1805)],
-                output: DeclarationId(1806),
-=======
                 inputs: vec![DeclarationId(1805), DeclarationId(1807)],
                 output: DeclarationId(1808),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6171, 6230)),
             },
             type_params: vec![DeclarationId(707), DeclarationId(708)],
@@ -25149,11 +24450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(709),
             name: Some("length".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1807)],
-=======
                 inputs: vec![DeclarationId(1809)],
->>>>>>> origin/main
                 output: DeclarationId(93),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6372, 6409)),
             },
@@ -25185,11 +24482,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(711),
             name: Some("is_empty".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1808)],
-=======
                 inputs: vec![DeclarationId(1810)],
->>>>>>> origin/main
                 output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6605, 6671)),
             },
@@ -25260,13 +24553,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(715),
             name: Some("enumerate".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1809)],
-                output: DeclarationId(1811),
-=======
                 inputs: vec![DeclarationId(1811)],
                 output: DeclarationId(1813),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7238, 7269)),
             },
             type_params: vec![DeclarationId(716)],
@@ -25297,13 +24585,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(717),
             name: Some("enumerate_helper".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1812), DeclarationId(93)],
-                output: DeclarationId(1814),
-=======
                 inputs: vec![DeclarationId(1814), DeclarationId(93)],
                 output: DeclarationId(1816),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7463, 7644)),
             },
             type_params: vec![DeclarationId(718)],
@@ -25334,11 +24617,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(719),
             name: Some("contains".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1815), DeclarationId(720)],
-=======
                 inputs: vec![DeclarationId(1817), DeclarationId(720)],
->>>>>>> origin/main
                 output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 8205, 8332)),
             },
@@ -25433,11 +24712,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "rest".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1819),
-=======
                         ty: DeclarationId(1821),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -25480,11 +24755,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "rest".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1820),
-=======
                         ty: DeclarationId(1822),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -25519,19 +24790,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LiteralToken".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1835),
-                    },
-                    Field {
-                        label: "ParamToken".to_string(),
-                        ty: DeclarationId(1836),
-=======
                         ty: DeclarationId(1837),
                     },
                     Field {
                         label: "ParamToken".to_string(),
                         ty: DeclarationId(1838),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -25551,11 +24814,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tokens".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1837),
-=======
                     ty: DeclarationId(1839),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -25575,19 +24834,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ParsedSegmentTokens".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1839),
-                    },
-                    Field {
-                        label: "MalformedPathSegment".to_string(),
-                        ty: DeclarationId(1840),
-=======
                         ty: DeclarationId(1841),
                     },
                     Field {
                         label: "MalformedPathSegment".to_string(),
                         ty: DeclarationId(1842),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -25608,19 +24859,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ParsedPathTemplate".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1841),
-                    },
-                    Field {
-                        label: "MalformedPathTemplate".to_string(),
-                        ty: DeclarationId(1842),
-=======
                         ty: DeclarationId(1843),
                     },
                     Field {
                         label: "MalformedPathTemplate".to_string(),
                         ty: DeclarationId(1844),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -25675,11 +24918,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("last_path_param".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(730)],
-<<<<<<< HEAD
-                output: DeclarationId(1821),
-=======
                 output: DeclarationId(1823),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 11761, 12044)),
             },
             type_params: vec![],
@@ -25699,13 +24938,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ReadEffect".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1843),
-                    },
-                    Field {
-                        label: "UpsertEffect".to_string(),
-                        ty: DeclarationId(1844),
-=======
                         ty: DeclarationId(1845),
                     },
                     Field {
@@ -25715,11 +24947,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "DeleteEffect".to_string(),
                         ty: DeclarationId(1847),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "DeleteEffect".to_string(),
-                        ty: DeclarationId(1845),
                     },
                 ],
             },
@@ -25731,7 +24958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 14328, 14449),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14330, 14451),
         });
         declarations.push(Declaration {
             id: DeclarationId(737),
@@ -25740,19 +24967,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "CreateEffect".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1846),
-                    },
-                    Field {
-                        label: "AppendEffect".to_string(),
-                        ty: DeclarationId(1847),
-=======
                         ty: DeclarationId(1848),
                     },
                     Field {
                         label: "AppendEffect".to_string(),
                         ty: DeclarationId(1849),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -25764,7 +24983,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 14672, 14747),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14674, 14749),
         });
         declarations.push(Declaration {
             id: DeclarationId(738),
@@ -25773,19 +24992,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IsIdempotent".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1848),
-                    },
-                    Field {
-                        label: "IsBreaking".to_string(),
-                        ty: DeclarationId(1849),
-=======
                         ty: DeclarationId(1850),
                     },
                     Field {
                         label: "IsBreaking".to_string(),
                         ty: DeclarationId(1851),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -25797,7 +25008,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 15148, 15228),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15150, 15230),
         });
         declarations.push(Declaration {
             id: DeclarationId(739),
@@ -25806,19 +25017,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "PostAlways".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1850),
-                    },
-                    Field {
-                        label: "KeylessFallback".to_string(),
-                        ty: DeclarationId(1851),
-=======
                         ty: DeclarationId(1852),
                     },
                     Field {
                         label: "KeylessFallback".to_string(),
                         ty: DeclarationId(1853),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -25830,7 +25033,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 15720, 15794),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15722, 15796),
         });
         declarations.push(Declaration {
             id: DeclarationId(740),
@@ -25839,27 +25042,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "PathParam".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1852),
-=======
                         ty: DeclarationId(1854),
                     },
                     Field {
                         label: "InputField".to_string(),
                         ty: DeclarationId(1855),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "InputField".to_string(),
-                        ty: DeclarationId(1853),
                     },
                     Field {
                         label: "CompositeKey".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1855),
-=======
                         ty: DeclarationId(1857),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -25871,7 +25062,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 16480, 16601),
+            span: SourceSpan::new("src/v3/std/effects.dag", 16482, 16603),
         });
         declarations.push(Declaration {
             id: DeclarationId(741),
@@ -25880,13 +25071,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LatticeEffect".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1856),
-                    },
-                    Field {
-                        label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(1857),
-=======
                         ty: DeclarationId(1858),
                     },
                     Field {
@@ -25896,11 +25080,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "NonIdempotent".to_string(),
                         ty: DeclarationId(1860),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "NonIdempotent".to_string(),
-                        ty: DeclarationId(1858),
                     },
                 ],
             },
@@ -25912,7 +25091,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 17249, 17347),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17251, 17349),
         });
         declarations.push(Declaration {
             id: DeclarationId(742),
@@ -25920,7 +25099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(738)],
                 output: DeclarationId(128),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 17574, 17646)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 17576, 17648)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25930,7 +25109,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 17522, 17646),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17524, 17648),
         });
         declarations.push(Declaration {
             id: DeclarationId(743),
@@ -25938,7 +25117,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(738)],
                 output: DeclarationId(741),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 17859, 18379)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 17861, 18381)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25948,7 +25127,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 17785, 18379),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17787, 18381),
         });
         declarations.push(Declaration {
             id: DeclarationId(744),
@@ -25973,7 +25152,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 19063, 19133),
+            span: SourceSpan::new("src/v3/std/effects.dag", 19065, 19135),
         });
         declarations.push(Declaration {
             id: DeclarationId(745),
@@ -25982,13 +25161,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DerivedEffect".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1859),
-                    },
-                    Field {
-                        label: "UnknownHttpMethodInput".to_string(),
-                        ty: DeclarationId(1860),
-=======
                         ty: DeclarationId(1861),
                     },
                     Field {
@@ -25998,11 +25170,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "MalformedPathInput".to_string(),
                         ty: DeclarationId(1863),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "MalformedPathInput".to_string(),
-                        ty: DeclarationId(1861),
                     },
                 ],
             },
@@ -26014,7 +25181,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 19487, 19787),
+            span: SourceSpan::new("src/v3/std/effects.dag", 19489, 19789),
         });
         declarations.push(Declaration {
             id: DeclarationId(746),
@@ -26023,19 +25190,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IdempotentComposition".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1862),
-                    },
-                    Field {
-                        label: "BrokenBy".to_string(),
-                        ty: DeclarationId(1864),
-=======
                         ty: DeclarationId(1864),
                     },
                     Field {
                         label: "BrokenBy".to_string(),
                         ty: DeclarationId(1866),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -26047,7 +25206,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20508, 20617),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20510, 20619),
         });
         declarations.push(Declaration {
             id: DeclarationId(747),
@@ -26055,7 +25214,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744)],
                 output: DeclarationId(128),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20807, 20882)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20809, 20884)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26065,20 +25224,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20753, 20882),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20755, 20884),
         });
         declarations.push(Declaration {
             id: DeclarationId(748),
             name: Some("breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-<<<<<<< HEAD
-                output: DeclarationId(1822),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20942, 20964)),
-=======
                 output: DeclarationId(1824),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20944, 20966)),
->>>>>>> origin/main
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26088,21 +25242,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20884, 20964),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20886, 20966),
         });
         declarations.push(Declaration {
             id: DeclarationId(749),
             name: Some("indexed_breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1823)],
-                output: DeclarationId(1825),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21058, 21151)),
-=======
                 inputs: vec![DeclarationId(1825)],
                 output: DeclarationId(1827),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21060, 21153)),
->>>>>>> origin/main
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26112,21 +25260,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20966, 21151),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20968, 21153),
         });
         declarations.push(Declaration {
             id: DeclarationId(750),
             name: Some("first_breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1826)],
-                output: DeclarationId(1828),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21238, 21421)),
-=======
                 inputs: vec![DeclarationId(1828)],
                 output: DeclarationId(1830),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21240, 21423)),
->>>>>>> origin/main
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26136,19 +25278,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21153, 21421),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21155, 21423),
         });
         declarations.push(Declaration {
             id: DeclarationId(751),
             name: Some("compose_effects".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1829)],
-=======
                 inputs: vec![DeclarationId(1831)],
->>>>>>> origin/main
                 output: DeclarationId(746),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22311, 22434)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22313, 22436)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26158,7 +25296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 22238, 22434),
+            span: SourceSpan::new("src/v3/std/effects.dag", 22240, 22436),
         });
         declarations.push(Declaration {
             id: DeclarationId(752),
@@ -26177,7 +25315,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 23635, 23670),
+            span: SourceSpan::new("src/v3/std/effects.dag", 23637, 23672),
         });
         declarations.push(Declaration {
             id: DeclarationId(753),
@@ -26202,7 +25340,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 23755, 23821),
+            span: SourceSpan::new("src/v3/std/effects.dag", 23757, 23823),
         });
         declarations.push(Declaration {
             id: DeclarationId(754),
@@ -26211,27 +25349,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LinearEffect".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1866),
-                    },
-                    Field {
-                        label: "BranchEffect".to_string(),
-                        ty: DeclarationId(1868),
-                    },
-                    Field {
-                        label: "LoopEffect".to_string(),
-                        ty: DeclarationId(1869),
-                    },
-                    Field {
-                        label: "ParallelEffect".to_string(),
-                        ty: DeclarationId(1871),
-=======
                         ty: DeclarationId(1868),
                     },
                     Field {
                         label: "BranchEffect".to_string(),
                         ty: DeclarationId(1870),
->>>>>>> origin/main
                     },
                     Field {
                         label: "LoopEffect".to_string(),
@@ -26251,7 +25373,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 24497, 24725),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24499, 24727),
         });
         declarations.push(Declaration {
             id: DeclarationId(755),
@@ -26280,7 +25402,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 25084, 25188),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25086, 25190),
         });
         declarations.push(Declaration {
             id: DeclarationId(756),
@@ -26289,19 +25411,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "WorkflowCompositionVerdict".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1872),
-                    },
-                    Field {
-                        label: "IdempotencyUnsupported".to_string(),
-                        ty: DeclarationId(1873),
-=======
                         ty: DeclarationId(1874),
                     },
                     Field {
                         label: "IdempotencyUnsupported".to_string(),
                         ty: DeclarationId(1875),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -26313,7 +25427,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 25327, 25465),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25329, 25467),
         });
         declarations.push(Declaration {
             id: DeclarationId(757),
@@ -26321,7 +25435,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230), DeclarationId(230), DeclarationId(230)],
                 output: DeclarationId(756),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 25607, 25763)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 25609, 25765)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26331,7 +25445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 25467, 25763),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25469, 25765),
         });
         declarations.push(Declaration {
             id: DeclarationId(758),
@@ -26340,26 +25454,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoWorkflowProjection".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1874),
-                    },
-                    Field {
-                        label: "NotParallelEffectRoot".to_string(),
-                        ty: DeclarationId(1875),
-                    },
-                    Field {
-                        label: "NonLinearParallelBranch".to_string(),
-                        ty: DeclarationId(1876),
-                    },
-                    Field {
-                        label: "PairwiseNonCommute".to_string(),
-                        ty: DeclarationId(1877),
-                    },
-                    Field {
-                        label: "LensSurfacePending".to_string(),
-                        ty: DeclarationId(1878),
-                    },
-=======
                         ty: DeclarationId(1876),
                     },
                     Field {
@@ -26378,7 +25472,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         label: "LensSurfacePending".to_string(),
                         ty: DeclarationId(1880),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -26389,7 +25482,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 25926, 26082),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25928, 26084),
         });
         declarations.push(Declaration {
             id: DeclarationId(759),
@@ -26418,7 +25511,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 26084, 26200),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26086, 26202),
         });
         declarations.push(Declaration {
             id: DeclarationId(760),
@@ -26427,19 +25520,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ParallelCompositionVerdict".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1879),
-                    },
-                    Field {
-                        label: "ParallelismUnsupported".to_string(),
-                        ty: DeclarationId(1880),
-=======
                         ty: DeclarationId(1881),
                     },
                     Field {
                         label: "ParallelismUnsupported".to_string(),
                         ty: DeclarationId(1882),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -26451,7 +25536,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 26364, 26502),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26366, 26504),
         });
         declarations.push(Declaration {
             id: DeclarationId(761),
@@ -26459,7 +25544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(758), DeclarationId(230)],
                 output: DeclarationId(760),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 26623, 26778)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 26625, 26780)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26469,7 +25554,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 26504, 26778),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26506, 26780),
         });
         declarations.push(Declaration {
             id: DeclarationId(762),
@@ -26477,7 +25562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(754)],
                 output: DeclarationId(756),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 27016, 27846)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 27018, 27848)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26487,20 +25572,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 26930, 27846),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26932, 27848),
         });
         declarations.push(Declaration {
             id: DeclarationId(763),
             name: Some("parse_http_method".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230)],
-<<<<<<< HEAD
-                output: DeclarationId(1830),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 29705, 30003)),
-=======
                 output: DeclarationId(1832),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 29707, 30005)),
->>>>>>> origin/main
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26510,7 +25590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 29656, 30003),
+            span: SourceSpan::new("src/v3/std/effects.dag", 29658, 30005),
         });
         declarations.push(Declaration {
             id: DeclarationId(764),
@@ -26518,7 +25598,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(198)],
                 output: DeclarationId(738),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30058, 30134)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30060, 30136)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26528,19 +25608,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30005, 30134),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30007, 30136),
         });
         declarations.push(Declaration {
             id: DeclarationId(765),
             name: Some("upsert_or_create".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1831), DeclarationId(198)],
-=======
                 inputs: vec![DeclarationId(1833), DeclarationId(198)],
->>>>>>> origin/main
                 output: DeclarationId(738),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30474, 30626)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30476, 30628)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26550,19 +25626,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30398, 30626),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30400, 30628),
         });
         declarations.push(Declaration {
             id: DeclarationId(766),
             name: Some("delete_or_create".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1832), DeclarationId(198)],
-=======
                 inputs: vec![DeclarationId(1834), DeclarationId(198)],
->>>>>>> origin/main
                 output: DeclarationId(738),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30704, 30856)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30706, 30858)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26572,7 +25644,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30628, 30856),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30630, 30858),
         });
         declarations.push(Declaration {
             id: DeclarationId(767),
@@ -26580,7 +25652,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(198), DeclarationId(730)],
                 output: DeclarationId(738),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30942, 31427)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30944, 31429)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26590,7 +25662,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30858, 31427),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30860, 31429),
         });
         declarations.push(Declaration {
             id: DeclarationId(768),
@@ -26598,7 +25670,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230), DeclarationId(198), DeclarationId(730)],
                 output: DeclarationId(745),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 31545, 31729)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 31547, 31731)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26608,7 +25680,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 31429, 31729),
+            span: SourceSpan::new("src/v3/std/effects.dag", 31431, 31731),
         });
         declarations.push(Declaration {
             id: DeclarationId(769),
@@ -26617,13 +25689,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Agrees".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1881),
-                    },
-                    Field {
-                        label: "Disagrees".to_string(),
-                        ty: DeclarationId(1882),
-=======
                         ty: DeclarationId(1883),
                     },
                     Field {
@@ -26633,11 +25698,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "DerivationUnknown".to_string(),
                         ty: DeclarationId(1885),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "DerivationUnknown".to_string(),
-                        ty: DeclarationId(1883),
                     },
                 ],
             },
@@ -26649,7 +25709,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 32429, 32546),
+            span: SourceSpan::new("src/v3/std/effects.dag", 32431, 32548),
         });
         declarations.push(Declaration {
             id: DeclarationId(770),
@@ -26658,19 +25718,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ModifierNotDeclared".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1884),
-                    },
-                    Field {
-                        label: "ModifierDeclared".to_string(),
-                        ty: DeclarationId(1885),
-=======
                         ty: DeclarationId(1886),
                     },
                     Field {
                         label: "ModifierDeclared".to_string(),
                         ty: DeclarationId(1887),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -26682,7 +25734,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 32993, 33093),
+            span: SourceSpan::new("src/v3/std/effects.dag", 32995, 33095),
         });
         declarations.push(Declaration {
             id: DeclarationId(771),
@@ -26715,7 +25767,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 33095, 33245),
+            span: SourceSpan::new("src/v3/std/effects.dag", 33097, 33247),
         });
         declarations.push(Declaration {
             id: DeclarationId(772),
@@ -26723,7 +25775,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(737)],
                 output: DeclarationId(769),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 33884, 34426)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 33886, 34428)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26733,7 +25785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 33805, 34426),
+            span: SourceSpan::new("src/v3/std/effects.dag", 33807, 34428),
         });
         declarations.push(Declaration {
             id: DeclarationId(773),
@@ -26741,7 +25793,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(738)],
                 output: DeclarationId(769),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 34830, 35272)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 34832, 35274)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26751,7 +25803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 34758, 35272),
+            span: SourceSpan::new("src/v3/std/effects.dag", 34760, 35274),
         });
         declarations.push(Declaration {
             id: DeclarationId(774),
@@ -26759,7 +25811,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744), DeclarationId(128), DeclarationId(128)],
                 output: DeclarationId(771),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 35404, 36053)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 35406, 36055)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26769,7 +25821,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 35274, 36053),
+            span: SourceSpan::new("src/v3/std/effects.dag", 35276, 36055),
         });
         declarations.push(Declaration {
             id: DeclarationId(775),
@@ -26802,21 +25854,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 36405, 36533),
+            span: SourceSpan::new("src/v3/std/effects.dag", 36407, 36535),
         });
         declarations.push(Declaration {
             id: DeclarationId(776),
             name: Some("generate_idempotency_obligations".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1833)],
-                output: DeclarationId(1834),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 36638, 36908)),
-=======
                 inputs: vec![DeclarationId(1835)],
                 output: DeclarationId(1836),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 36640, 36910)),
->>>>>>> origin/main
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26826,7 +25872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 36535, 36908),
+            span: SourceSpan::new("src/v3/std/effects.dag", 36537, 36910),
         });
         declarations.push(Declaration {
             id: DeclarationId(777),
@@ -26855,7 +25901,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 37225, 37316),
+            span: SourceSpan::new("src/v3/std/effects.dag", 37227, 37318),
         });
         declarations.push(Declaration {
             id: DeclarationId(778),
@@ -26908,13 +25954,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Uninferred".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1894),
-                    },
-                    Field {
-                        label: "Resolved".to_string(),
-                        ty: DeclarationId(1895),
-=======
                         ty: DeclarationId(1896),
                     },
                     Field {
@@ -26924,11 +25963,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "Unresolved".to_string(),
                         ty: DeclarationId(1898),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "Unresolved".to_string(),
-                        ty: DeclarationId(1896),
                     },
                 ],
             },
@@ -26957,11 +25991,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "produced_by".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1897),
-=======
                         ty: DeclarationId(1899),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -26982,13 +26012,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LitInt".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1898),
-                    },
-                    Field {
-                        label: "LitBool".to_string(),
-                        ty: DeclarationId(1899),
-=======
                         ty: DeclarationId(1900),
                     },
                     Field {
@@ -26998,11 +26021,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "LitString".to_string(),
                         ty: DeclarationId(1902),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "LitString".to_string(),
-                        ty: DeclarationId(1900),
                     },
                 ],
             },
@@ -27023,26 +26041,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1901),
-                    },
-                    Field {
-                        label: "UnresolvedIdentifier".to_string(),
-                        ty: DeclarationId(1902),
-                    },
-                    Field {
-                        label: "ResolvedByStructure".to_string(),
-                        ty: DeclarationId(1903),
-                    },
-                    Field {
-                        label: "ResolvedByName".to_string(),
-                        ty: DeclarationId(1904),
-                    },
-                    Field {
-                        label: "TypeParam".to_string(),
-                        ty: DeclarationId(1905),
-                    },
-=======
                         ty: DeclarationId(1903),
                     },
                     Field {
@@ -27061,7 +26059,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         label: "TypeParam".to_string(),
                         ty: DeclarationId(1907),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -27081,13 +26078,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "OneUnit".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1906),
-                    },
-                    Field {
-                        label: "AdditionalUnit".to_string(),
-                        ty: DeclarationId(1907),
-=======
                         ty: DeclarationId(1908),
                     },
                     Field {
@@ -27097,11 +26087,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "UnitCount".to_string(),
                         ty: DeclarationId(1910),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "UnitCount".to_string(),
-                        ty: DeclarationId(1908),
                     },
                 ],
             },
@@ -27122,19 +26107,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ZeroWidth".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1909),
-                    },
-                    Field {
-                        label: "PositiveWidth".to_string(),
-                        ty: DeclarationId(1910),
-=======
                         ty: DeclarationId(1911),
                     },
                     Field {
                         label: "PositiveWidth".to_string(),
                         ty: DeclarationId(1912),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -27155,19 +26132,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "BoundedInterval".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1911),
-                    },
-                    Field {
-                        label: "Unbounded".to_string(),
-                        ty: DeclarationId(1912),
-=======
                         ty: DeclarationId(1913),
                     },
                     Field {
                         label: "Unbounded".to_string(),
                         ty: DeclarationId(1914),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -27222,19 +26191,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "StaticBound".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1914),
-                    },
-                    Field {
-                        label: "PlatformDependent".to_string(),
-                        ty: DeclarationId(1915),
-=======
                         ty: DeclarationId(1916),
                     },
                     Field {
                         label: "PlatformDependent".to_string(),
                         ty: DeclarationId(1917),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -27255,13 +26216,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Exact".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1916),
-                    },
-                    Field {
-                        label: "AtMostOne".to_string(),
-                        ty: DeclarationId(1917),
-=======
                         ty: DeclarationId(1918),
                     },
                     Field {
@@ -27271,11 +26225,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "Unbounded".to_string(),
                         ty: DeclarationId(1920),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "Unbounded".to_string(),
-                        ty: DeclarationId(1918),
                     },
                 ],
             },
@@ -27371,19 +26320,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1919),
-                    },
-                    Field {
-                        label: "Reference".to_string(),
-                        ty: DeclarationId(1920),
-                    },
-                    Field {
-                        label: "Record".to_string(),
-                        ty: DeclarationId(1922),
-=======
                         ty: DeclarationId(1921),
->>>>>>> origin/main
                     },
                     Field {
                         label: "Reference".to_string(),
@@ -27395,17 +26332,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "List".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1924),
-                    },
-                    Field {
-                        label: "Map".to_string(),
-                        ty: DeclarationId(1926),
-                    },
-                    Field {
-                        label: "Variant".to_string(),
-                        ty: DeclarationId(1928),
-=======
                         ty: DeclarationId(1926),
                     },
                     Field {
@@ -27415,7 +26341,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "Variant".to_string(),
                         ty: DeclarationId(1930),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -27436,27 +26361,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ValueBodyUnparsed".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1929),
-                    },
-                    Field {
-                        label: "ValueBodyStructural".to_string(),
-                        ty: DeclarationId(1931),
-                    },
-                    Field {
-                        label: "ValueBodyScalar".to_string(),
-                        ty: DeclarationId(1932),
-                    },
-                    Field {
-                        label: "ValueBodyList".to_string(),
-                        ty: DeclarationId(1934),
-=======
                         ty: DeclarationId(1931),
                     },
                     Field {
                         label: "ValueBodyStructural".to_string(),
                         ty: DeclarationId(1933),
->>>>>>> origin/main
                     },
                     Field {
                         label: "ValueBodyScalar".to_string(),
@@ -27468,11 +26377,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "ValueBodyMap".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1936),
-=======
                         ty: DeclarationId(1938),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -27512,26 +26417,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UserDefined".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1937),
-                    },
-                    Field {
-                        label: "ExternalRealization".to_string(),
-                        ty: DeclarationId(1938),
-                    },
-                    Field {
-                        label: "Pending".to_string(),
-                        ty: DeclarationId(1939),
-                    },
-                    Field {
-                        label: "NoBody".to_string(),
-                        ty: DeclarationId(1940),
-                    },
-                    Field {
-                        label: "Unparsed".to_string(),
-                        ty: DeclarationId(1941),
-                    },
-=======
                         ty: DeclarationId(1939),
                     },
                     Field {
@@ -27550,7 +26435,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         label: "Unparsed".to_string(),
                         ty: DeclarationId(1943),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -27570,29 +26454,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Atom".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1942),
-                    },
-                    Field {
-                        label: "Conj".to_string(),
-                        ty: DeclarationId(1944),
-                    },
-                    Field {
-                        label: "Disj".to_string(),
-                        ty: DeclarationId(1946),
-                    },
-                    Field {
-                        label: "Arrow".to_string(),
-                        ty: DeclarationId(1948),
-                    },
-                    Field {
-                        label: "Cardinality".to_string(),
-                        ty: DeclarationId(1949),
-                    },
-                    Field {
-                        label: "Instantiation".to_string(),
-                        ty: DeclarationId(1951),
-=======
                         ty: DeclarationId(1944),
                     },
                     Field {
@@ -27606,7 +26467,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "Arrow".to_string(),
                         ty: DeclarationId(1950),
->>>>>>> origin/main
                     },
                     Field {
                         label: "Cardinality".to_string(),
@@ -27639,11 +26499,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "name".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1952),
-=======
                         ty: DeclarationId(1954),
->>>>>>> origin/main
                     },
                     Field {
                         label: "connective".to_string(),
@@ -27651,31 +26507,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1953),
-                    },
-                    Field {
-                        label: "phantom_params".to_string(),
-                        ty: DeclarationId(1954),
-                    },
-                    Field {
-                        label: "meta_tag".to_string(),
-                        ty: DeclarationId(1955),
-                    },
-                    Field {
-                        label: "inhabits".to_string(),
-                        ty: DeclarationId(1956),
-                    },
-                    Field {
-                        label: "value_body".to_string(),
-                        ty: DeclarationId(1957),
-                    },
-                    Field {
-                        label: "nominal_opacity".to_string(),
-                        ty: DeclarationId(1958),
-                    },
-                    Field {
-=======
                         ty: DeclarationId(1955),
                     },
                     Field {
@@ -27699,7 +26530,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         ty: DeclarationId(1960),
                     },
                     Field {
->>>>>>> origin/main
                         label: "span".to_string(),
                         ty: DeclarationId(159),
                     },
@@ -27746,11 +26576,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "permitted_accessors".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1959),
-=======
                     ty: DeclarationId(1961),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -27770,17 +26596,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Add".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1960),
-                    },
-                    Field {
-                        label: "Sub".to_string(),
-                        ty: DeclarationId(1961),
-                    },
-                    Field {
-                        label: "Mul".to_string(),
-                        ty: DeclarationId(1962),
-=======
                         ty: DeclarationId(1962),
                     },
                     Field {
@@ -27794,11 +26609,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "Div".to_string(),
                         ty: DeclarationId(1965),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "Div".to_string(),
-                        ty: DeclarationId(1963),
                     },
                 ],
             },
@@ -27819,30 +26629,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1964),
-                    },
-                    Field {
-                        label: "Ne".to_string(),
-                        ty: DeclarationId(1965),
-                    },
-                    Field {
-                        label: "Lt".to_string(),
-                        ty: DeclarationId(1966),
-                    },
-                    Field {
-                        label: "Le".to_string(),
-                        ty: DeclarationId(1967),
-                    },
-                    Field {
-                        label: "Gt".to_string(),
-                        ty: DeclarationId(1968),
-                    },
-                    Field {
-                        label: "Ge".to_string(),
-                        ty: DeclarationId(1969),
-                    },
-=======
                         ty: DeclarationId(1966),
                     },
                     Field {
@@ -27865,7 +26651,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         label: "Ge".to_string(),
                         ty: DeclarationId(1971),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -27910,19 +26695,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "And".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1970),
-                    },
-                    Field {
-                        label: "Or".to_string(),
-                        ty: DeclarationId(1971),
-=======
                         ty: DeclarationId(1972),
                     },
                     Field {
                         label: "Or".to_string(),
                         ty: DeclarationId(1973),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -27943,13 +26720,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Arithmetic".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1972),
-                    },
-                    Field {
-                        label: "Comparison".to_string(),
-                        ty: DeclarationId(1973),
-=======
                         ty: DeclarationId(1974),
                     },
                     Field {
@@ -27959,11 +26729,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "Logical".to_string(),
                         ty: DeclarationId(1976),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "Logical".to_string(),
-                        ty: DeclarationId(1974),
                     },
                 ],
             },
@@ -27984,17 +26749,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Callable".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1975),
-                    },
-                    Field {
-                        label: "UnresolvedFieldProject".to_string(),
-                        ty: DeclarationId(1976),
-                    },
-                    Field {
-                        label: "ResolvedFieldProject".to_string(),
-                        ty: DeclarationId(1977),
-=======
                         ty: DeclarationId(1977),
                     },
                     Field {
@@ -28008,11 +26762,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "Operator".to_string(),
                         ty: DeclarationId(1980),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "Operator".to_string(),
-                        ty: DeclarationId(1978),
                     },
                 ],
             },
@@ -28033,19 +26782,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UnresolvedVariant".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1979),
-                    },
-                    Field {
-                        label: "ResolvedVariant".to_string(),
-                        ty: DeclarationId(1980),
-=======
                         ty: DeclarationId(1981),
                     },
                     Field {
                         label: "ResolvedVariant".to_string(),
                         ty: DeclarationId(1982),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -28103,11 +26844,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "binding".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1981),
-=======
                         ty: DeclarationId(1983),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -28243,19 +26980,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "members".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1982),
-                    },
-                    Field {
-                        label: "intra_cluster_calls".to_string(),
-                        ty: DeclarationId(1983),
-=======
                         ty: DeclarationId(1984),
                     },
                     Field {
                         label: "intra_cluster_calls".to_string(),
                         ty: DeclarationId(1985),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -28276,19 +27005,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Cardinality".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1984),
-                    },
-                    Field {
-                        label: "Descent".to_string(),
-                        ty: DeclarationId(1985),
-=======
                         ty: DeclarationId(1986),
                     },
                     Field {
                         label: "Descent".to_string(),
                         ty: DeclarationId(1987),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -28343,11 +27064,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "lane2_workflow".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1986),
-=======
                         ty: DeclarationId(1988),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -28376,11 +27093,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "inputs".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1987),
-=======
                         ty: DeclarationId(1989),
->>>>>>> origin/main
                     },
                     Field {
                         label: "result_port".to_string(),
@@ -28408,11 +27121,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "UserMatch".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1988),
-=======
                     ty: DeclarationId(1990),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -28440,11 +27149,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "paths".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1989),
-=======
                         ty: DeclarationId(1991),
->>>>>>> origin/main
                     },
                     Field {
                         label: "result_port".to_string(),
@@ -28456,11 +27161,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "emit_participation".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1990),
-=======
                         ty: DeclarationId(1992),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -28525,11 +27226,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "UserCallable".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1991),
-=======
                     ty: DeclarationId(1993),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -28561,11 +27258,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "params".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1992),
-=======
                         ty: DeclarationId(1994),
->>>>>>> origin/main
                     },
                     Field {
                         label: "span".to_string(),
@@ -28573,19 +27266,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "lane2_workflow".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1993),
-                    },
-                    Field {
-                        label: "emit_participation".to_string(),
-                        ty: DeclarationId(1994),
-=======
                         ty: DeclarationId(1995),
                     },
                     Field {
                         label: "emit_participation".to_string(),
                         ty: DeclarationId(1996),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -28606,26 +27291,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Value".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1995),
-                    },
-                    Field {
-                        label: "Transform".to_string(),
-                        ty: DeclarationId(1996),
-                    },
-                    Field {
-                        label: "Branch".to_string(),
-                        ty: DeclarationId(1997),
-                    },
-                    Field {
-                        label: "Loop".to_string(),
-                        ty: DeclarationId(1998),
-                    },
-                    Field {
-                        label: "Bind".to_string(),
-                        ty: DeclarationId(1999),
-                    },
-=======
                         ty: DeclarationId(1997),
                     },
                     Field {
@@ -28644,7 +27309,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         label: "Bind".to_string(),
                         ty: DeclarationId(2001),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -28664,17 +27328,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "declarations".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2000),
-                    },
-                    Field {
-                        label: "nodes".to_string(),
-                        ty: DeclarationId(2001),
-                    },
-                    Field {
-                        label: "ports".to_string(),
-                        ty: DeclarationId(2002),
-=======
                         ty: DeclarationId(2002),
                     },
                     Field {
@@ -28688,11 +27341,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "clusters".to_string(),
                         ty: DeclarationId(2005),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "clusters".to_string(),
-                        ty: DeclarationId(2003),
                     },
                 ],
             },
@@ -28759,11 +27407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("port".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(722)],
-<<<<<<< HEAD
-                output: DeclarationId(1886),
-=======
                 output: DeclarationId(1888),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22297,
@@ -28785,11 +27429,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("node".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-<<<<<<< HEAD
-                output: DeclarationId(1887),
-=======
                 output: DeclarationId(1889),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22355,
@@ -28811,11 +27451,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("resolve_producer".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(722)],
-<<<<<<< HEAD
-                output: DeclarationId(1888),
-=======
                 output: DeclarationId(1890),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22430,
@@ -28837,11 +27473,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("declaration_by_id".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(723)],
-<<<<<<< HEAD
-                output: DeclarationId(1889),
-=======
                 output: DeclarationId(1891),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22819,
@@ -28863,11 +27495,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("declaration_by_name".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(230)],
-<<<<<<< HEAD
-                output: DeclarationId(1890),
-=======
                 output: DeclarationId(1892),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     23694,
@@ -28889,11 +27517,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("lane2_workflow_at".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-<<<<<<< HEAD
-                output: DeclarationId(1891),
-=======
                 output: DeclarationId(1893),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     24020,
@@ -28917,27 +27541,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "SingleRoot".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2004),
-=======
                         ty: DeclarationId(2006),
                     },
                     Field {
                         label: "NoRoot".to_string(),
                         ty: DeclarationId(2007),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "NoRoot".to_string(),
-                        ty: DeclarationId(2005),
                     },
                     Field {
                         label: "AmbiguousRoot".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2007),
-=======
                         ty: DeclarationId(2009),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -28978,11 +27590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("miss_declaration_id_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-<<<<<<< HEAD
-                output: DeclarationId(1892),
-=======
                 output: DeclarationId(1894),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     28025,
@@ -29004,11 +27612,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("hit_declaration_id_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(723)],
-<<<<<<< HEAD
-                output: DeclarationId(1893),
-=======
                 output: DeclarationId(1895),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     28110,
@@ -29051,13 +27655,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ShrinkEffect".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2032),
-                    },
-                    Field {
-                        label: "ProjectionEffect".to_string(),
-                        ty: DeclarationId(2033),
-=======
                         ty: DeclarationId(2034),
                     },
                     Field {
@@ -29067,11 +27664,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "IdentityEffect".to_string(),
                         ty: DeclarationId(2036),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(2034),
                     },
                 ],
             },
@@ -29092,17 +27684,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ShapeConstant".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2035),
-                    },
-                    Field {
-                        label: "ShapeLinearScan".to_string(),
-                        ty: DeclarationId(2036),
-                    },
-                    Field {
-                        label: "ShapeIterateBody".to_string(),
-                        ty: DeclarationId(2037),
-=======
                         ty: DeclarationId(2037),
                     },
                     Field {
@@ -29116,11 +27697,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "ShapeSortBody".to_string(),
                         ty: DeclarationId(2040),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "ShapeSortBody".to_string(),
-                        ty: DeclarationId(2038),
                     },
                 ],
             },
@@ -29149,13 +27725,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "size_effect".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2039),
-                    },
-                    Field {
-                        label: "cost_shape".to_string(),
-                        ty: DeclarationId(2040),
-=======
                         ty: DeclarationId(2041),
                     },
                     Field {
@@ -29165,11 +27734,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "callback_element_position".to_string(),
                         ty: DeclarationId(2043),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "callback_element_position".to_string(),
-                        ty: DeclarationId(2041),
                     },
                 ],
             },
@@ -29194,11 +27758,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "display_name".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2042),
-=======
                         ty: DeclarationId(2044),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -29255,19 +27815,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DegreeTwo".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2043),
-                    },
-                    Field {
-                        label: "DegreeSuccessor".to_string(),
-                        ty: DeclarationId(2044),
-=======
                         ty: DeclarationId(2045),
                     },
                     Field {
                         label: "DegreeSuccessor".to_string(),
                         ty: DeclarationId(2046),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -29288,29 +27840,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ConstantCost".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2045),
-                    },
-                    Field {
-                        label: "LinearCost".to_string(),
-                        ty: DeclarationId(2046),
-                    },
-                    Field {
-                        label: "PolynomialCost".to_string(),
-                        ty: DeclarationId(2047),
-                    },
-                    Field {
-                        label: "ProductCost".to_string(),
-                        ty: DeclarationId(2049),
-                    },
-                    Field {
-                        label: "SumCost".to_string(),
-                        ty: DeclarationId(2051),
-                    },
-                    Field {
-                        label: "LogCost".to_string(),
-                        ty: DeclarationId(2052),
-=======
                         ty: DeclarationId(2047),
                     },
                     Field {
@@ -29336,11 +27865,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "UnknownCost".to_string(),
                         ty: DeclarationId(2055),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "UnknownCost".to_string(),
-                        ty: DeclarationId(2053),
                     },
                 ],
             },
@@ -29348,11 +27872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-<<<<<<< HEAD
-            inhabits: Some(DeclarationId(2054)),
-=======
             inhabits: Some(DeclarationId(2056)),
->>>>>>> origin/main
             value_body: None,
             refinement: None,
             nominal_opacity: None,
@@ -29406,11 +27926,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("miss_symbolic_cost_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-<<<<<<< HEAD
-                output: DeclarationId(2008),
-=======
                 output: DeclarationId(2010),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 10963, 10973)),
             },
             type_params: vec![],
@@ -29428,11 +27944,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("hit_symbolic_cost_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(849)],
-<<<<<<< HEAD
-                output: DeclarationId(2009),
-=======
                 output: DeclarationId(2011),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 11047, 11062)),
             },
             type_params: vec![],
@@ -29450,11 +27962,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("two_terms".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(849), DeclarationId(849)],
-<<<<<<< HEAD
-                output: DeclarationId(2010),
-=======
                 output: DeclarationId(2012),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(185))),
             },
             type_params: vec![],
@@ -29471,13 +27979,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(855),
             name: Some("many_terms".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(849), DeclarationId(849), DeclarationId(2011)],
-                output: DeclarationId(2012),
-=======
                 inputs: vec![DeclarationId(849), DeclarationId(849), DeclarationId(2013)],
                 output: DeclarationId(2014),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(187))),
             },
             type_params: vec![],
@@ -29602,11 +28105,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(862),
             name: Some("max_path".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(2013)],
-=======
                 inputs: vec![DeclarationId(2015)],
->>>>>>> origin/main
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(220))),
             },
@@ -29663,38 +28162,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ClassConstant".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2055),
-                    },
-                    Field {
-                        label: "ClassLog".to_string(),
-                        ty: DeclarationId(2056),
-                    },
-                    Field {
-                        label: "ClassLinear".to_string(),
-                        ty: DeclarationId(2057),
-                    },
-                    Field {
-                        label: "ClassLinearithmic".to_string(),
-                        ty: DeclarationId(2058),
-                    },
-                    Field {
-                        label: "ClassQuadratic".to_string(),
-                        ty: DeclarationId(2059),
-                    },
-                    Field {
-                        label: "ClassPolynomial".to_string(),
-                        ty: DeclarationId(2060),
-                    },
-                    Field {
-                        label: "ClassExponential".to_string(),
-                        ty: DeclarationId(2061),
-                    },
-                    Field {
-                        label: "ClassUnknown".to_string(),
-                        ty: DeclarationId(2062),
-                    },
-=======
                         ty: DeclarationId(2057),
                     },
                     Field {
@@ -29725,18 +28192,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         label: "ClassUnknown".to_string(),
                         ty: DeclarationId(2064),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-<<<<<<< HEAD
-            inhabits: Some(DeclarationId(2063)),
-=======
             inhabits: Some(DeclarationId(2065)),
->>>>>>> origin/main
             value_body: None,
             refinement: None,
             nominal_opacity: None,
@@ -29836,13 +28298,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(871),
             name: Some("nsl_to_list".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(2014)],
-                output: DeclarationId(2015),
-=======
                 inputs: vec![DeclarationId(2016)],
                 output: DeclarationId(2017),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(366))),
             },
             type_params: vec![],
@@ -29859,13 +28316,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(872),
             name: Some("drop_additive_zero".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(2016)],
-                output: DeclarationId(2017),
-=======
                 inputs: vec![DeclarationId(2018)],
                 output: DeclarationId(2019),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(379))),
             },
             type_params: vec![],
@@ -29882,13 +28334,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(873),
             name: Some("collapse_on_multiplicative_zero".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(2018)],
-                output: DeclarationId(2019),
-=======
                 inputs: vec![DeclarationId(2020)],
                 output: DeclarationId(2021),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(386))),
             },
             type_params: vec![],
@@ -29905,11 +28352,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(874),
             name: Some("any_zero".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(2020)],
-=======
                 inputs: vec![DeclarationId(2022)],
->>>>>>> origin/main
                 output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(395))),
             },
@@ -29927,13 +28370,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(875),
             name: Some("drop_multiplicative_one".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(2021)],
-                output: DeclarationId(2022),
-=======
                 inputs: vec![DeclarationId(2023)],
                 output: DeclarationId(2024),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(408))),
             },
             type_params: vec![],
@@ -29986,11 +28424,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(878),
             name: Some("reduce_sum".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(2023)],
-=======
                 inputs: vec![DeclarationId(2025)],
->>>>>>> origin/main
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(440))),
             },
@@ -30008,11 +28442,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(879),
             name: Some("wrap_sum".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(2024)],
-=======
                 inputs: vec![DeclarationId(2026)],
->>>>>>> origin/main
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(452))),
             },
@@ -30030,11 +28460,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(880),
             name: Some("reduce_product".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(2025)],
-=======
                 inputs: vec![DeclarationId(2027)],
->>>>>>> origin/main
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(469))),
             },
@@ -30183,13 +28609,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(888),
             name: Some("filter_not_dominated_by".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(2026), DeclarationId(849)],
-                output: DeclarationId(2027),
-=======
                 inputs: vec![DeclarationId(2028), DeclarationId(849)],
                 output: DeclarationId(2029),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(517))),
             },
             type_params: vec![],
@@ -30206,13 +28627,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(889),
             name: Some("drop_dominated_step".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(2028), DeclarationId(849)],
-                output: DeclarationId(2029),
-=======
                 inputs: vec![DeclarationId(2030), DeclarationId(849)],
                 output: DeclarationId(2031),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(524))),
             },
             type_params: vec![],
@@ -30229,13 +28645,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(890),
             name: Some("drop_dominated".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(2030)],
-                output: DeclarationId(2031),
-=======
                 inputs: vec![DeclarationId(2032)],
                 output: DeclarationId(2033),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(527))),
             },
             type_params: vec![],
@@ -30255,17 +28666,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 inputs: vec![
                     DeclarationId(147),
                     DeclarationId(230),
-<<<<<<< HEAD
-                    DeclarationId(2091),
-                    DeclarationId(93),
-                    DeclarationId(2092),
-                    DeclarationId(2093),
-=======
                     DeclarationId(2093),
                     DeclarationId(93),
                     DeclarationId(2094),
                     DeclarationId(2095),
->>>>>>> origin/main
                 ],
                 output: DeclarationId(912),
                 body: ArrowBody::Unparsed(SourceSpan::new(
@@ -30296,11 +28700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-<<<<<<< HEAD
-            meta_tag: Some(DeclarationId(2094)),
-=======
             meta_tag: Some(DeclarationId(2096)),
->>>>>>> origin/main
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![])),
@@ -30315,19 +28715,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UserMessage".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2096),
-                    },
-                    Field {
-                        label: "AssistantMessage".to_string(),
-                        ty: DeclarationId(2098),
-=======
                         ty: DeclarationId(2098),
                     },
                     Field {
                         label: "AssistantMessage".to_string(),
                         ty: DeclarationId(2100),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -30348,19 +28740,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Base64Image".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2099),
-                    },
-                    Field {
-                        label: "UrlImage".to_string(),
-                        ty: DeclarationId(2100),
-=======
                         ty: DeclarationId(2101),
                     },
                     Field {
                         label: "UrlImage".to_string(),
                         ty: DeclarationId(2102),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -30381,19 +28765,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "TextContent".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2101),
-                    },
-                    Field {
-                        label: "ImageContent".to_string(),
-                        ty: DeclarationId(2102),
-=======
                         ty: DeclarationId(2103),
                     },
                     Field {
                         label: "ImageContent".to_string(),
                         ty: DeclarationId(2104),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -30452,19 +28828,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ToolResultText".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2103),
-                    },
-                    Field {
-                        label: "ToolResultBlocks".to_string(),
-                        ty: DeclarationId(2105),
-=======
                         ty: DeclarationId(2105),
                     },
                     Field {
                         label: "ToolResultBlocks".to_string(),
                         ty: DeclarationId(2107),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -30484,11 +28852,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Text".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2106),
-=======
                     ty: DeclarationId(2108),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -30507,11 +28871,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "TextPlain".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2107),
-=======
                     ty: DeclarationId(2109),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -30556,13 +28916,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "AnthropicTextBlock".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2108),
-                    },
-                    Field {
-                        label: "AnthropicImageBlock".to_string(),
-                        ty: DeclarationId(2109),
-=======
                         ty: DeclarationId(2110),
                     },
                     Field {
@@ -30572,27 +28925,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "AnthropicDocumentBlock".to_string(),
                         ty: DeclarationId(2112),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "AnthropicDocumentBlock".to_string(),
-                        ty: DeclarationId(2110),
                     },
                     Field {
                         label: "AnthropicSearchResultBlock".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2114),
-                    },
-                    Field {
-                        label: "AnthropicToolReferenceBlock".to_string(),
-                        ty: DeclarationId(2115),
-=======
                         ty: DeclarationId(2116),
                     },
                     Field {
                         label: "AnthropicToolReferenceBlock".to_string(),
                         ty: DeclarationId(2117),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -30642,19 +28982,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UserTextBlock".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2116),
-                    },
-                    Field {
-                        label: "UserToolResultBlock".to_string(),
-                        ty: DeclarationId(2119),
-=======
                         ty: DeclarationId(2118),
                     },
                     Field {
                         label: "UserToolResultBlock".to_string(),
                         ty: DeclarationId(2121),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -30675,19 +29007,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "AssistantTextBlock".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2120),
-                    },
-                    Field {
-                        label: "AssistantToolUseBlock".to_string(),
-                        ty: DeclarationId(2121),
-=======
                         ty: DeclarationId(2122),
                     },
                     Field {
                         label: "AssistantToolUseBlock".to_string(),
                         ty: DeclarationId(2123),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -30708,34 +29032,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "EndTurn".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2122),
-                    },
-                    Field {
-                        label: "MaxTokens".to_string(),
-                        ty: DeclarationId(2123),
-                    },
-                    Field {
-                        label: "StopSequence".to_string(),
-                        ty: DeclarationId(2124),
-                    },
-                    Field {
-                        label: "ToolUse".to_string(),
-                        ty: DeclarationId(2125),
-                    },
-                    Field {
-                        label: "PauseTurn".to_string(),
-                        ty: DeclarationId(2126),
-                    },
-                    Field {
-                        label: "Refusal".to_string(),
-                        ty: DeclarationId(2127),
-                    },
-                    Field {
-                        label: "ModelContextWindowExceeded".to_string(),
-                        ty: DeclarationId(2128),
-                    },
-=======
                         ty: DeclarationId(2124),
                     },
                     Field {
@@ -30762,7 +29058,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         label: "ModelContextWindowExceeded".to_string(),
                         ty: DeclarationId(2130),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -30782,23 +29077,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "CharLocation".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2131),
-                    },
-                    Field {
-                        label: "PageLocation".to_string(),
-                        ty: DeclarationId(2134),
-                    },
-                    Field {
-                        label: "ContentBlockLocation".to_string(),
-                        ty: DeclarationId(2137),
-=======
                         ty: DeclarationId(2133),
                     },
                     Field {
                         label: "PageLocation".to_string(),
                         ty: DeclarationId(2136),
->>>>>>> origin/main
                     },
                     Field {
                         label: "ContentBlockLocation".to_string(),
@@ -30806,19 +29089,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "WebSearchResultLocation".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2139),
-                    },
-                    Field {
-                        label: "SearchResultLocation".to_string(),
-                        ty: DeclarationId(2141),
-=======
                         ty: DeclarationId(2141),
                     },
                     Field {
                         label: "SearchResultLocation".to_string(),
                         ty: DeclarationId(2143),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -30839,27 +29114,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "MessagesTextBlock".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2144),
-                    },
-                    Field {
-                        label: "MessagesThinkingBlock".to_string(),
-                        ty: DeclarationId(2145),
-                    },
-                    Field {
-                        label: "MessagesRedactedThinkingBlock".to_string(),
-                        ty: DeclarationId(2146),
-                    },
-                    Field {
-                        label: "MessagesToolUseBlock".to_string(),
-                        ty: DeclarationId(2148),
-=======
                         ty: DeclarationId(2146),
                     },
                     Field {
                         label: "MessagesThinkingBlock".to_string(),
                         ty: DeclarationId(2147),
->>>>>>> origin/main
                     },
                     Field {
                         label: "MessagesRedactedThinkingBlock".to_string(),
@@ -30871,19 +29130,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "MessagesServerToolUseBlock".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2150),
-                    },
-                    Field {
-                        label: "MessagesWebSearchToolResultBlock".to_string(),
-                        ty: DeclarationId(2152),
-=======
                         ty: DeclarationId(2152),
                     },
                     Field {
                         label: "MessagesWebSearchToolResultBlock".to_string(),
                         ty: DeclarationId(2154),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -30904,38 +29155,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "WebSearch".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2153),
-                    },
-                    Field {
-                        label: "WebFetch".to_string(),
-                        ty: DeclarationId(2154),
-                    },
-                    Field {
-                        label: "CodeExecution".to_string(),
-                        ty: DeclarationId(2155),
-                    },
-                    Field {
-                        label: "BashCodeExecution".to_string(),
-                        ty: DeclarationId(2156),
-                    },
-                    Field {
-                        label: "TextEditorCodeExecution".to_string(),
-                        ty: DeclarationId(2157),
-                    },
-                    Field {
-                        label: "ToolSearchToolRegex".to_string(),
-                        ty: DeclarationId(2158),
-                    },
-                    Field {
-                        label: "ToolSearchToolBm25".to_string(),
-                        ty: DeclarationId(2159),
-                    },
-                    Field {
-                        label: "Advisor".to_string(),
-                        ty: DeclarationId(2160),
-                    },
-=======
                         ty: DeclarationId(2155),
                     },
                     Field {
@@ -30966,7 +29185,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         label: "Advisor".to_string(),
                         ty: DeclarationId(2162),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -30994,13 +29212,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "cache_creation_input_tokens".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2161),
-                    },
-                    Field {
-                        label: "cache_read_input_tokens".to_string(),
-                        ty: DeclarationId(2162),
-=======
                         ty: DeclarationId(2163),
                     },
                     Field {
@@ -31010,11 +29221,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "service_tier".to_string(),
                         ty: DeclarationId(2165),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "service_tier".to_string(),
-                        ty: DeclarationId(2163),
                     },
                 ],
             },
@@ -31034,11 +29240,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Assistant".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2164),
-=======
                     ty: DeclarationId(2166),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -31070,11 +29272,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "content".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2165),
-=======
                         ty: DeclarationId(2167),
->>>>>>> origin/main
                     },
                     Field {
                         label: "model".to_string(),
@@ -31086,11 +29284,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "stop_sequence".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2166),
-=======
                         ty: DeclarationId(2168),
->>>>>>> origin/main
                     },
                     Field {
                         label: "usage".to_string(),
@@ -31098,11 +29292,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "container".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2167),
-=======
                         ty: DeclarationId(2169),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -31152,26 +29342,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "StdAuthority".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2168),
-                    },
-                    Field {
-                        label: "V3StdAuthority".to_string(),
-                        ty: DeclarationId(2169),
-                    },
-                    Field {
-                        label: "V3SpecAuthority".to_string(),
-                        ty: DeclarationId(2170),
-                    },
-                    Field {
-                        label: "CompilerAuthority".to_string(),
-                        ty: DeclarationId(2171),
-                    },
-                    Field {
-                        label: "ExtdepsFixtureAuthority".to_string(),
-                        ty: DeclarationId(2172),
-                    },
-=======
                         ty: DeclarationId(2170),
                     },
                     Field {
@@ -31190,7 +29360,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         label: "ExtdepsFixtureAuthority".to_string(),
                         ty: DeclarationId(2174),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -31246,759 +29415,483 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "dsl/std/logic.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2168),
-=======
                             constructor: DeclarationId(2170),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/bit.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2168),
-=======
                             constructor: DeclarationId(2170),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/error_primitives.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2168),
-=======
                             constructor: DeclarationId(2170),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/algebra.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2168),
-=======
                             constructor: DeclarationId(2170),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/magnitude.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2168),
-=======
                             constructor: DeclarationId(2170),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/machine_constraints.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2168),
-=======
                             constructor: DeclarationId(2170),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/nat.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2168),
-=======
                             constructor: DeclarationId(2170),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/integer.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2168),
-=======
                             constructor: DeclarationId(2170),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/rational.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2168),
-=======
                             constructor: DeclarationId(2170),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/float.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2168),
-=======
                             constructor: DeclarationId(2170),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/types.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2168),
-=======
                             constructor: DeclarationId(2170),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/string_type.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2168),
-=======
                             constructor: DeclarationId(2170),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/unicode.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2168),
-=======
                             constructor: DeclarationId(2170),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/render_repeat_string_bootstrap.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2168),
-=======
                             constructor: DeclarationId(2170),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/methods.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2168),
-=======
                             constructor: DeclarationId(2170),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/serialization.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2168),
-=======
                             constructor: DeclarationId(2170),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/algebra.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_messages.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_operations.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_schema.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/approximate_field.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bin_shim.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bootstrap_authority.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bridge_ledger.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/clean_emission.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/computation.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/computation_model.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/coproduct_projection.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/cross_target_coverage.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/diagnostics.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/dimensions.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/effects.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/emission_provenance.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/emit_model.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/extdeps_bootstrap_fixtures.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/go_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/induction.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/integer_diagnostic_order.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lens.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lens_application.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/list.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lookup.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/methods.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/parse_surface.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/python_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/resources.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/runtime.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/rust_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/services.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/substrate.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/substrate_minimal.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/termination.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/t_ci_workflow_as_data_demo.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/timing_lens.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/tokenize.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/verification.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/workflows.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2169),
-=======
                             constructor: DeclarationId(2171),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/v3_l1.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2170),
-=======
                             constructor: DeclarationId(2172),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/go.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2170),
-=======
                             constructor: DeclarationId(2172),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/python.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2170),
-=======
                             constructor: DeclarationId(2172),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/rust.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2170),
-=======
                             constructor: DeclarationId(2172),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/pipeline.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2171),
-=======
                             constructor: DeclarationId(2173),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/operators.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2171),
-=======
                             constructor: DeclarationId(2173),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/regen.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2171),
-=======
                             constructor: DeclarationId(2173),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/languages/rust/primitives.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2172),
-=======
                             constructor: DeclarationId(2174),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/cron_schedule_model.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2172),
-=======
                             constructor: DeclarationId(2174),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/github/github.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2172),
-=======
                             constructor: DeclarationId(2174),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/github/actions.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2172),
-=======
                             constructor: DeclarationId(2174),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/github/ci.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2172),
-=======
                             constructor: DeclarationId(2174),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -32016,19 +29909,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Retired".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2173),
-                    },
-                    Field {
-                        label: "Open".to_string(),
-                        ty: DeclarationId(2174),
-=======
                         ty: DeclarationId(2175),
                     },
                     Field {
                         label: "Open".to_string(),
                         ty: DeclarationId(2176),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -32094,11 +29979,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6389, 6499),
         });
-<<<<<<< HEAD
-        declarations.push(Declaration { id: DeclarationId(920), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(919) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2175)), 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(2174), 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(2173), 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(2173), 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(2173), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-pb-bridge-canonical-lens-name-dispatch-closure.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(2173), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/l1_5_fixed_point_test.rs".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(2173), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/bridge_lower_helpers_patch_zero_residual_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_semantic_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2174), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-v-bridge-row-4-exact-string-deeper-detail-receipt.md".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6963, 8416) });
-=======
         declarations.push(Declaration { id: DeclarationId(920), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(919) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2177)), 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(2176), 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(2175), 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(2175), 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(2175), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-pb-bridge-canonical-lens-name-dispatch-closure.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(2175), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/l1_5_fixed_point_test.rs".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(2175), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/bridge_lower_helpers_patch_zero_residual_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_semantic_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2176), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-v-bridge-row-4-exact-string-deeper-detail-receipt.md".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6963, 8416) });
->>>>>>> origin/main
         declarations.push(Declaration {
             id: DeclarationId(921),
             name: Some("CleanEmissionContract".to_string()),
@@ -32184,13 +30065,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "WrapEverything".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2176),
-                    },
-                    Field {
-                        label: "WrapOnlyInOperandPosition".to_string(),
-                        ty: DeclarationId(2177),
-=======
                         ty: DeclarationId(2178),
                     },
                     Field {
@@ -32200,11 +30074,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "NoWrapping".to_string(),
                         ty: DeclarationId(2180),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "NoWrapping".to_string(),
-                        ty: DeclarationId(2178),
                     },
                 ],
             },
@@ -32225,17 +30094,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "EmitBindingAlways".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2179),
-                    },
-                    Field {
-                        label: "EmitUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(2180),
-                    },
-                    Field {
-                        label: "EmitPrefixedUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(2181),
-=======
                         ty: DeclarationId(2181),
                     },
                     Field {
@@ -32249,11 +30107,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "NotApplicablePatternBinding".to_string(),
                         ty: DeclarationId(2184),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "NotApplicablePatternBinding".to_string(),
-                        ty: DeclarationId(2182),
                     },
                 ],
             },
@@ -32274,19 +30127,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "AccessFromPayloadBinding".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2183),
-                    },
-                    Field {
-                        label: "OverrideNamedFieldsAtBindingSite".to_string(),
-                        ty: DeclarationId(2184),
-=======
                         ty: DeclarationId(2185),
                     },
                     Field {
                         label: "OverrideNamedFieldsAtBindingSite".to_string(),
                         ty: DeclarationId(2186),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -32307,13 +30152,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ImportEverythingDeclared".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2185),
-                    },
-                    Field {
-                        label: "IncludeOnlyReferenced".to_string(),
-                        ty: DeclarationId(2186),
-=======
                         ty: DeclarationId(2187),
                     },
                     Field {
@@ -32323,11 +30161,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "ImportPerUsageSite".to_string(),
                         ty: DeclarationId(2189),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "ImportPerUsageSite".to_string(),
-                        ty: DeclarationId(2187),
                     },
                 ],
             },
@@ -32348,13 +30181,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "WrapReturnValue".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2188),
-                    },
-                    Field {
-                        label: "NoWrappingOnTerminalExpression".to_string(),
-                        ty: DeclarationId(2189),
-=======
                         ty: DeclarationId(2190),
                     },
                     Field {
@@ -32364,11 +30190,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "ExplicitReturnKeyword".to_string(),
                         ty: DeclarationId(2192),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "ExplicitReturnKeyword".to_string(),
-                        ty: DeclarationId(2190),
                     },
                 ],
             },
@@ -32389,13 +30210,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "EmitLetBindingAlways".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2191),
-                    },
-                    Field {
-                        label: "EmitLetUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(2192),
-=======
                         ty: DeclarationId(2193),
                     },
                     Field {
@@ -32405,11 +30219,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "OmitLetBinding".to_string(),
                         ty: DeclarationId(2195),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "OmitLetBinding".to_string(),
-                        ty: DeclarationId(2193),
                     },
                 ],
             },
@@ -32430,13 +30239,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "WrapBody".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2194),
-                    },
-                    Field {
-                        label: "NoWrappingOnNonComplexBody".to_string(),
-                        ty: DeclarationId(2195),
-=======
                         ty: DeclarationId(2196),
                     },
                     Field {
@@ -32446,11 +30248,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "NotApplicableMatchArmBody".to_string(),
                         ty: DeclarationId(2198),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "NotApplicableMatchArmBody".to_string(),
-                        ty: DeclarationId(2196),
                     },
                 ],
             },
@@ -32508,11 +30305,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2197),
-=======
                         ty: DeclarationId(2199),
->>>>>>> origin/main
                     },
                     Field {
                         label: "syntax_only".to_string(),
@@ -32545,17 +30338,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IgnoreVerifierOutput".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2198),
-                    },
-                    Field {
-                        label: "RequireEmptyStdout".to_string(),
-                        ty: DeclarationId(2199),
-                    },
-                    Field {
-                        label: "RequireEmptyStderr".to_string(),
-                        ty: DeclarationId(2200),
-=======
                         ty: DeclarationId(2200),
                     },
                     Field {
@@ -32569,11 +30351,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "RequireEmptyStdoutAndStderr".to_string(),
                         ty: DeclarationId(2203),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "RequireEmptyStdoutAndStderr".to_string(),
-                        ty: DeclarationId(2201),
                     },
                 ],
             },
@@ -32594,38 +30371,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "CollectionSize".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2208),
-                    },
-                    Field {
-                        label: "ParserStreamSize".to_string(),
-                        ty: DeclarationId(2209),
-                    },
-                    Field {
-                        label: "WorklistDrainSize".to_string(),
-                        ty: DeclarationId(2210),
-                    },
-                    Field {
-                        label: "TreeSize".to_string(),
-                        ty: DeclarationId(2211),
-                    },
-                    Field {
-                        label: "ArithmeticParam".to_string(),
-                        ty: DeclarationId(2212),
-                    },
-                    Field {
-                        label: "ExplicitCountZero".to_string(),
-                        ty: DeclarationId(2213),
-                    },
-                    Field {
-                        label: "ExplicitCountPositive".to_string(),
-                        ty: DeclarationId(2214),
-                    },
-                    Field {
-                        label: "Forever".to_string(),
-                        ty: DeclarationId(2215),
-                    },
-=======
                         ty: DeclarationId(2210),
                     },
                     Field {
@@ -32656,7 +30401,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         label: "Forever".to_string(),
                         ty: DeclarationId(2217),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -32698,38 +30442,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ChildAccessorCall".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2216),
-                    },
-                    Field {
-                        label: "CollectionShrinkCall".to_string(),
-                        ty: DeclarationId(2217),
-                    },
-                    Field {
-                        label: "ArithmeticSubtractCall".to_string(),
-                        ty: DeclarationId(2218),
-                    },
-                    Field {
-                        label: "ArithmeticDivideCall".to_string(),
-                        ty: DeclarationId(2219),
-                    },
-                    Field {
-                        label: "ParserAdvanceCall".to_string(),
-                        ty: DeclarationId(2220),
-                    },
-                    Field {
-                        label: "WorklistDrainCall".to_string(),
-                        ty: DeclarationId(2221),
-                    },
-                    Field {
-                        label: "FoldBodyCall".to_string(),
-                        ty: DeclarationId(2222),
-                    },
-                    Field {
-                        label: "SameArgumentCall".to_string(),
-                        ty: DeclarationId(2223),
-                    },
-=======
                         ty: DeclarationId(2218),
                     },
                     Field {
@@ -32760,7 +30472,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         label: "SameArgumentCall".to_string(),
                         ty: DeclarationId(2225),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -32778,11 +30489,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("per_call_pattern_at".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-<<<<<<< HEAD
-                output: DeclarationId(2202),
-=======
                 output: DeclarationId(2204),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     2764,
@@ -32804,11 +30511,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("per_call_descent_operand_port".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-<<<<<<< HEAD
-                output: DeclarationId(2203),
-=======
                 output: DeclarationId(2205),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     2969,
@@ -32832,13 +30535,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UnitShrink".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2224),
-                    },
-                    Field {
-                        label: "ConstantShrink".to_string(),
-                        ty: DeclarationId(2225),
-=======
                         ty: DeclarationId(2226),
                     },
                     Field {
@@ -32848,11 +30544,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "ProportionalShrink".to_string(),
                         ty: DeclarationId(2228),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "ProportionalShrink".to_string(),
-                        ty: DeclarationId(2226),
                     },
                 ],
             },
@@ -32873,13 +30564,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Fold".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2227),
-                    },
-                    Field {
-                        label: "Descend".to_string(),
-                        ty: DeclarationId(2228),
-=======
                         ty: DeclarationId(2229),
                     },
                     Field {
@@ -32889,11 +30573,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "Repeat".to_string(),
                         ty: DeclarationId(2231),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "Repeat".to_string(),
-                        ty: DeclarationId(2229),
                     },
                 ],
             },
@@ -32926,11 +30605,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "factor".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2230),
-=======
                         ty: DeclarationId(2232),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -32971,11 +30646,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("size_bound_param".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(933)],
-<<<<<<< HEAD
-                output: DeclarationId(2204),
-=======
                 output: DeclarationId(2206),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     5787,
@@ -33041,11 +30712,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("constant_bound_value".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(933)],
-<<<<<<< HEAD
-                output: DeclarationId(2205),
-=======
                 output: DeclarationId(2207),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     6715,
@@ -33069,13 +30736,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "TreeDescent".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2231),
-                    },
-                    Field {
-                        label: "CollectionFold".to_string(),
-                        ty: DeclarationId(2232),
-=======
                         ty: DeclarationId(2233),
                     },
                     Field {
@@ -33085,11 +30745,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "ArithmeticRepeat".to_string(),
                         ty: DeclarationId(2235),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "ArithmeticRepeat".to_string(),
-                        ty: DeclarationId(2233),
                     },
                 ],
             },
@@ -33108,11 +30763,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("algebra_profile_to_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(53)],
-<<<<<<< HEAD
-                output: DeclarationId(2206),
-=======
                 output: DeclarationId(2208),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     7781,
@@ -33134,11 +30785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("type_iteration_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230)],
-<<<<<<< HEAD
-                output: DeclarationId(2207),
-=======
                 output: DeclarationId(2209),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     8346,
@@ -33162,19 +30809,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Immutable".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2234),
-                    },
-                    Field {
-                        label: "Mutable".to_string(),
-                        ty: DeclarationId(2235),
-=======
                         ty: DeclarationId(2236),
                     },
                     Field {
                         label: "Mutable".to_string(),
                         ty: DeclarationId(2237),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -33195,19 +30834,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Pure".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2236),
-                    },
-                    Field {
-                        label: "Effectful".to_string(),
-                        ty: DeclarationId(2237),
-=======
                         ty: DeclarationId(2238),
                     },
                     Field {
                         label: "Effectful".to_string(),
                         ty: DeclarationId(2239),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -33228,19 +30859,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ExplicitDAG".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2238),
-                    },
-                    Field {
-                        label: "Arbitrary".to_string(),
-                        ty: DeclarationId(2239),
-=======
                         ty: DeclarationId(2240),
                     },
                     Field {
                         label: "Arbitrary".to_string(),
                         ty: DeclarationId(2241),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -33261,19 +30884,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Bounded".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2240),
-                    },
-                    Field {
-                        label: "Unbounded".to_string(),
-                        ty: DeclarationId(2241),
-=======
                         ty: DeclarationId(2242),
                     },
                     Field {
                         label: "Unbounded".to_string(),
                         ty: DeclarationId(2243),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -33337,44 +30952,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "mutability".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2234),
-=======
                             constructor: DeclarationId(2236),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "purity".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2236),
-=======
                             constructor: DeclarationId(2238),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "structure".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2238),
-=======
                             constructor: DeclarationId(2240),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "iteration".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2240),
-=======
                             constructor: DeclarationId(2242),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -33391,17 +30990,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ValueOnly".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2242),
-                    },
-                    Field {
-                        label: "GarbageCollected".to_string(),
-                        ty: DeclarationId(2243),
-                    },
-                    Field {
-                        label: "RefCounted".to_string(),
-                        ty: DeclarationId(2244),
-=======
                         ty: DeclarationId(2244),
                     },
                     Field {
@@ -33415,11 +31003,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "OwnershipBased".to_string(),
                         ty: DeclarationId(2247),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "OwnershipBased".to_string(),
-                        ty: DeclarationId(2245),
                     },
                 ],
             },
@@ -33440,19 +31023,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LexicalScoping".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2246),
-                    },
-                    Field {
-                        label: "DynamicScoping".to_string(),
-                        ty: DeclarationId(2247),
-=======
                         ty: DeclarationId(2248),
                     },
                     Field {
                         label: "DynamicScoping".to_string(),
                         ty: DeclarationId(2249),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -33497,11 +31072,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "excluded_prefixes".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2248),
-=======
                     ty: DeclarationId(2250),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -33525,11 +31096,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "additional_excluded_prefixes".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2249),
-=======
                         ty: DeclarationId(2251),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -33577,19 +31144,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "OwnershipBased".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2250),
-                    },
-                    Field {
-                        label: "GarbageCollected".to_string(),
-                        ty: DeclarationId(2251),
-=======
                         ty: DeclarationId(2252),
                     },
                     Field {
                         label: "GarbageCollected".to_string(),
                         ty: DeclarationId(2253),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -33626,11 +31185,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "StringTag".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2252),
-=======
                     ty: DeclarationId(2254),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -33650,19 +31205,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Empty".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2253),
-                    },
-                    Field {
-                        label: "Populated".to_string(),
-                        ty: DeclarationId(2254),
-=======
                         ty: DeclarationId(2255),
                     },
                     Field {
                         label: "Populated".to_string(),
                         ty: DeclarationId(2256),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -33716,11 +31263,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "variant_projections".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2255),
-=======
                         ty: DeclarationId(2257),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -33821,30 +31364,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Atom".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2256),
-                    },
-                    Field {
-                        label: "Conj".to_string(),
-                        ty: DeclarationId(2257),
-                    },
-                    Field {
-                        label: "Disj".to_string(),
-                        ty: DeclarationId(2258),
-                    },
-                    Field {
-                        label: "Arrow".to_string(),
-                        ty: DeclarationId(2259),
-                    },
-                    Field {
-                        label: "Cardinality".to_string(),
-                        ty: DeclarationId(2260),
-                    },
-                    Field {
-                        label: "Instantiation".to_string(),
-                        ty: DeclarationId(2261),
-                    },
-=======
                         ty: DeclarationId(2258),
                     },
                     Field {
@@ -33867,7 +31386,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         label: "Instantiation".to_string(),
                         ty: DeclarationId(2263),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -33887,26 +31405,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Value".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2262),
-                    },
-                    Field {
-                        label: "Transform".to_string(),
-                        ty: DeclarationId(2263),
-                    },
-                    Field {
-                        label: "Branch".to_string(),
-                        ty: DeclarationId(2264),
-                    },
-                    Field {
-                        label: "Loop".to_string(),
-                        ty: DeclarationId(2265),
-                    },
-                    Field {
-                        label: "Bind".to_string(),
-                        ty: DeclarationId(2266),
-                    },
-=======
                         ty: DeclarationId(2264),
                     },
                     Field {
@@ -33925,7 +31423,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         label: "Bind".to_string(),
                         ty: DeclarationId(2268),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -33999,11 +31496,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "cells".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2267),
-=======
                         ty: DeclarationId(2269),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -34029,11 +31522,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-<<<<<<< HEAD
-            meta_tag: Some(DeclarationId(2268)),
-=======
             meta_tag: Some(DeclarationId(2270)),
->>>>>>> origin/main
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -34060,22 +31549,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34105,22 +31586,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34150,22 +31623,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34195,22 +31660,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34240,22 +31697,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34285,22 +31734,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34330,22 +31771,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34375,22 +31808,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34420,22 +31845,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34465,22 +31882,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34510,22 +31919,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34555,22 +31956,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34600,22 +31993,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34645,22 +32030,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34690,22 +32067,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34735,22 +32104,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34780,22 +32141,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34825,22 +32178,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34870,22 +32215,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34915,22 +32252,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34960,22 +32289,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35005,22 +32326,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35050,22 +32363,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35095,22 +32400,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35140,22 +32437,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35185,22 +32474,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35230,22 +32511,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35275,22 +32548,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35320,22 +32585,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35365,22 +32622,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35410,22 +32659,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35455,22 +32696,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35500,22 +32733,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35545,22 +32770,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35590,22 +32807,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35635,22 +32844,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35680,22 +32881,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35725,22 +32918,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35770,22 +32955,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35815,22 +32992,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35860,22 +33029,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2260),
-=======
                                     constructor: DeclarationId(2262),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2263),
-=======
                                     constructor: DeclarationId(2265),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35894,46 +33055,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2269),
-                    },
-                    Field {
-                        label: "ParseError".to_string(),
-                        ty: DeclarationId(2270),
-                    },
-                    Field {
-                        label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(2271),
-                    },
-                    Field {
-                        label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(2272),
-                    },
-                    Field {
-                        label: "ResolveError".to_string(),
-                        ty: DeclarationId(2273),
-                    },
-                    Field {
-                        label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(2274),
-                    },
-                    Field {
-                        label: "BranchConditionNotBool".to_string(),
-                        ty: DeclarationId(2275),
-                    },
-                    Field {
-                        label: "MagnitudeOutOfRange".to_string(),
-                        ty: DeclarationId(2276),
-                    },
-                    Field {
-                        label: "MalformedIntegerRangeFact".to_string(),
-                        ty: DeclarationId(2277),
-                    },
-                    Field {
-                        label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(2278),
-                    },
-=======
                         ty: DeclarationId(2271),
                     },
                     Field {
@@ -35972,7 +33093,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         label: "NominalOpacityViolation".to_string(),
                         ty: DeclarationId(2280),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -36065,19 +33185,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "CompilerKind".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2279),
-                    },
-                    Field {
-                        label: "LensInstanceKind".to_string(),
-                        ty: DeclarationId(2280),
-=======
                         ty: DeclarationId(2281),
                     },
                     Field {
                         label: "LensInstanceKind".to_string(),
                         ty: DeclarationId(2282),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -36110,11 +33222,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "fixes".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2281),
-=======
                         ty: DeclarationId(2283),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -36135,34 +33243,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UnderRefined".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2282),
-                    },
-                    Field {
-                        label: "NoInhabitant".to_string(),
-                        ty: DeclarationId(2283),
-                    },
-                    Field {
-                        label: "ContradictoryUse".to_string(),
-                        ty: DeclarationId(2285),
-                    },
-                    Field {
-                        label: "OutOfR2Scope".to_string(),
-                        ty: DeclarationId(2286),
-                    },
-                    Field {
-                        label: "LifetimeProgramExtractionPending".to_string(),
-                        ty: DeclarationId(2287),
-                    },
-                    Field {
-                        label: "FoldNotImplemented".to_string(),
-                        ty: DeclarationId(2288),
-                    },
-                    Field {
-                        label: "MissingEmissionPath".to_string(),
-                        ty: DeclarationId(2289),
-                    },
-=======
                         ty: DeclarationId(2284),
                     },
                     Field {
@@ -36189,7 +33269,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         label: "MissingEmissionPath".to_string(),
                         ty: DeclarationId(2291),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -36209,19 +33288,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Inhabits".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2304),
-                    },
-                    Field {
-                        label: "Violates".to_string(),
-                        ty: DeclarationId(2305),
-=======
                         ty: DeclarationId(2306),
                     },
                     Field {
                         label: "Violates".to_string(),
                         ty: DeclarationId(2307),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -36256,19 +33327,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoDiagnostic".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2306),
-                    },
-                    Field {
-                        label: "SomeDiagnostic".to_string(),
-                        ty: DeclarationId(2307),
-=======
                         ty: DeclarationId(2308),
                     },
                     Field {
                         label: "SomeDiagnostic".to_string(),
                         ty: DeclarationId(2309),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -36289,19 +33352,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DimensionOk".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2310),
-                    },
-                    Field {
-                        label: "DimensionFail".to_string(),
-                        ty: DeclarationId(2314),
-=======
                         ty: DeclarationId(2312),
                     },
                     Field {
                         label: "DimensionFail".to_string(),
                         ty: DeclarationId(2316),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -36340,13 +33395,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "witness_of".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2316),
-                    },
-                    Field {
-                        label: "compose".to_string(),
-                        ty: DeclarationId(2317),
-=======
                         ty: DeclarationId(2318),
                     },
                     Field {
@@ -36356,11 +33404,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "break_diagnostic".to_string(),
                         ty: DeclarationId(2320),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "break_diagnostic".to_string(),
-                        ty: DeclarationId(2318),
                     },
                 ],
             },
@@ -36400,11 +33443,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             type_params: vec![DeclarationId(992), DeclarationId(993)],
             phantom_params: vec![PhantomParameter {
                 parameter: DeclarationId(992),
-<<<<<<< HEAD
-                algebra: DeclarationId(2319),
-=======
                 algebra: DeclarationId(2321),
->>>>>>> origin/main
             }],
             meta_tag: None,
             specialization_parent: None,
@@ -36545,19 +33584,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("add_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-<<<<<<< HEAD
-                    DeclarationId(2290),
-                    DeclarationId(2291),
-                    DeclarationId(2292),
-                ],
-                output: DeclarationId(2293),
-=======
                     DeclarationId(2292),
                     DeclarationId(2293),
                     DeclarationId(2294),
                 ],
                 output: DeclarationId(2295),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4966, 4988)),
             },
             type_params: vec![DeclarationId(1002), DeclarationId(1003)],
@@ -36603,19 +33634,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("sub_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-<<<<<<< HEAD
-                    DeclarationId(2294),
-                    DeclarationId(2295),
-                    DeclarationId(2296),
-                ],
-                output: DeclarationId(2297),
-=======
                     DeclarationId(2296),
                     DeclarationId(2297),
                     DeclarationId(2298),
                 ],
                 output: DeclarationId(2299),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5162, 5184)),
             },
             type_params: vec![DeclarationId(1005), DeclarationId(1006)],
@@ -36661,19 +33684,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("mul_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-<<<<<<< HEAD
-                    DeclarationId(2298),
-                    DeclarationId(2299),
-                    DeclarationId(1009),
-                ],
-                output: DeclarationId(2300),
-=======
                     DeclarationId(2300),
                     DeclarationId(2301),
                     DeclarationId(1009),
                 ],
                 output: DeclarationId(2302),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5350, 5379)),
             },
             type_params: vec![DeclarationId(1008), DeclarationId(1009)],
@@ -36719,19 +33734,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("div_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-<<<<<<< HEAD
-                    DeclarationId(2301),
-                    DeclarationId(2302),
-                    DeclarationId(1012),
-                ],
-                output: DeclarationId(2303),
-=======
                     DeclarationId(2303),
                     DeclarationId(2304),
                     DeclarationId(1012),
                 ],
                 output: DeclarationId(2305),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5545, 5574)),
             },
             type_params: vec![DeclarationId(1011), DeclarationId(1012)],
@@ -36796,19 +33803,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoSourceSpan".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2320),
-                    },
-                    Field {
-                        label: "SomeSourceSpan".to_string(),
-                        ty: DeclarationId(2321),
-=======
                         ty: DeclarationId(2322),
                     },
                     Field {
                         label: "SomeSourceSpan".to_string(),
                         ty: DeclarationId(2323),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -36874,11 +33873,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "fields".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2322),
-=======
                         ty: DeclarationId(2324),
->>>>>>> origin/main
                     },
                     Field {
                         label: "cost".to_string(),
@@ -36940,13 +33935,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "BoundUnspecified".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2323),
-                    },
-                    Field {
-                        label: "StaticBoundFact".to_string(),
-                        ty: DeclarationId(2324),
-=======
                         ty: DeclarationId(2325),
                     },
                     Field {
@@ -36956,11 +33944,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "PlatformDependentFact".to_string(),
                         ty: DeclarationId(2327),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "PlatformDependentFact".to_string(),
-                        ty: DeclarationId(2325),
                     },
                 ],
             },
@@ -37010,19 +33993,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DirectField".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2326),
-                    },
-                    Field {
-                        label: "AccessorMethod".to_string(),
-                        ty: DeclarationId(2327),
-=======
                         ty: DeclarationId(2328),
                     },
                     Field {
                         label: "AccessorMethod".to_string(),
                         ty: DeclarationId(2329),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -37125,11 +34100,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "parameters".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2328),
-=======
                         ty: DeclarationId(2330),
->>>>>>> origin/main
                     },
                     Field {
                         label: "cost".to_string(),
@@ -37179,19 +34150,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Borrowed".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2329),
-                    },
-                    Field {
-                        label: "Consumed".to_string(),
-                        ty: DeclarationId(2330),
-=======
                         ty: DeclarationId(2331),
                     },
                     Field {
                         label: "Consumed".to_string(),
                         ty: DeclarationId(2332),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -37212,19 +34175,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Owned".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2331),
-                    },
-                    Field {
-                        label: "Borrowed".to_string(),
-                        ty: DeclarationId(2332),
-=======
                         ty: DeclarationId(2333),
                     },
                     Field {
                         label: "Borrowed".to_string(),
                         ty: DeclarationId(2334),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -37245,19 +34200,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "SelfContained".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2333),
-                    },
-                    Field {
-                        label: "Caller".to_string(),
-                        ty: DeclarationId(2334),
-=======
                         ty: DeclarationId(2335),
                     },
                     Field {
                         label: "Caller".to_string(),
                         ty: DeclarationId(2336),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -37278,13 +34225,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Growable".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2335),
-                    },
-                    Field {
-                        label: "Fixed".to_string(),
-                        ty: DeclarationId(2336),
-=======
                         ty: DeclarationId(2337),
                     },
                     Field {
@@ -37294,11 +34234,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "NotApplicable".to_string(),
                         ty: DeclarationId(2339),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "NotApplicable".to_string(),
-                        ty: DeclarationId(2337),
                     },
                 ],
             },
@@ -37318,11 +34253,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Utf8FreeMonoidChar".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2338),
-=======
                     ty: DeclarationId(2340),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -37420,46 +34351,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ListEmpty".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2339),
-                    },
-                    Field {
-                        label: "ListSingleton".to_string(),
-                        ty: DeclarationId(2340),
-                    },
-                    Field {
-                        label: "ListCons".to_string(),
-                        ty: DeclarationId(2341),
-                    },
-                    Field {
-                        label: "ListConcat".to_string(),
-                        ty: DeclarationId(2342),
-                    },
-                    Field {
-                        label: "ListLength".to_string(),
-                        ty: DeclarationId(2343),
-                    },
-                    Field {
-                        label: "ListIsEmpty".to_string(),
-                        ty: DeclarationId(2344),
-                    },
-                    Field {
-                        label: "ListFold".to_string(),
-                        ty: DeclarationId(2345),
-                    },
-                    Field {
-                        label: "ListMap".to_string(),
-                        ty: DeclarationId(2346),
-                    },
-                    Field {
-                        label: "ListFilter".to_string(),
-                        ty: DeclarationId(2347),
-                    },
-                    Field {
-                        label: "ListContains".to_string(),
-                        ty: DeclarationId(2348),
-                    },
-=======
                         ty: DeclarationId(2341),
                     },
                     Field {
@@ -37498,7 +34389,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         label: "ListContains".to_string(),
                         ty: DeclarationId(2350),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -37579,19 +34469,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "PlaceholderPatternStrategy".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2349),
-                    },
-                    Field {
-                        label: "VectorList".to_string(),
-                        ty: DeclarationId(2350),
-=======
                         ty: DeclarationId(2351),
                     },
                     Field {
                         label: "VectorList".to_string(),
                         ty: DeclarationId(2352),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -38070,19 +34952,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Borrow".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2351),
-                    },
-                    Field {
-                        label: "PassByValue".to_string(),
-                        ty: DeclarationId(2352),
-=======
                         ty: DeclarationId(2353),
                     },
                     Field {
                         label: "PassByValue".to_string(),
                         ty: DeclarationId(2354),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -38103,19 +34977,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "CopyOrClone".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2353),
-                    },
-                    Field {
-                        label: "PassByValue".to_string(),
-                        ty: DeclarationId(2354),
-=======
                         ty: DeclarationId(2355),
                     },
                     Field {
                         label: "PassByValue".to_string(),
                         ty: DeclarationId(2356),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -38201,19 +35067,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IndexedArgs".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2355),
-                    },
-                    Field {
-                        label: "NamedArg".to_string(),
-                        ty: DeclarationId(2356),
-=======
                         ty: DeclarationId(2357),
                     },
                     Field {
                         label: "NamedArg".to_string(),
                         ty: DeclarationId(2358),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -38234,19 +35092,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "SingleTemplate".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2357),
-                    },
-                    Field {
-                        label: "HigherOrderTemplates".to_string(),
-                        ty: DeclarationId(2358),
-=======
                         ty: DeclarationId(2359),
                     },
                     Field {
                         label: "HigherOrderTemplates".to_string(),
                         ty: DeclarationId(2360),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -38513,11 +35363,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({left}, {right}...)".to_string(),
                             ))],
@@ -38530,11 +35376,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -38572,11 +35414,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "int64(len({recv}))".to_string(),
                             ))],
@@ -38589,11 +35427,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -38631,11 +35465,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv}) == 0".to_string(),
                             ))],
@@ -38648,11 +35478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -38692,11 +35518,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "/* fold({recv}, {init}, {body}) */".to_string(),
                             ))],
@@ -38709,11 +35531,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -38753,11 +35571,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "/* map({recv}, {body}) */".to_string(),
                             ))],
@@ -38770,11 +35584,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -38814,11 +35624,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Filter({recv}, {arg})".to_string(),
                             ))],
@@ -38831,11 +35637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -38875,11 +35677,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Any({recv}, {arg})".to_string(),
                             ))],
@@ -38892,11 +35690,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -38936,11 +35730,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.All({recv}, {arg})".to_string(),
                             ))],
@@ -38953,11 +35743,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -38997,11 +35783,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.FlatMap({recv}, {arg})".to_string(),
                             ))],
@@ -39014,11 +35796,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -39040,11 +35818,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-<<<<<<< HEAD
-            meta_tag: Some(DeclarationId(2359)),
-=======
             meta_tag: Some(DeclarationId(2361)),
->>>>>>> origin/main
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -39063,11 +35837,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -39080,11 +35850,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -39106,11 +35872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Join({recv}, {arg})".to_string(),
                             ))],
@@ -39123,11 +35885,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -39149,11 +35907,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Split({recv}, {arg})".to_string(),
                             ))],
@@ -39166,11 +35920,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -39194,11 +35944,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -39211,11 +35957,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -39235,11 +35977,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -39252,11 +35990,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -39278,11 +36012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.SortBy({recv}, {arg})".to_string(),
                             ))],
@@ -39295,11 +36025,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -39321,11 +36047,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({recv}, {arg})".to_string(),
                             ))],
@@ -39338,11 +36060,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -39364,11 +36082,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Contains({recv}, {arg})".to_string(),
                             ))],
@@ -39381,11 +36095,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -39402,26 +36112,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DirectRecursion".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2373),
-                    },
-                    Field {
-                        label: "ListRecursion".to_string(),
-                        ty: DeclarationId(2374),
-                    },
-                    Field {
-                        label: "OptionalRecursion".to_string(),
-                        ty: DeclarationId(2375),
-                    },
-                    Field {
-                        label: "SetRecursion".to_string(),
-                        ty: DeclarationId(2376),
-                    },
-                    Field {
-                        label: "MapValueRecursion".to_string(),
-                        ty: DeclarationId(2377),
-                    },
-=======
                         ty: DeclarationId(2375),
                     },
                     Field {
@@ -39440,7 +36130,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         label: "MapValueRecursion".to_string(),
                         ty: DeclarationId(2379),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -39551,26 +36240,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "StrictSubValue".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2378),
-                    },
-                    Field {
-                        label: "IteratedSubValue".to_string(),
-                        ty: DeclarationId(2379),
-                    },
-                    Field {
-                        label: "ArithmeticDescent".to_string(),
-                        ty: DeclarationId(2380),
-                    },
-                    Field {
-                        label: "PreservedValue".to_string(),
-                        ty: DeclarationId(2381),
-                    },
-                    Field {
-                        label: "SubValueUnknown".to_string(),
-                        ty: DeclarationId(2382),
-                    },
-=======
                         ty: DeclarationId(2380),
                     },
                     Field {
@@ -39589,7 +36258,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         label: "SubValueUnknown".to_string(),
                         ty: DeclarationId(2384),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -39739,11 +36407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("sub_value_to_call_pattern".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1073)],
-<<<<<<< HEAD
-                output: DeclarationId(2360),
-=======
                 output: DeclarationId(2362),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     20571,
@@ -39765,11 +36429,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("sub_value_to_lowering_target".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1073)],
-<<<<<<< HEAD
-                output: DeclarationId(2361),
-=======
                 output: DeclarationId(2363),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     21959,
@@ -39793,17 +36453,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IntegerExpZero".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2383),
-                    },
-                    Field {
-                        label: "IntegerExpPos".to_string(),
-                        ty: DeclarationId(2384),
-                    },
-                    Field {
-                        label: "FractionExp".to_string(),
-                        ty: DeclarationId(2385),
-=======
                         ty: DeclarationId(2385),
                     },
                     Field {
@@ -39817,11 +36466,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "LogBasedExp".to_string(),
                         ty: DeclarationId(2388),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "LogBasedExp".to_string(),
-                        ty: DeclarationId(2386),
                     },
                 ],
             },
@@ -39864,19 +36508,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "PolyCost".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2387),
-                    },
-                    Field {
-                        label: "LogCost".to_string(),
-                        ty: DeclarationId(2388),
-=======
                         ty: DeclarationId(2389),
                     },
                     Field {
                         label: "LogCost".to_string(),
                         ty: DeclarationId(2390),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -39897,29 +36533,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ConstantBound".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2389),
-                    },
-                    Field {
-                        label: "AtomicBound".to_string(),
-                        ty: DeclarationId(2390),
-                    },
-                    Field {
-                        label: "ProductBound".to_string(),
-                        ty: DeclarationId(2392),
-                    },
-                    Field {
-                        label: "SumOfProductsBound".to_string(),
-                        ty: DeclarationId(2395),
-                    },
-                    Field {
-                        label: "SumBound".to_string(),
-                        ty: DeclarationId(2397),
-                    },
-                    Field {
-                        label: "ForeverBound".to_string(),
-                        ty: DeclarationId(2398),
-=======
                         ty: DeclarationId(2391),
                     },
                     Field {
@@ -39945,11 +36558,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "ErrorBound".to_string(),
                         ty: DeclarationId(2401),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "ErrorBound".to_string(),
-                        ty: DeclarationId(2399),
                     },
                 ],
             },
@@ -39967,11 +36575,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1086),
             name: Some("sum_bound".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(2362)],
-=======
                 inputs: vec![DeclarationId(2364)],
->>>>>>> origin/main
                 output: DeclarationId(1085),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -40051,11 +36655,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1090),
             name: Some("product_atoms_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(2363)],
-=======
                 inputs: vec![DeclarationId(2365)],
->>>>>>> origin/main
                 output: DeclarationId(849),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -40077,11 +36677,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1091),
             name: Some("product_term_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(2364)],
-=======
                 inputs: vec![DeclarationId(2366)],
->>>>>>> origin/main
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(555))),
             },
@@ -40099,11 +36695,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1092),
             name: Some("sum_products_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(2366)],
-=======
                 inputs: vec![DeclarationId(2368)],
->>>>>>> origin/main
                 output: DeclarationId(849),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -40357,11 +36949,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("int_add_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-<<<<<<< HEAD
-                output: DeclarationId(2367),
-=======
                 output: DeclarationId(2369),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33617,
@@ -40383,11 +36971,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("int_mul_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-<<<<<<< HEAD
-                output: DeclarationId(2368),
-=======
                 output: DeclarationId(2370),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33913,
@@ -40409,11 +36993,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("bounded_int_pow_exponent".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-<<<<<<< HEAD
-                output: DeclarationId(2369),
-=======
                 output: DeclarationId(2371),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35162,
@@ -40435,11 +37015,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("int_pow_bounded".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-<<<<<<< HEAD
-                output: DeclarationId(2370),
-=======
                 output: DeclarationId(2372),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35637,
@@ -40461,11 +37037,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("ceil_log".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-<<<<<<< HEAD
-                output: DeclarationId(2371),
-=======
                 output: DeclarationId(2373),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     36900,
@@ -40492,11 +37064,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     DeclarationId(93),
                     DeclarationId(93),
                 ],
-<<<<<<< HEAD
-                output: DeclarationId(2372),
-=======
                 output: DeclarationId(2374),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     37172,
@@ -40904,11 +37472,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-<<<<<<< HEAD
-            meta_tag: Some(DeclarationId(2400)),
-=======
             meta_tag: Some(DeclarationId(2402)),
->>>>>>> origin/main
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -40934,11 +37498,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-<<<<<<< HEAD
-            meta_tag: Some(DeclarationId(2401)),
-=======
             meta_tag: Some(DeclarationId(2403)),
->>>>>>> origin/main
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -40963,26 +37523,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "read".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2403),
-                    },
-                    Field {
-                        label: "sequential".to_string(),
-                        ty: DeclarationId(2404),
-                    },
-                    Field {
-                        label: "branch".to_string(),
-                        ty: DeclarationId(2405),
-                    },
-                    Field {
-                        label: "iterate".to_string(),
-                        ty: DeclarationId(2406),
-                    },
-                    Field {
-                        label: "validate".to_string(),
-                        ty: DeclarationId(2407),
-                    },
-=======
                         ty: DeclarationId(2405),
                     },
                     Field {
@@ -41001,7 +37541,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         label: "validate".to_string(),
                         ty: DeclarationId(2409),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![DeclarationId(1129)],
@@ -41035,19 +37574,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DeclarationScope".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2408),
-                    },
-                    Field {
-                        label: "NodeScope".to_string(),
-                        ty: DeclarationId(2409),
-=======
                         ty: DeclarationId(2410),
                     },
                     Field {
                         label: "NodeScope".to_string(),
                         ty: DeclarationId(2411),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -41067,11 +37598,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Error".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2410),
-=======
                     ty: DeclarationId(2412),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -41091,19 +37618,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "project".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2411),
-                    },
-                    Field {
-                        label: "violates".to_string(),
-                        ty: DeclarationId(2412),
-=======
                         ty: DeclarationId(2413),
                     },
                     Field {
                         label: "violates".to_string(),
                         ty: DeclarationId(2414),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -41152,19 +37671,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "lens".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2413),
-                    },
-                    Field {
-                        label: "enforcement".to_string(),
-                        ty: DeclarationId(2414),
-=======
                         ty: DeclarationId(2415),
                     },
                     Field {
                         label: "enforcement".to_string(),
                         ty: DeclarationId(2416),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -41213,11 +37724,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "enforceable_lens".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2415),
-=======
                         ty: DeclarationId(2417),
->>>>>>> origin/main
                     },
                     Field {
                         label: "section".to_string(),
@@ -41282,11 +37789,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "lens".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2416),
-=======
                         ty: DeclarationId(2418),
->>>>>>> origin/main
                     },
                     Field {
                         label: "section".to_string(),
@@ -41329,19 +37832,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Miss".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2419),
-                    },
-                    Field {
-                        label: "Hit".to_string(),
-                        ty: DeclarationId(2420),
-=======
                         ty: DeclarationId(2421),
                     },
                     Field {
                         label: "Hit".to_string(),
                         ty: DeclarationId(2422),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -41374,11 +37869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("miss_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-<<<<<<< HEAD
-                output: DeclarationId(2417),
-=======
                 output: DeclarationId(2419),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4601, 4611)),
             },
             type_params: vec![],
@@ -41396,11 +37887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("hit_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-<<<<<<< HEAD
-                output: DeclarationId(2418),
-=======
                 output: DeclarationId(2420),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4654, 4666)),
             },
             type_params: vec![],
@@ -41438,11 +37925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "items".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2421),
-=======
                     ty: DeclarationId(2423),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -41470,11 +37953,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "refinement".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2422),
-=======
                         ty: DeclarationId(2424),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -41549,19 +38028,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Positional".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2424),
-                    },
-                    Field {
-                        label: "Record".to_string(),
-                        ty: DeclarationId(2426),
-=======
                         ty: DeclarationId(2426),
                     },
                     Field {
                         label: "Record".to_string(),
                         ty: DeclarationId(2428),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -41581,29 +38052,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
-<<<<<<< HEAD
-                        label: "Named".to_string(),
-                        ty: DeclarationId(2427),
-                    },
-                    Field {
-                        label: "Parameterized".to_string(),
-                        ty: DeclarationId(2429),
-                    },
-                    Field {
-                        label: "Optional".to_string(),
-                        ty: DeclarationId(2430),
-                    },
-                    Field {
-                        label: "Arrow".to_string(),
-                        ty: DeclarationId(2432),
-=======
                         label: "TypeExpr".to_string(),
                         ty: DeclarationId(2429),
                     },
                     Field {
                         label: "WidthNatLiteral".to_string(),
                         ty: DeclarationId(2430),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -41777,27 +38231,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "BareVariant".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2433),
-=======
                         ty: DeclarationId(2437),
                     },
                     Field {
                         label: "VariantWith".to_string(),
                         ty: DeclarationId(2438),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "VariantWith".to_string(),
-                        ty: DeclarationId(2434),
                     },
                     Field {
                         label: "VariantFields".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2436),
-=======
                         ty: DeclarationId(2440),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -41818,13 +38260,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Int".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2437),
-                    },
-                    Field {
-                        label: "Bool".to_string(),
-                        ty: DeclarationId(2438),
-=======
                         ty: DeclarationId(2441),
                     },
                     Field {
@@ -41834,11 +38269,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "String".to_string(),
                         ty: DeclarationId(2443),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "String".to_string(),
-                        ty: DeclarationId(2439),
                     },
                 ],
             },
@@ -41859,27 +38289,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2440),
-                    },
-                    Field {
-                        label: "Var".to_string(),
-                        ty: DeclarationId(2441),
-                    },
-                    Field {
-                        label: "Path".to_string(),
-                        ty: DeclarationId(2444),
-                    },
-                    Field {
-                        label: "Call".to_string(),
-                        ty: DeclarationId(2446),
-=======
                         ty: DeclarationId(2444),
                     },
                     Field {
                         label: "Var".to_string(),
                         ty: DeclarationId(2445),
->>>>>>> origin/main
                     },
                     Field {
                         label: "Path".to_string(),
@@ -41891,33 +38305,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "PathCall".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2450),
-                    },
-                    Field {
-                        label: "VariantRecord".to_string(),
-                        ty: DeclarationId(2452),
-                    },
-                    Field {
-                        label: "Operator".to_string(),
-                        ty: DeclarationId(2454),
-                    },
-                    Field {
-                        label: "Lambda".to_string(),
-                        ty: DeclarationId(2456),
-                    },
-                    Field {
-                        label: "If".to_string(),
-                        ty: DeclarationId(2457),
-                    },
-                    Field {
-                        label: "Match".to_string(),
-                        ty: DeclarationId(2459),
-                    },
-                    Field {
-                        label: "Record".to_string(),
-                        ty: DeclarationId(2461),
-=======
                         ty: DeclarationId(2454),
                     },
                     Field {
@@ -41931,7 +38318,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "Lambda".to_string(),
                         ty: DeclarationId(2460),
->>>>>>> origin/main
                     },
                     Field {
                         label: "If".to_string(),
@@ -41947,19 +38333,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "List".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2463),
-                    },
-                    Field {
-                        label: "Map".to_string(),
-                        ty: DeclarationId(2465),
-=======
                         ty: DeclarationId(2467),
                     },
                     Field {
                         label: "Map".to_string(),
                         ty: DeclarationId(2469),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -41980,37 +38358,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Let".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2467),
-                    },
-                    Field {
-                        label: "Fn".to_string(),
-                        ty: DeclarationId(2470),
-                    },
-                    Field {
-                        label: "FnExternalBody".to_string(),
-                        ty: DeclarationId(2473),
-                    },
-                    Field {
-                        label: "Data".to_string(),
-                        ty: DeclarationId(2475),
-                    },
-                    Field {
-                        label: "Module".to_string(),
-                        ty: DeclarationId(2477),
-                    },
-                    Field {
-                        label: "Import".to_string(),
-                        ty: DeclarationId(2480),
-                    },
-                    Field {
-                        label: "TypeAtom".to_string(),
-                        ty: DeclarationId(2482),
-                    },
-                    Field {
-                        label: "TypeRecord".to_string(),
-                        ty: DeclarationId(2485),
-=======
                         ty: DeclarationId(2471),
                     },
                     Field {
@@ -42032,7 +38379,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "Import".to_string(),
                         ty: DeclarationId(2484),
->>>>>>> origin/main
                     },
                     Field {
                         label: "TypeAtom".to_string(),
@@ -42044,19 +38390,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "TypeSum".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2489),
-                    },
-                    Field {
-                        label: "TypeAlias".to_string(),
-                        ty: DeclarationId(2492),
-=======
                         ty: DeclarationId(2493),
                     },
                     Field {
                         label: "TypeAlias".to_string(),
                         ty: DeclarationId(2496),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -42098,11 +38436,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[*{left}, *{right}]".to_string(),
                             ))],
@@ -42115,11 +38449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -42161,11 +38491,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -42178,11 +38504,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -42224,11 +38546,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "(len({recv}) == 0)".to_string(),
                             ))],
@@ -42241,11 +38559,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -42289,11 +38603,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "__v3_fold({recv}, {init}, {body})".to_string(),
                             ))],
@@ -42306,11 +38616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -42354,11 +38660,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[{body} for {item} in {recv}]".to_string(),
                             ))],
@@ -42371,11 +38673,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -42419,11 +38717,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[x for x in {recv} if {arg}(x)]".to_string(),
                             ))],
@@ -42436,11 +38730,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -42484,11 +38774,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "any({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -42501,11 +38787,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -42549,11 +38831,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "all({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -42566,11 +38844,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -42614,11 +38888,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[y for x in {recv} for y in {arg}(x)]".to_string(),
                             ))],
@@ -42631,11 +38901,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -42661,11 +38927,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-<<<<<<< HEAD
-            meta_tag: Some(DeclarationId(2493)),
-=======
             meta_tag: Some(DeclarationId(2497)),
->>>>>>> origin/main
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -42684,11 +38946,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -42701,11 +38959,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -42725,11 +38979,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg}.join({recv})".to_string(),
                             ))],
@@ -42742,11 +38992,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -42766,11 +39012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}.split({arg})".to_string(),
                             ))],
@@ -42783,11 +39025,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -42809,11 +39047,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[-1] if {recv} else None".to_string(),
                             ))],
@@ -42826,11 +39060,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -42852,11 +39082,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[0] if {recv} else None".to_string(),
                             ))],
@@ -42869,11 +39095,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -42895,11 +39117,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "list(enumerate({recv}))".to_string(),
                             ))],
@@ -42912,11 +39130,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -42938,11 +39152,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[ord(c) for c in {recv}]".to_string(),
                             ))],
@@ -42955,11 +39165,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -42983,11 +39189,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -43000,11 +39202,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -43024,11 +39222,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -43041,11 +39235,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -43067,11 +39257,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "sorted({recv}, key={arg})".to_string(),
                             ))],
@@ -43084,11 +39270,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -43108,11 +39290,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv} + [{arg}]".to_string(),
                             ))],
@@ -43125,11 +39303,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -43149,11 +39323,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg} in {recv}".to_string(),
                             ))],
@@ -43166,11 +39336,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -43268,21 +39434,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LiteralValue".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2495),
-                    },
-                    Field {
-                        label: "RecordValue".to_string(),
-                        ty: DeclarationId(2497),
-                    },
-                    Field {
-                        label: "VariantValue".to_string(),
-                        ty: DeclarationId(2498),
-                    },
-                    Field {
-                        label: "NodeRef".to_string(),
-                        ty: DeclarationId(2499),
-=======
                         ty: DeclarationId(2499),
                     },
                     Field {
@@ -43300,11 +39451,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "CardinalityValue".to_string(),
                         ty: DeclarationId(2504),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "CardinalityValue".to_string(),
-                        ty: DeclarationId(2500),
                     },
                 ],
             },
@@ -43357,11 +39503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bindings".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2501),
-=======
                     ty: DeclarationId(2505),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -43380,11 +39522,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "frames".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2502),
-=======
                     ty: DeclarationId(2506),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -43422,11 +39560,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "ApplicativeOrder".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2503),
-=======
                     ty: DeclarationId(2507),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -43446,19 +39580,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LeftFirst".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2504),
-                    },
-                    Field {
-                        label: "RightFirst".to_string(),
-                        ty: DeclarationId(2505),
-=======
                         ty: DeclarationId(2508),
                     },
                     Field {
                         label: "RightFirst".to_string(),
                         ty: DeclarationId(2509),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -43509,13 +39635,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1185),
             name: Some("evaluate".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(828), DeclarationId(721), DeclarationId(2494)],
-                output: DeclarationId(1175),
-=======
                 inputs: vec![DeclarationId(828), DeclarationId(721), DeclarationId(2498)],
                 output: DeclarationId(1176),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/runtime.dag", 11265, 11284)),
             },
             type_params: vec![],
@@ -43528,19 +39649,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/runtime.dag", 11196, 11284),
         });
-<<<<<<< HEAD
-        declarations.push(Declaration { id: DeclarationId(1185), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(263)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2358), payload: vec![FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __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(2356), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3555, 4208) });
-        declarations.push(Declaration { id: DeclarationId(1186), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(249)))])), ("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(2358), 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(2356), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4210, 4705) });
-        declarations.push(Declaration { id: DeclarationId(1187), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(248)))])), ("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(2358), 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(2356), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4707, 5196) });
-        declarations.push(Declaration { id: DeclarationId(1188), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(265)))])), ("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(2358), 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(2356), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5198, 5729) });
-        declarations.push(Declaration { id: DeclarationId(1189), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(1054) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2506)), 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(258)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2357), 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(2356), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(271)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2357), 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(2356), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(295)))])), ("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(2357), 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(2356), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(273)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2357), 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(2356), 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}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2357), 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(2356), 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}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2357), 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(2356), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(252)))])), ("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(2357), 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(2356), payload: vec![] })]), FieldValue::Reference(DeclarationId(1185)), FieldValue::Reference(DeclarationId(1186)), FieldValue::Reference(DeclarationId(1187)), FieldValue::Reference(DeclarationId(1188)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(293)))])), ("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(2357), 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(2356), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(299)))])), ("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(2357), 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(2356), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5732, 8453) });
-=======
         declarations.push(Declaration { id: DeclarationId(1186), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(263)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2360), payload: vec![FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __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(2358), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3555, 4208) });
         declarations.push(Declaration { id: DeclarationId(1187), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(249)))])), ("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(2360), 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(2358), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4210, 4705) });
         declarations.push(Declaration { id: DeclarationId(1188), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(248)))])), ("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(2360), 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(2358), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4707, 5196) });
         declarations.push(Declaration { id: DeclarationId(1189), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(265)))])), ("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(2360), 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(2358), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5198, 5729) });
         declarations.push(Declaration { id: DeclarationId(1190), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(1054) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2510)), 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(258)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2359), 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(2358), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(271)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2359), 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(2358), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(295)))])), ("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(2359), 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(2358), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(273)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2359), 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(2358), 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}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2359), 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(2358), 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}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2359), 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(2358), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(252)))])), ("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(2359), 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(2358), payload: vec![] })]), FieldValue::Reference(DeclarationId(1186)), FieldValue::Reference(DeclarationId(1187)), FieldValue::Reference(DeclarationId(1188)), FieldValue::Reference(DeclarationId(1189)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(293)))])), ("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(2359), 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(2358), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(299)))])), ("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(2359), 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(2358), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5732, 8453) });
->>>>>>> origin/main
         declarations.push(Declaration {
             id: DeclarationId(1191),
             name: Some("InputField".to_string()),
@@ -43553,7 +39666,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/services.dag", 3669, 3687),
+            span: SourceSpan::new("src/v3/std/services.dag", 3670, 3688),
         });
         declarations.push(Declaration {
             id: DeclarationId(1192),
@@ -43578,7 +39691,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/services.dag", 4599, 4671),
+            span: SourceSpan::new("src/v3/std/services.dag", 4600, 4672),
         });
         declarations.push(Declaration {
             id: DeclarationId(1193),
@@ -43597,7 +39710,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/services.dag", 5479, 5522),
+            span: SourceSpan::new("src/v3/std/services.dag", 5480, 5523),
         });
         declarations.push(Declaration {
             id: DeclarationId(1194),
@@ -43610,11 +39723,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "inputs".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2507),
-=======
                         ty: DeclarationId(2511),
->>>>>>> origin/main
                     },
                     Field {
                         label: "endpoint".to_string(),
@@ -43630,26 +39739,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/services.dag", 6731, 6841),
+            span: SourceSpan::new("src/v3/std/services.dag", 6732, 6842),
         });
         declarations.push(Declaration {
             id: DeclarationId(1195),
             name: Some("modeled_gunbc_ci_workflow".to_string()),
             connective: TypeConnective::Instantiation {
-<<<<<<< HEAD
-                template: DeclarationId(1742),
-=======
                 template: DeclarationId(1744),
->>>>>>> origin/main
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-<<<<<<< HEAD
-            meta_tag: Some(DeclarationId(1742)),
-=======
             meta_tag: Some(DeclarationId(1744)),
->>>>>>> origin/main
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -43666,11 +39767,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("ci_demo_timing_read".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-<<<<<<< HEAD
-                output: DeclarationId(2508),
-=======
                 output: DeclarationId(2512),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(597))),
             },
             type_params: vec![],
@@ -43688,11 +39785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("ci_wad_modeled_workflow_timing_witness".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-<<<<<<< HEAD
-                output: DeclarationId(2509),
-=======
                 output: DeclarationId(2513),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(599))),
             },
             type_params: vec![],
@@ -43710,11 +39803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_seed_list_declaration_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-<<<<<<< HEAD
-                output: DeclarationId(2510),
-=======
                 output: DeclarationId(2514),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(601))),
             },
             type_params: vec![],
@@ -43732,11 +39821,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_seed_list_behavior_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-<<<<<<< HEAD
-                output: DeclarationId(2511),
-=======
                 output: DeclarationId(2515),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(603))),
             },
             type_params: vec![],
@@ -43754,11 +39839,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_seed_list_dagport_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-<<<<<<< HEAD
-                output: DeclarationId(2512),
-=======
                 output: DeclarationId(2516),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(605))),
             },
             type_params: vec![],
@@ -43776,11 +39857,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_seed_list_cluster_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-<<<<<<< HEAD
-                output: DeclarationId(2513),
-=======
                 output: DeclarationId(2517),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(607))),
             },
             type_params: vec![],
@@ -43798,11 +39875,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_empty_list_diagnostic".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-<<<<<<< HEAD
-                output: DeclarationId(2514),
-=======
                 output: DeclarationId(2518),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(609))),
             },
             type_params: vec![],
@@ -43820,11 +39893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_empty_list_witness_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-<<<<<<< HEAD
-                output: DeclarationId(2516),
-=======
                 output: DeclarationId(2520),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(611))),
             },
             type_params: vec![],
@@ -43841,13 +39910,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1204),
             name: Some("_ci_wad_witnesses_singleton_tm".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1237)],
-                output: DeclarationId(2518),
-=======
                 inputs: vec![DeclarationId(1238)],
                 output: DeclarationId(2522),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(615))),
             },
             type_params: vec![],
@@ -43865,11 +39929,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_violations_singleton".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(982)],
-<<<<<<< HEAD
-                output: DeclarationId(2519),
-=======
                 output: DeclarationId(2523),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(618))),
             },
             type_params: vec![],
@@ -43886,13 +39946,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1206),
             name: Some("_ci_wad_dimension_ok_tm_payload".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1237)],
-                output: DeclarationId(2520),
-=======
                 inputs: vec![DeclarationId(1238)],
                 output: DeclarationId(2524),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(622))),
             },
             type_params: vec![],
@@ -43909,13 +39964,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1207),
             name: Some("_ci_wad_dimension_fail_tm_payload".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1237), DeclarationId(982)],
-                output: DeclarationId(2521),
-=======
                 inputs: vec![DeclarationId(1238), DeclarationId(982)],
                 output: DeclarationId(2525),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(627))),
             },
             type_params: vec![],
@@ -43932,13 +39982,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1208),
             name: Some("report_dim_ok_tm".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(828), DeclarationId(1237)],
-                output: DeclarationId(2522),
-=======
                 inputs: vec![DeclarationId(828), DeclarationId(1238)],
                 output: DeclarationId(2526),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(634))),
             },
             type_params: vec![],
@@ -43955,13 +40000,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1209),
             name: Some("report_dim_fail_tm".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(828), DeclarationId(1237), DeclarationId(982)],
-                output: DeclarationId(2523),
-=======
                 inputs: vec![DeclarationId(828), DeclarationId(1238), DeclarationId(982)],
                 output: DeclarationId(2527),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(641))),
             },
             type_params: vec![],
@@ -43978,13 +40018,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1210),
             name: Some("report_inhabits_branch_tm".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(828), DeclarationId(1237), DeclarationId(986)],
-                output: DeclarationId(2524),
-=======
                 inputs: vec![DeclarationId(828), DeclarationId(1238), DeclarationId(986)],
                 output: DeclarationId(2528),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(646))),
             },
             type_params: vec![],
@@ -44001,13 +40036,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1211),
             name: Some("dimension_report_tm_from_witness".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(828), DeclarationId(2525)],
-                output: DeclarationId(2526),
-=======
                 inputs: vec![DeclarationId(828), DeclarationId(2529)],
                 output: DeclarationId(2530),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(656))),
             },
             type_params: vec![],
@@ -44025,11 +40055,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("demo_ci_modeled_timing_dimension_report".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-<<<<<<< HEAD
-                output: DeclarationId(2527),
-=======
                 output: DeclarationId(2531),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(664))),
             },
             type_params: vec![],
@@ -44049,13 +40075,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Strict".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2557),
-                    },
-                    Field {
-                        label: "NonIncreasing".to_string(),
-                        ty: DeclarationId(2558),
-=======
                         ty: DeclarationId(2561),
                     },
                     Field {
@@ -44065,11 +40084,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "DescentUnknown".to_string(),
                         ty: DeclarationId(2563),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2559),
                     },
                 ],
             },
@@ -44171,13 +40185,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1218),
             name: Some("optional_evidence_meet".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(2549), DeclarationId(2550)],
-                output: DeclarationId(2551),
-=======
                 inputs: vec![DeclarationId(2553), DeclarationId(2554)],
                 output: DeclarationId(2555),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2488,
@@ -44198,13 +40207,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1219),
             name: Some("map_evidence_merge_at".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(2552), DeclarationId(230), DeclarationId(1212)],
-                output: DeclarationId(2553),
-=======
                 inputs: vec![DeclarationId(2556), DeclarationId(230), DeclarationId(1213)],
                 output: DeclarationId(2557),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2833,
@@ -44228,21 +40232,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "TreeSize".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2560),
-                    },
-                    Field {
-                        label: "ListLength".to_string(),
-                        ty: DeclarationId(2561),
-                    },
-                    Field {
-                        label: "ArithmeticValue".to_string(),
-                        ty: DeclarationId(2562),
-                    },
-                    Field {
-                        label: "TokenPosition".to_string(),
-                        ty: DeclarationId(2563),
-=======
                         ty: DeclarationId(2564),
                     },
                     Field {
@@ -44260,11 +40249,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "SetCardinality".to_string(),
                         ty: DeclarationId(2568),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "SetCardinality".to_string(),
-                        ty: DeclarationId(2564),
                     },
                 ],
             },
@@ -44285,19 +40269,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "OneStep".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2565),
-                    },
-                    Field {
-                        label: "AdditionalStep".to_string(),
-                        ty: DeclarationId(2566),
-=======
                         ty: DeclarationId(2569),
                     },
                     Field {
                         label: "AdditionalStep".to_string(),
                         ty: DeclarationId(2570),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -44340,19 +40316,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DivideByTwo".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2567),
-                    },
-                    Field {
-                        label: "StrictlyLarger".to_string(),
-                        ty: DeclarationId(2568),
-=======
                         ty: DeclarationId(2571),
                     },
                     Field {
                         label: "StrictlyLarger".to_string(),
                         ty: DeclarationId(2572),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -44415,11 +40383,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("positive_descent_amount_from_positive_int".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-<<<<<<< HEAD
-                output: DeclarationId(2554),
-=======
                 output: DeclarationId(2558),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     6420,
@@ -44441,11 +40405,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(93)],
-<<<<<<< HEAD
-                output: DeclarationId(2555),
-=======
                 output: DeclarationId(2559),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     6860,
@@ -44469,34 +40429,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ChildAccessor".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2569),
-                    },
-                    Field {
-                        label: "ListShrink".to_string(),
-                        ty: DeclarationId(2570),
-                    },
-                    Field {
-                        label: "ArithmeticSubtractDescent".to_string(),
-                        ty: DeclarationId(2571),
-                    },
-                    Field {
-                        label: "ArithmeticDivideDescent".to_string(),
-                        ty: DeclarationId(2572),
-                    },
-                    Field {
-                        label: "ParserAdvance".to_string(),
-                        ty: DeclarationId(2573),
-                    },
-                    Field {
-                        label: "SetRemoval".to_string(),
-                        ty: DeclarationId(2574),
-                    },
-                    Field {
-                        label: "FoldIteration".to_string(),
-                        ty: DeclarationId(2575),
-                    },
-=======
                         ty: DeclarationId(2573),
                     },
                     Field {
@@ -44523,7 +40455,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         label: "FoldIteration".to_string(),
                         ty: DeclarationId(2579),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -44542,11 +40473,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "dimensions".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2576),
-=======
                     ty: DeclarationId(2580),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -44574,11 +40501,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "evidence".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2577),
-=======
                         ty: DeclarationId(2581),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -44598,11 +40521,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Strict".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2578),
-=======
                     ty: DeclarationId(2582),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -44622,19 +40541,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NonIncreasing".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2579),
-                    },
-                    Field {
-                        label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2580),
-=======
                         ty: DeclarationId(2583),
                     },
                     Field {
                         label: "DescentUnknown".to_string(),
                         ty: DeclarationId(2584),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -44655,19 +40566,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "EvidenceUnknown".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2581),
-                    },
-                    Field {
-                        label: "EvidenceIncomplete".to_string(),
-                        ty: DeclarationId(2582),
-=======
                         ty: DeclarationId(2585),
                     },
                     Field {
                         label: "EvidenceIncomplete".to_string(),
                         ty: DeclarationId(2586),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -44696,11 +40599,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "per_path".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2583),
-=======
                         ty: DeclarationId(2587),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -44719,11 +40618,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("descent_execution_proof".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(724), DeclarationId(722)],
-<<<<<<< HEAD
-                output: DeclarationId(2556),
-=======
                 output: DeclarationId(2560),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     12400,
@@ -44784,17 +40679,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Observed".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2586),
-                    },
-                    Field {
-                        label: "Unobserved".to_string(),
-                        ty: DeclarationId(2587),
-                    },
-                    Field {
-                        label: "Ambiguous".to_string(),
-                        ty: DeclarationId(2588),
-=======
                         ty: DeclarationId(2590),
                     },
                     Field {
@@ -44808,11 +40692,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "Stale".to_string(),
                         ty: DeclarationId(2593),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "Stale".to_string(),
-                        ty: DeclarationId(2589),
                     },
                 ],
             },
@@ -44872,28 +40751,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 5566, 5815),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1239),
-            name: Some("TimingObservationSet".to_string()),
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "observations".to_string(),
-                    ty: DeclarationId(2590),
-                }],
-            },
-            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/timing_lens.dag", 5899, 5973),
-        });
-        declarations.push(Declaration {
-=======
->>>>>>> origin/main
             id: DeclarationId(1240),
             name: Some("FileAttachment".to_string()),
             connective: TypeConnective::Conj {
@@ -45096,9 +40953,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("nanoseconds_zero".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-<<<<<<< HEAD
-                output: DeclarationId(2584),
-=======
                 output: DeclarationId(1237),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(708))),
             },
@@ -45136,7 +40990,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1238), DeclarationId(1238)],
                 output: DeclarationId(1238),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(714))),
             },
             type_params: vec![],
@@ -45237,65 +41090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9968, 10673),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1254),
-            name: Some("timing_measurement_iterate".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1237), DeclarationId(818)],
-                output: DeclarationId(1237),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(756))),
-            },
-            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/timing_lens.dag", 10998, 11359),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1255),
-            name: Some("timing_lens_read".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2585),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(793))),
-            },
-            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/timing_lens.dag", 12136, 12962),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1256),
-            name: Some("timing_lens_validate".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(1237)],
-                output: DeclarationId(986),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(807))),
-            },
-            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/timing_lens.dag", 12964, 13809),
-=======
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11628, 12333),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(1257),
@@ -45358,186 +41153,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2602),
-                    },
-                    Field {
-                        label: "KwIf".to_string(),
-                        ty: DeclarationId(2603),
-                    },
-                    Field {
-                        label: "KwThen".to_string(),
-                        ty: DeclarationId(2604),
-                    },
-                    Field {
-                        label: "KwElse".to_string(),
-                        ty: DeclarationId(2605),
-                    },
-                    Field {
-                        label: "KwFn".to_string(),
-                        ty: DeclarationId(2606),
-                    },
-                    Field {
-                        label: "KwType".to_string(),
-                        ty: DeclarationId(2607),
-                    },
-                    Field {
-                        label: "KwModule".to_string(),
-                        ty: DeclarationId(2608),
-                    },
-                    Field {
-                        label: "KwImport".to_string(),
-                        ty: DeclarationId(2609),
-                    },
-                    Field {
-                        label: "KwMatch".to_string(),
-                        ty: DeclarationId(2610),
-                    },
-                    Field {
-                        label: "KwData".to_string(),
-                        ty: DeclarationId(2611),
-                    },
-                    Field {
-                        label: "KwWhere".to_string(),
-                        ty: DeclarationId(2612),
-                    },
-                    Field {
-                        label: "KwTrue".to_string(),
-                        ty: DeclarationId(2613),
-                    },
-                    Field {
-                        label: "KwFalse".to_string(),
-                        ty: DeclarationId(2614),
-                    },
-                    Field {
-                        label: "Ident".to_string(),
-                        ty: DeclarationId(2615),
-                    },
-                    Field {
-                        label: "IntLit".to_string(),
-                        ty: DeclarationId(2616),
-                    },
-                    Field {
-                        label: "StringLit".to_string(),
-                        ty: DeclarationId(2617),
-                    },
-                    Field {
-                        label: "Eq".to_string(),
-                        ty: DeclarationId(2618),
-                    },
-                    Field {
-                        label: "EqEq".to_string(),
-                        ty: DeclarationId(2619),
-                    },
-                    Field {
-                        label: "NotEq".to_string(),
-                        ty: DeclarationId(2620),
-                    },
-                    Field {
-                        label: "Lt".to_string(),
-                        ty: DeclarationId(2621),
-                    },
-                    Field {
-                        label: "Le".to_string(),
-                        ty: DeclarationId(2622),
-                    },
-                    Field {
-                        label: "Gt".to_string(),
-                        ty: DeclarationId(2623),
-                    },
-                    Field {
-                        label: "Ge".to_string(),
-                        ty: DeclarationId(2624),
-                    },
-                    Field {
-                        label: "Plus".to_string(),
-                        ty: DeclarationId(2625),
-                    },
-                    Field {
-                        label: "Minus".to_string(),
-                        ty: DeclarationId(2626),
-                    },
-                    Field {
-                        label: "Star".to_string(),
-                        ty: DeclarationId(2627),
-                    },
-                    Field {
-                        label: "Slash".to_string(),
-                        ty: DeclarationId(2628),
-                    },
-                    Field {
-                        label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2629),
-                    },
-                    Field {
-                        label: "PipePipe".to_string(),
-                        ty: DeclarationId(2630),
-                    },
-                    Field {
-                        label: "Colon".to_string(),
-                        ty: DeclarationId(2631),
-                    },
-                    Field {
-                        label: "Arrow".to_string(),
-                        ty: DeclarationId(2632),
-                    },
-                    Field {
-                        label: "FatArrow".to_string(),
-                        ty: DeclarationId(2633),
-                    },
-                    Field {
-                        label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2634),
-                    },
-                    Field {
-                        label: "Dot".to_string(),
-                        ty: DeclarationId(2635),
-                    },
-                    Field {
-                        label: "LParen".to_string(),
-                        ty: DeclarationId(2636),
-                    },
-                    Field {
-                        label: "RParen".to_string(),
-                        ty: DeclarationId(2637),
-                    },
-                    Field {
-                        label: "LBrace".to_string(),
-                        ty: DeclarationId(2638),
-                    },
-                    Field {
-                        label: "RBrace".to_string(),
-                        ty: DeclarationId(2639),
-                    },
-                    Field {
-                        label: "LBracket".to_string(),
-                        ty: DeclarationId(2640),
-                    },
-                    Field {
-                        label: "RBracket".to_string(),
-                        ty: DeclarationId(2641),
-                    },
-                    Field {
-                        label: "Comma".to_string(),
-                        ty: DeclarationId(2642),
-                    },
-                    Field {
-                        label: "Semicolon".to_string(),
-                        ty: DeclarationId(2643),
-                    },
-                    Field {
-                        label: "Pipe".to_string(),
-                        ty: DeclarationId(2644),
-                    },
-                    Field {
-                        label: "Question".to_string(),
-                        ty: DeclarationId(2645),
-                    },
-                    Field {
-                        label: "Eof".to_string(),
-                        ty: DeclarationId(2646),
-                    },
-=======
                         ty: DeclarationId(2606),
                     },
                     Field {
@@ -45716,7 +41331,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         label: "Eof".to_string(),
                         ty: DeclarationId(2650),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -45761,58 +41375,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2647),
-                    },
-                    Field {
-                        label: "KwIf".to_string(),
-                        ty: DeclarationId(2648),
-                    },
-                    Field {
-                        label: "KwThen".to_string(),
-                        ty: DeclarationId(2649),
-                    },
-                    Field {
-                        label: "KwElse".to_string(),
-                        ty: DeclarationId(2650),
-                    },
-                    Field {
-                        label: "KwFn".to_string(),
-                        ty: DeclarationId(2651),
-                    },
-                    Field {
-                        label: "KwType".to_string(),
-                        ty: DeclarationId(2652),
-                    },
-                    Field {
-                        label: "KwModule".to_string(),
-                        ty: DeclarationId(2653),
-                    },
-                    Field {
-                        label: "KwImport".to_string(),
-                        ty: DeclarationId(2654),
-                    },
-                    Field {
-                        label: "KwMatch".to_string(),
-                        ty: DeclarationId(2655),
-                    },
-                    Field {
-                        label: "KwData".to_string(),
-                        ty: DeclarationId(2656),
-                    },
-                    Field {
-                        label: "KwWhere".to_string(),
-                        ty: DeclarationId(2657),
-                    },
-                    Field {
-                        label: "KwTrue".to_string(),
-                        ty: DeclarationId(2658),
-                    },
-                    Field {
-                        label: "KwFalse".to_string(),
-                        ty: DeclarationId(2659),
-                    },
-=======
                         ty: DeclarationId(2651),
                     },
                     Field {
@@ -45863,7 +41425,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         label: "KwFalse".to_string(),
                         ty: DeclarationId(2663),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -45883,118 +41444,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2660),
-                    },
-                    Field {
-                        label: "EqEq".to_string(),
-                        ty: DeclarationId(2661),
-                    },
-                    Field {
-                        label: "NotEq".to_string(),
-                        ty: DeclarationId(2662),
-                    },
-                    Field {
-                        label: "Lt".to_string(),
-                        ty: DeclarationId(2663),
-                    },
-                    Field {
-                        label: "Le".to_string(),
-                        ty: DeclarationId(2664),
-                    },
-                    Field {
-                        label: "Gt".to_string(),
-                        ty: DeclarationId(2665),
-                    },
-                    Field {
-                        label: "Ge".to_string(),
-                        ty: DeclarationId(2666),
-                    },
-                    Field {
-                        label: "Plus".to_string(),
-                        ty: DeclarationId(2667),
-                    },
-                    Field {
-                        label: "Minus".to_string(),
-                        ty: DeclarationId(2668),
-                    },
-                    Field {
-                        label: "Star".to_string(),
-                        ty: DeclarationId(2669),
-                    },
-                    Field {
-                        label: "Slash".to_string(),
-                        ty: DeclarationId(2670),
-                    },
-                    Field {
-                        label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2671),
-                    },
-                    Field {
-                        label: "PipePipe".to_string(),
-                        ty: DeclarationId(2672),
-                    },
-                    Field {
-                        label: "Colon".to_string(),
-                        ty: DeclarationId(2673),
-                    },
-                    Field {
-                        label: "Arrow".to_string(),
-                        ty: DeclarationId(2674),
-                    },
-                    Field {
-                        label: "FatArrow".to_string(),
-                        ty: DeclarationId(2675),
-                    },
-                    Field {
-                        label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2676),
-                    },
-                    Field {
-                        label: "Dot".to_string(),
-                        ty: DeclarationId(2677),
-                    },
-                    Field {
-                        label: "LParen".to_string(),
-                        ty: DeclarationId(2678),
-                    },
-                    Field {
-                        label: "RParen".to_string(),
-                        ty: DeclarationId(2679),
-                    },
-                    Field {
-                        label: "LBrace".to_string(),
-                        ty: DeclarationId(2680),
-                    },
-                    Field {
-                        label: "RBrace".to_string(),
-                        ty: DeclarationId(2681),
-                    },
-                    Field {
-                        label: "LBracket".to_string(),
-                        ty: DeclarationId(2682),
-                    },
-                    Field {
-                        label: "RBracket".to_string(),
-                        ty: DeclarationId(2683),
-                    },
-                    Field {
-                        label: "Comma".to_string(),
-                        ty: DeclarationId(2684),
-                    },
-                    Field {
-                        label: "Semicolon".to_string(),
-                        ty: DeclarationId(2685),
-                    },
-                    Field {
-                        label: "Pipe".to_string(),
-                        ty: DeclarationId(2686),
-                    },
-                    Field {
-                        label: "Question".to_string(),
-                        ty: DeclarationId(2687),
-                    },
-=======
                         ty: DeclarationId(2664),
                     },
                     Field {
@@ -46105,7 +41554,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         label: "Question".to_string(),
                         ty: DeclarationId(2691),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -46350,46 +41798,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2691),
-                    },
-                    Field {
-                        label: "ParseError".to_string(),
-                        ty: DeclarationId(2692),
-                    },
-                    Field {
-                        label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(2693),
-                    },
-                    Field {
-                        label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(2694),
-                    },
-                    Field {
-                        label: "ResolveError".to_string(),
-                        ty: DeclarationId(2695),
-                    },
-                    Field {
-                        label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(2696),
-                    },
-                    Field {
-                        label: "BranchConditionNotBool".to_string(),
-                        ty: DeclarationId(2697),
-                    },
-                    Field {
-                        label: "MagnitudeOutOfRange".to_string(),
-                        ty: DeclarationId(2698),
-                    },
-                    Field {
-                        label: "MalformedIntegerRangeFact".to_string(),
-                        ty: DeclarationId(2699),
-                    },
-                    Field {
-                        label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(2700),
-                    },
-=======
                         ty: DeclarationId(2695),
                     },
                     Field {
@@ -46428,7 +41836,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         label: "NominalOpacityViolation".to_string(),
                         ty: DeclarationId(2704),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -46448,19 +41855,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "AnyDetail".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2701),
-                    },
-                    Field {
-                        label: "Contains".to_string(),
-                        ty: DeclarationId(2702),
-=======
                         ty: DeclarationId(2705),
                     },
                     Field {
                         label: "Contains".to_string(),
                         ty: DeclarationId(2706),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -46506,19 +41905,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Resolved".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2703),
-                    },
-                    Field {
-                        label: "Unresolved".to_string(),
-                        ty: DeclarationId(2704),
-=======
                         ty: DeclarationId(2707),
                     },
                     Field {
                         label: "Unresolved".to_string(),
                         ty: DeclarationId(2708),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -46538,11 +41929,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "AtMostBudget".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2705),
-=======
                     ty: DeclarationId(2709),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -46562,13 +41949,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Associativity".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2706),
-                    },
-                    Field {
-                        label: "Commutativity".to_string(),
-                        ty: DeclarationId(2707),
-=======
                         ty: DeclarationId(2710),
                     },
                     Field {
@@ -46578,11 +41958,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "Identity".to_string(),
                         ty: DeclarationId(2712),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "Identity".to_string(),
-                        ty: DeclarationId(2708),
                     },
                 ],
             },
@@ -46621,11 +41996,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "LiteralProgram".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2709),
-=======
                     ty: DeclarationId(2713),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -46644,11 +42015,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "LinearCostForBindParam".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2710),
-=======
                     ty: DeclarationId(2714),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -46667,11 +42034,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "SelectedBindParamSizeVariable".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2711),
-=======
                     ty: DeclarationId(2715),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -46710,19 +42073,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LensCapabilityStructuralTerminal".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2712),
-                    },
-                    Field {
-                        label: "LensCapabilityStructuralPartial".to_string(),
-                        ty: DeclarationId(2713),
-=======
                         ty: DeclarationId(2716),
                     },
                     Field {
                         label: "LensCapabilityStructuralPartial".to_string(),
                         ty: DeclarationId(2717),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -46743,17 +42098,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LensCapabilityBehavioralComplete".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2714),
-                    },
-                    Field {
-                        label: "LensCapabilityBehavioralPartial".to_string(),
-                        ty: DeclarationId(2715),
-                    },
-                    Field {
-                        label: "LensCapabilityBehavioralStub".to_string(),
-                        ty: DeclarationId(2716),
-=======
                         ty: DeclarationId(2718),
                     },
                     Field {
@@ -46767,11 +42111,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "LensCapabilityBehavioralNA".to_string(),
                         ty: DeclarationId(2721),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "LensCapabilityBehavioralNA".to_string(),
-                        ty: DeclarationId(2717),
                     },
                 ],
             },
@@ -46792,13 +42131,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LensCapabilityV2RealV2".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2718),
-                    },
-                    Field {
-                        label: "LensCapabilityV2NoneV3Native".to_string(),
-                        ty: DeclarationId(2719),
-=======
                         ty: DeclarationId(2722),
                     },
                     Field {
@@ -46808,11 +42140,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "LensCapabilityV2NotApplicable".to_string(),
                         ty: DeclarationId(2724),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "LensCapabilityV2NotApplicable".to_string(),
-                        ty: DeclarationId(2720),
                     },
                 ],
             },
@@ -46871,11 +42198,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-<<<<<<< HEAD
-            meta_tag: Some(DeclarationId(2760)),
-=======
             meta_tag: Some(DeclarationId(2764)),
->>>>>>> origin/main
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -46887,9 +42210,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2712),
-=======
                             constructor: DeclarationId(2716),
                             payload: vec![],
                         },
@@ -46976,7 +42296,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "structural".to_string(),
                         FieldValue::Variant {
                             constructor: DeclarationId(2716),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -46998,27 +42317,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 FieldValue::Record(vec![
                     (
                         "lens_basename".to_string(),
-                        FieldValue::Literal(LiteralBits::String("cost.dag".to_string())),
+                        FieldValue::Literal(LiteralBits::String("idempotency.dag".to_string())),
                     ),
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2712),
-=======
                             constructor: DeclarationId(2716),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2714),
-=======
                             constructor: DeclarationId(2718),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -47030,91 +42341,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         },
                     ),
                 ]),
-                FieldValue::Record(vec![
-                    (
-                        "lens_basename".to_string(),
-                        FieldValue::Literal(LiteralBits::String(
-                            "cost_target_realization.dag".to_string(),
-                        )),
-                    ),
-                    (
-                        "structural".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2712),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "behavioral".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2717),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "v2_counterpart".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2719),
-                            payload: vec![],
-                        },
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "lens_basename".to_string(),
-                        FieldValue::Literal(LiteralBits::String(
-                            "effect_enumeration.dag".to_string(),
-                        )),
-                    ),
-                    (
-                        "structural".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2712),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "behavioral".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2715),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "v2_counterpart".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2719),
-                            payload: vec![],
-                        },
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "lens_basename".to_string(),
-                        FieldValue::Literal(LiteralBits::String("idempotency.dag".to_string())),
-                    ),
-                    (
-                        "structural".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2712),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "behavioral".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2714),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "v2_counterpart".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2719),
-                            payload: vec![],
-                        },
-                    ),
-                ]),
                 FieldValue::Record(vec![
                     (
                         "lens_basename".to_string(),
@@ -47137,11 +42363,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2719),
-=======
                             constructor: DeclarationId(2723),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -47154,33 +42376,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2712),
-=======
                             constructor: DeclarationId(2716),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2714),
-=======
                             constructor: DeclarationId(2718),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2719),
-=======
                             constructor: DeclarationId(2723),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -47195,33 +42405,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2712),
-=======
                             constructor: DeclarationId(2716),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2714),
-=======
                             constructor: DeclarationId(2718),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2719),
-=======
                             constructor: DeclarationId(2723),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -47234,33 +42432,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2712),
-=======
                             constructor: DeclarationId(2716),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2714),
-=======
                             constructor: DeclarationId(2718),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2719),
-=======
                             constructor: DeclarationId(2723),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -47275,33 +42461,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2712),
-=======
                             constructor: DeclarationId(2716),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2714),
-=======
                             constructor: DeclarationId(2718),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2719),
-=======
                             constructor: DeclarationId(2723),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -47314,33 +42488,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2713),
-=======
                             constructor: DeclarationId(2717),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2717),
-=======
                             constructor: DeclarationId(2721),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2720),
-=======
                             constructor: DeclarationId(2724),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -47353,33 +42515,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2713),
-=======
                             constructor: DeclarationId(2717),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2717),
-=======
                             constructor: DeclarationId(2721),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2720),
-=======
                             constructor: DeclarationId(2724),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -47394,33 +42544,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2712),
-=======
                             constructor: DeclarationId(2716),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2717),
-=======
                             constructor: DeclarationId(2721),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2720),
-=======
                             constructor: DeclarationId(2724),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -47428,7 +42566,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ])),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 7185, 9772),
+            span: SourceSpan::new("src/v3/std/verification.dag", 7185, 9768),
         });
         declarations.push(Declaration {
             id: DeclarationId(1293),
@@ -47437,105 +42575,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Compiles".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2721),
-                    },
-                    Field {
-                        label: "FailsWithDiagnostic".to_string(),
-                        ty: DeclarationId(2722),
-                    },
-                    Field {
-                        label: "OutputEquals".to_string(),
-                        ty: DeclarationId(2723),
-                    },
-                    Field {
-                        label: "PortHasState".to_string(),
-                        ty: DeclarationId(2724),
-                    },
-                    Field {
-                        label: "DeclarationHasRefinement".to_string(),
-                        ty: DeclarationId(2725),
-                    },
-                    Field {
-                        label: "CostBounded".to_string(),
-                        ty: DeclarationId(2726),
-                    },
-                    Field {
-                        label: "BehavioralObservation".to_string(),
-                        ty: DeclarationId(2727),
-                    },
-                    Field {
-                        label: "MockBackedInvariant".to_string(),
-                        ty: DeclarationId(2728),
-                    },
-                    Field {
-                        label: "ExecuteCommand".to_string(),
-                        ty: DeclarationId(2730),
-                    },
-                    Field {
-                        label: "ForAllTargets".to_string(),
-                        ty: DeclarationId(2732),
-                    },
-                    Field {
-                        label: "LensOutputEquals".to_string(),
-                        ty: DeclarationId(2733),
-                    },
-                    Field {
-                        label: "DifferentialEquals".to_string(),
-                        ty: DeclarationId(2734),
-                    },
-                    Field {
-                        label: "SymbolicCostExprEquals".to_string(),
-                        ty: DeclarationId(2735),
-                    },
-                    Field {
-                        label: "SymbolicCostExprEqualsForBindParam".to_string(),
-                        ty: DeclarationId(2736),
-                    },
-                    Field {
-                        label: "PerfWithinBaseline".to_string(),
-                        ty: DeclarationId(2737),
-                    },
-                    Field {
-                        label: "BinaryDimensionReportEquals".to_string(),
-                        ty: DeclarationId(2738),
-                    },
-                    Field {
-                        label: "AlgebraicLaw".to_string(),
-                        ty: DeclarationId(2739),
-                    },
-                    Field {
-                        label: "CensusBoundCheck".to_string(),
-                        ty: DeclarationId(2740),
-                    },
-                    Field {
-                        label: "CensusSubsetCount".to_string(),
-                        ty: DeclarationId(2741),
-                    },
-                    Field {
-                        label: "FixedPointConverges".to_string(),
-                        ty: DeclarationId(2742),
-                    },
-                    Field {
-                        label: "RatchetZero".to_string(),
-                        ty: DeclarationId(2743),
-                    },
-                    Field {
-                        label: "GeneratedFromDag".to_string(),
-                        ty: DeclarationId(2745),
-                    },
-                    Field {
-                        label: "CementingDispatchMatchesProjection".to_string(),
-                        ty: DeclarationId(2746),
-                    },
-                    Field {
-                        label: "ReleaseDeferredClaim".to_string(),
-                        ty: DeclarationId(2747),
-                    },
-                    Field {
-                        label: "SubstrateResearchDeferredClaim".to_string(),
-                        ty: DeclarationId(2748),
-=======
                         ty: DeclarationId(2725),
                     },
                     Field {
@@ -47637,11 +42676,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "BridgeLedgerZero".to_string(),
                         ty: DeclarationId(2753),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "BridgeLedgerZero".to_string(),
-                        ty: DeclarationId(2749),
                     },
                 ],
             },
@@ -47653,7 +42687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9774, 22667),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9770, 22663),
         });
         declarations.push(Declaration {
             id: DeclarationId(1294),
@@ -47667,7 +42701,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 22775, 22795),
+            span: SourceSpan::new("src/v3/std/verification.dag", 22771, 22791),
         });
         declarations.push(Declaration {
             id: DeclarationId(1295),
@@ -47686,7 +42720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 22938, 22993),
+            span: SourceSpan::new("src/v3/std/verification.dag", 22934, 22989),
         });
         declarations.push(Declaration {
             id: DeclarationId(1296),
@@ -47711,11 +42745,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "requires".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2750),
-=======
                         ty: DeclarationId(2754),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -47727,7 +42757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 23603, 23736),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23599, 23732),
         });
         declarations.push(Declaration {
             id: DeclarationId(1297),
@@ -47736,19 +42766,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ForAll".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2751),
-                    },
-                    Field {
-                        label: "Exists".to_string(),
-                        ty: DeclarationId(2752),
-=======
                         ty: DeclarationId(2755),
                     },
                     Field {
                         label: "Exists".to_string(),
                         ty: DeclarationId(2756),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -47760,7 +42782,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 23917, 23954),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23913, 23950),
         });
         declarations.push(Declaration {
             id: DeclarationId(1298),
@@ -47785,11 +42807,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "requires".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2753),
-=======
                         ty: DeclarationId(2757),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -47801,7 +42819,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 23956, 24117),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23952, 24113),
         });
         declarations.push(Declaration {
             id: DeclarationId(1299),
@@ -47810,19 +42828,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "EnumeratedTestNode".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2754),
-                    },
-                    Field {
-                        label: "QuantifiedTestNode".to_string(),
-                        ty: DeclarationId(2755),
-=======
                         ty: DeclarationId(2758),
                     },
                     Field {
                         label: "QuantifiedTestNode".to_string(),
                         ty: DeclarationId(2759),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -47834,7 +42844,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 25817, 25911),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25813, 25907),
         });
         declarations.push(Declaration {
             id: DeclarationId(1300),
@@ -47863,7 +42873,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 25913, 26016),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25909, 26012),
         });
         declarations.push(Declaration {
             id: DeclarationId(1301),
@@ -47872,13 +42882,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Enumerated".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2756),
-                    },
-                    Field {
-                        label: "Quantified".to_string(),
-                        ty: DeclarationId(2757),
-=======
                         ty: DeclarationId(2760),
                     },
                     Field {
@@ -47909,7 +42912,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "claims".to_string(),
                         ty: DeclarationId(2762),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -47921,46 +42923,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26749, 26826),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26824, 26884),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1299),
-            name: Some("TestSuite".to_string()),
-=======
             id: DeclarationId(1303),
             name: Some("TestObligation".to_string()),
->>>>>>> origin/main
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-<<<<<<< HEAD
-                        label: "claims".to_string(),
-                        ty: DeclarationId(2758),
-=======
-                        label: "resources".to_string(),
-                        ty: DeclarationId(2763),
->>>>>>> origin/main
-                    },
-                ],
-            },
-            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", 26828, 26888),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1300),
-            name: Some("TestObligation".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
@@ -47969,7 +42936,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "resources".to_string(),
-                        ty: DeclarationId(2759),
+                        ty: DeclarationId(2763),
                     },
                 ],
             },
@@ -47981,23 +42948,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 27086, 27167),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27082, 27163),
         });
         declarations.push(Declaration {
             id: DeclarationId(1304),
             name: Some("claim_obligation_resources".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1293)],
-                output: DeclarationId(2688),
-=======
                 inputs: vec![DeclarationId(1296)],
                 output: DeclarationId(2692),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    27609,
-                    27625,
+                    27605,
+                    27621,
                 )),
             },
             type_params: vec![],
@@ -48008,7 +42970,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 27538, 27625),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27534, 27621),
         });
         declarations.push(Declaration {
             id: DeclarationId(1305),
@@ -48018,8 +42980,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 output: DeclarationId(1303),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    27683,
-                    27768,
+                    27679,
+                    27764,
                 )),
             },
             type_params: vec![],
@@ -48030,7 +42992,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 27627, 27768),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27623, 27764),
         });
         declarations.push(Declaration {
             id: DeclarationId(1306),
@@ -48040,8 +43002,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 output: DeclarationId(1303),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    28075,
-                    28141,
+                    28071,
+                    28137,
                 )),
             },
             type_params: vec![],
@@ -48052,7 +43014,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 27998, 28141),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27994, 28137),
         });
         declarations.push(Declaration {
             id: DeclarationId(1307),
@@ -48070,23 +43032,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 28446, 28635),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28442, 28631),
         });
         declarations.push(Declaration {
             id: DeclarationId(1308),
             name: Some("materialize_test_obligations".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(2689)],
-                output: DeclarationId(2690),
-=======
                 inputs: vec![DeclarationId(2693)],
                 output: DeclarationId(2694),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    28719,
-                    28764,
+                    28715,
+                    28760,
                 )),
             },
             type_params: vec![],
@@ -48097,20 +43054,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 28637, 28764),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28633, 28760),
         });
         declarations.push(Declaration {
             id: DeclarationId(1309),
             name: Some("behavior_spine".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828)],
-<<<<<<< HEAD
-                output: DeclarationId(2761),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(813))),
-=======
                 output: DeclarationId(2765),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(815))),
->>>>>>> origin/main
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -48237,22 +43189,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2243),
-=======
                             constructor: DeclarationId(2245),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2246),
-=======
                             constructor: DeclarationId(2248),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -48424,29 +43368,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2324),
-                            payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1911),
-=======
                             constructor: DeclarationId(2326),
                             payload: vec![FieldValue::Variant {
                                 constructor: DeclarationId(1913),
->>>>>>> origin/main
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(
                                         "-2147483648".to_string(),
                                     )),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(1910),
-                                        payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1908),
-=======
                                         constructor: DeclarationId(1912),
                                         payload: vec![FieldValue::Variant {
                                             constructor: DeclarationId(1910),
->>>>>>> origin/main
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 "4294967295".to_string(),
                                             ))],
@@ -48495,11 +43427,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2325),
-=======
                             constructor: DeclarationId(2327),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -48799,11 +43727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2326),
-=======
                                     constructor: DeclarationId(2328),
->>>>>>> origin/main
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "declaration".to_string(),
                                     ))],
@@ -48907,11 +43831,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -48930,11 +43850,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "state".to_string(),
                                         ))],
@@ -48955,11 +43871,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "produced_by".to_string(),
                                         ))],
@@ -49023,11 +43935,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "file".to_string(),
                                         ))],
@@ -49046,11 +43954,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_start".to_string(),
                                         ))],
@@ -49069,11 +43973,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_end".to_string(),
                                         ))],
@@ -49385,11 +44285,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -49408,11 +44304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -49478,11 +44370,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -49501,11 +44389,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -49571,11 +44455,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -49594,11 +44474,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "algebra".to_string(),
                                         ))],
@@ -49663,11 +44539,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2326),
-=======
                                     constructor: DeclarationId(2328),
->>>>>>> origin/main
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "permitted_accessors".to_string(),
                                     ))],
@@ -49730,11 +44602,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -49753,11 +44621,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -49821,11 +44685,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -49844,11 +44704,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -49912,11 +44768,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -49935,11 +44787,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "second".to_string(),
                                         ))],
@@ -49958,11 +44806,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -50026,11 +44870,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2327),
-=======
                                         constructor: DeclarationId(2329),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "member_of".to_string(),
                                         ))],
@@ -50049,11 +44889,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2327),
-=======
                                         constructor: DeclarationId(2329),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "slot_of".to_string(),
                                         ))],
@@ -50116,11 +44952,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2327),
-=======
                                     constructor: DeclarationId(2329),
->>>>>>> origin/main
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "node_id".to_string(),
                                     ))],
@@ -50182,11 +45014,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2326),
-=======
                                     constructor: DeclarationId(2328),
->>>>>>> origin/main
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "param".to_string(),
                                     ))],
@@ -50248,11 +45076,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2326),
-=======
                                     constructor: DeclarationId(2328),
->>>>>>> origin/main
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "transform".to_string(),
                                     ))],
@@ -50315,11 +45139,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "members".to_string(),
                                         ))],
@@ -50340,11 +45160,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "intra_cluster_calls".to_string(),
                                         ))],
@@ -50572,11 +45388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -50595,11 +45407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -50620,11 +45428,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "connective".to_string(),
                                         ))],
@@ -50645,11 +45449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "type_params".to_string(),
                                         ))],
@@ -50670,11 +45470,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "phantom_params".to_string(),
                                         ))],
@@ -50695,11 +45491,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "meta_tag".to_string(),
                                         ))],
@@ -50720,11 +45512,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inhabits".to_string(),
                                         ))],
@@ -50745,11 +45533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value_body".to_string(),
                                         ))],
@@ -50770,11 +45554,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nominal_opacity".to_string(),
                                         ))],
@@ -50793,11 +45573,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -51109,11 +45885,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding_name".to_string(),
                                         ))],
@@ -51134,11 +45906,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload_port".to_string(),
                                         ))],
@@ -51202,11 +45970,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -51227,11 +45991,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -51250,11 +46010,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -51273,11 +46029,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -51382,11 +46134,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -51405,11 +46153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -51430,11 +46174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -51453,11 +46193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -51521,11 +46257,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -51544,11 +46276,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "target".to_string(),
                                         ))],
@@ -51567,11 +46295,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inputs".to_string(),
                                         ))],
@@ -51592,11 +46316,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -51615,11 +46335,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -51683,11 +46399,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -51706,11 +46418,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "input".to_string(),
                                         ))],
@@ -51729,11 +46437,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "paths".to_string(),
                                         ))],
@@ -51754,11 +46458,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -51777,11 +46477,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -51802,11 +46498,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -51870,11 +46562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -51893,11 +46581,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "source".to_string(),
                                         ))],
@@ -51916,11 +46600,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "init".to_string(),
                                         ))],
@@ -51939,11 +46619,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -51962,11 +46638,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "bound".to_string(),
                                         ))],
@@ -51987,11 +46659,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -52010,11 +46678,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -52078,11 +46742,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -52101,11 +46761,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -52126,11 +46782,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -52149,11 +46801,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "params".to_string(),
                                         ))],
@@ -52172,11 +46820,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -52197,11 +46841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -52308,11 +46948,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "declarations".to_string(),
                                         ))],
@@ -52331,11 +46967,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nodes".to_string(),
                                         ))],
@@ -52354,11 +46986,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ports".to_string(),
                                         ))],
@@ -52379,11 +47007,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "clusters".to_string(),
                                         ))],
@@ -52446,11 +47070,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2326),
-=======
                                     constructor: DeclarationId(2328),
->>>>>>> origin/main
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "items".to_string(),
                                     ))],
@@ -52554,11 +47174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -52577,11 +47193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -52602,11 +47214,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "refinement".to_string(),
                                         ))],
@@ -52670,11 +47278,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -52693,11 +47297,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -52761,11 +47361,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -52784,11 +47380,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -52807,11 +47399,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -52957,11 +47545,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -52980,11 +47564,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -53003,11 +47583,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -53071,11 +47647,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key".to_string(),
                                         ))],
@@ -53096,11 +47668,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key_span".to_string(),
                                         ))],
@@ -53119,11 +47687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -53142,11 +47706,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -53210,11 +47770,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -53233,11 +47789,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -53256,11 +47808,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -53324,11 +47872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -53347,11 +47891,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -53370,11 +47910,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -54327,11 +48863,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2339),
-=======
                             constructor: DeclarationId(2341),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -54371,8 +48903,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2340),
+                            constructor: DeclarationId(2342),
                             payload: vec![],
                         },
                     ),
@@ -54386,7 +48917,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2330),
+                                    constructor: DeclarationId(2332),
                                     payload: vec![],
                                 },
                             ),
@@ -54403,7 +48934,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 25626, 25818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1407),
+            id: DeclarationId(1410),
             name: Some("go_cons_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -54418,7 +48949,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1431)),
+                        FieldValue::Reference(DeclarationId(1434)),
                     ),
                     (
                         "target".to_string(),
@@ -54427,7 +48958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2341),
+                            constructor: DeclarationId(2343),
                             payload: vec![],
                         },
                     ),
@@ -54442,7 +48973,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
+                                        constructor: DeclarationId(2332),
                                         payload: vec![],
                                     },
                                 ),
@@ -54455,7 +48986,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
+                                        constructor: DeclarationId(2332),
                                         payload: vec![],
                                     },
                                 ),
@@ -54473,7 +49004,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 25820, 26037),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1408),
+            id: DeclarationId(1411),
             name: Some("go_concat_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -54484,137 +49015,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             meta_tag: Some(DeclarationId(1023)),
             specialization_parent: None,
             inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![
-                    (
-                        "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1431)),
-                    ),
-                    (
-                        "target".to_string(),
-                        FieldValue::Reference(DeclarationId(699)),
-                    ),
-                    (
-                        "strategy".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2342),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "parameters".to_string(),
-                        FieldValue::List(vec![
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("0".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                        ]),
-                    ),
-                    (
-                        "cost".to_string(),
-                        FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                    ),
-                ],
-            }),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/go.dag", 26039, 26262),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1409),
-            name: Some("go_length_callable".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
-                arguments: vec![],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
-            specialization_parent: None,
-            inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![
-                    (
-                        "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1431)),
-                    ),
-                    (
-                        "target".to_string(),
-                        FieldValue::Reference(DeclarationId(709)),
-                    ),
-                    (
-                        "strategy".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2343),
-=======
-                            constructor: DeclarationId(2342),
->>>>>>> origin/main
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "parameters".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "slot".to_string(),
-                                FieldValue::Literal(LiteralBits::Int("0".to_string())),
-                            ),
-                            (
-                                "disposition".to_string(),
-                                FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2329),
-=======
-                                    constructor: DeclarationId(2332),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                    (
-                        "cost".to_string(),
-                        FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                    ),
-                ],
-            }),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/go.dag", 25626, 25818),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1410),
-            name: Some("go_cons_callable".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
-                arguments: vec![],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
-            specialization_parent: None,
-            inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
@@ -54623,82 +49023,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(689)),
+                        FieldValue::Reference(DeclarationId(699)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2343),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "parameters".to_string(),
-                        FieldValue::List(vec![
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("0".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                        ]),
-                    ),
-                    (
-                        "cost".to_string(),
-                        FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                    ),
-                ],
-            }),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/go.dag", 25820, 26037),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1411),
-            name: Some("go_concat_callable".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
-                arguments: vec![],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
-            specialization_parent: None,
-            inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![
-                    (
-                        "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1434)),
-                    ),
-                    (
-                        "target".to_string(),
-                        FieldValue::Reference(DeclarationId(699)),
-                    ),
-                    (
-                        "strategy".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2344),
+                            constructor: DeclarationId(2344),
                             payload: vec![],
                         },
                     ),
@@ -54783,7 +49113,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "disposition".to_string(),
                                 FieldValue::Variant {
                                     constructor: DeclarationId(2331),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -54934,11 +49263,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2344),
-=======
                             constructor: DeclarationId(2346),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -54952,11 +49277,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2329),
-=======
                                     constructor: DeclarationId(2331),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -54997,160 +49318,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2345),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "parameters".to_string(),
-                        FieldValue::List(vec![
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("0".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("2".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                        ]),
-                    ),
-                    (
-                        "cost".to_string(),
-                        FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                    ),
-                ],
-            }),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/go.dag", 27758, 28015),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1415),
-            name: Some("go_map_callable".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
-                arguments: vec![],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
-            specialization_parent: None,
-            inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![
-                    (
-                        "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1431)),
-                    ),
-                    (
-                        "target".to_string(),
-                        FieldValue::Reference(DeclarationId(701)),
-                    ),
-                    (
-                        "strategy".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2346),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "parameters".to_string(),
-                        FieldValue::List(vec![
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("0".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                        ]),
-                    ),
-                    (
-                        "cost".to_string(),
-                        FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                    ),
-                ],
-            }),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/go.dag", 28017, 28231),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1416),
-            name: Some("go_filter_callable".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
-                arguments: vec![],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
-            specialization_parent: None,
-            inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![
-                    (
-                        "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1431)),
-                    ),
-                    (
-                        "target".to_string(),
-                        FieldValue::Reference(DeclarationId(704)),
-                    ),
-                    (
-                        "strategy".to_string(),
-                        FieldValue::Variant {
                             constructor: DeclarationId(2347),
                             payload: vec![],
                         },
@@ -55166,84 +49333,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                        ]),
-                    ),
-                    (
-                        "cost".to_string(),
-                        FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                    ),
-                ],
-            }),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/go.dag", 28233, 28456),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1417),
-            name: Some("go_contains_callable".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
-                arguments: vec![],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
-            specialization_parent: None,
-            inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![
-                    (
-                        "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1431)),
-                    ),
-                    (
-                        "target".to_string(),
-                        FieldValue::Reference(DeclarationId(719)),
-                    ),
-                    (
-                        "strategy".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2348),
-=======
-                            constructor: DeclarationId(2347),
->>>>>>> origin/main
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "parameters".to_string(),
-                        FieldValue::List(vec![
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("0".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2329),
-=======
                                         constructor: DeclarationId(2331),
->>>>>>> origin/main
                                         payload: vec![],
                                     },
                                 ),
@@ -55256,9 +49346,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2329),
-=======
                                         constructor: DeclarationId(2332),
                                         payload: vec![],
                                     },
@@ -55483,7 +49570,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                     "disposition".to_string(),
                                     FieldValue::Variant {
                                         constructor: DeclarationId(2331),
->>>>>>> origin/main
                                         payload: vec![],
                                     },
                                 ),
@@ -55525,29 +49611,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2350),
-=======
                             constructor: DeclarationId(2352),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-<<<<<<< HEAD
-                        FieldValue::Reference(DeclarationId(1816)),
-                    ),
-                    (
-                        "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1818)),
-=======
                         FieldValue::Reference(DeclarationId(1818)),
                     ),
                     (
                         "cons_variant".to_string(),
                         FieldValue::Reference(DeclarationId(1820)),
->>>>>>> origin/main
                     ),
                     (
                         "scrutinee".to_string(),
@@ -56185,77 +50259,49 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2177),
-=======
                             constructor: DeclarationId(2179),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2180),
-=======
                             constructor: DeclarationId(2182),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2183),
-=======
                             constructor: DeclarationId(2185),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2186),
-=======
                             constructor: DeclarationId(2188),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2190),
-=======
                             constructor: DeclarationId(2192),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2192),
-=======
                             constructor: DeclarationId(2194),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2196),
-=======
                             constructor: DeclarationId(2198),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -56287,11 +50333,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2199),
-=======
                                     constructor: DeclarationId(2201),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -56895,22 +50937,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2243),
-=======
                             constructor: DeclarationId(2245),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2246),
-=======
                             constructor: DeclarationId(2248),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -57039,29 +51073,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2324),
-                            payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1911),
-=======
                             constructor: DeclarationId(2326),
                             payload: vec![FieldValue::Variant {
                                 constructor: DeclarationId(1913),
->>>>>>> origin/main
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(
                                         "-2147483648".to_string(),
                                     )),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(1910),
-                                        payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1908),
-=======
                                         constructor: DeclarationId(1912),
                                         payload: vec![FieldValue::Variant {
                                             constructor: DeclarationId(1910),
->>>>>>> origin/main
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 "4294967295".to_string(),
                                             ))],
@@ -57110,15 +51132,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2324),
-                            payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1912),
-=======
                             constructor: DeclarationId(2326),
                             payload: vec![FieldValue::Variant {
                                 constructor: DeclarationId(1914),
->>>>>>> origin/main
                                 payload: vec![],
                             }],
                         },
@@ -57829,11 +51845,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2326),
-=======
                                     constructor: DeclarationId(2328),
->>>>>>> origin/main
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "items".to_string(),
                                     ))],
@@ -57937,11 +51949,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -57960,11 +51968,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -57985,11 +51989,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "refinement".to_string(),
                                         ))],
@@ -58053,11 +52053,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -58076,11 +52072,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -58144,11 +52136,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -58167,11 +52155,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -58190,11 +52174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -58340,11 +52320,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -58363,11 +52339,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -58386,11 +52358,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -58454,11 +52422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key".to_string(),
                                         ))],
@@ -58479,11 +52443,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key_span".to_string(),
                                         ))],
@@ -58502,11 +52462,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -58525,11 +52481,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -58593,11 +52545,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -58616,11 +52564,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -58639,11 +52583,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -58707,11 +52647,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -58730,11 +52666,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -58753,11 +52685,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -59485,11 +53413,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2339),
-=======
                             constructor: DeclarationId(2341),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -59529,209 +53453,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2340),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "parameters".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "slot".to_string(),
-                                FieldValue::Literal(LiteralBits::Int("0".to_string())),
-                            ),
-                            (
-                                "disposition".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2330),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                    (
-                        "cost".to_string(),
-                        FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                    ),
-                ],
-            }),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/python.dag", 16246, 16446),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1501),
-            name: Some("python_cons_callable".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
-                arguments: vec![],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
-            specialization_parent: None,
-            inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![
-                    (
-                        "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1447)),
-                    ),
-                    (
-                        "target".to_string(),
-                        FieldValue::Reference(DeclarationId(689)),
-                    ),
-                    (
-                        "strategy".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2341),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "parameters".to_string(),
-                        FieldValue::List(vec![
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("0".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                        ]),
-                    ),
-                    (
-                        "cost".to_string(),
-                        FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                    ),
-                ],
-            }),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/python.dag", 16448, 16673),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1502),
-            name: Some("python_concat_callable".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
-                arguments: vec![],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
-            specialization_parent: None,
-            inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![
-                    (
-                        "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1447)),
-                    ),
-                    (
-                        "target".to_string(),
-                        FieldValue::Reference(DeclarationId(699)),
-                    ),
-                    (
-                        "strategy".to_string(),
-                        FieldValue::Variant {
                             constructor: DeclarationId(2342),
                             payload: vec![],
                         },
                     ),
-                    (
-                        "parameters".to_string(),
-                        FieldValue::List(vec![
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("0".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                        ]),
-                    ),
-                    (
-                        "cost".to_string(),
-                        FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                    ),
-                ],
-            }),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/python.dag", 16675, 16906),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1503),
-            name: Some("python_length_callable".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
-                arguments: vec![],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
-            specialization_parent: None,
-            inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![
-                    (
-                        "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1447)),
-                    ),
-                    (
-                        "target".to_string(),
-                        FieldValue::Reference(DeclarationId(709)),
-                    ),
-                    (
-                        "strategy".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2343),
-=======
-                            constructor: DeclarationId(2342),
->>>>>>> origin/main
-                            payload: vec![],
-                        },
-                    ),
                     (
                         "parameters".to_string(),
                         FieldValue::List(vec![FieldValue::Record(vec![
@@ -59742,11 +53467,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2329),
-=======
                                     constructor: DeclarationId(2332),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -59787,27 +53508,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2344),
+                            constructor: DeclarationId(2343),
                             payload: vec![],
                         },
                     ),
                     (
                         "parameters".to_string(),
-<<<<<<< HEAD
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "slot".to_string(),
-                                FieldValue::Literal(LiteralBits::Int("0".to_string())),
-                            ),
-                            (
-                                "disposition".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2329),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-=======
                         FieldValue::List(vec![
                             FieldValue::Record(vec![
                                 (
@@ -59836,7 +53542,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 ),
                             ]),
                         ]),
->>>>>>> origin/main
                     ),
                     (
                         "cost".to_string(),
@@ -59873,7 +53578,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2345),
+                            constructor: DeclarationId(2344),
                             payload: vec![],
                         },
                     ),
@@ -59888,11 +53593,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2329),
-=======
                                         constructor: DeclarationId(2332),
->>>>>>> origin/main
                                         payload: vec![],
                                     },
                                 ),
@@ -59905,24 +53606,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2330),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("2".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
-=======
                                         constructor: DeclarationId(2332),
->>>>>>> origin/main
                                         payload: vec![],
                                     },
                                 ),
@@ -59964,42 +53648,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2346),
+                            constructor: DeclarationId(2345),
                             payload: vec![],
                         },
                     ),
                     (
                         "parameters".to_string(),
-<<<<<<< HEAD
-                        FieldValue::List(vec![
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("0".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                        ]),
-=======
                         FieldValue::List(vec![FieldValue::Record(vec![
                             (
                                 "slot".to_string(),
@@ -60013,7 +53667,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 },
                             ),
                         ])]),
->>>>>>> origin/main
                     ),
                     (
                         "cost".to_string(),
@@ -60050,42 +53703,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2347),
+                            constructor: DeclarationId(2346),
                             payload: vec![],
                         },
                     ),
                     (
                         "parameters".to_string(),
-<<<<<<< HEAD
-                        FieldValue::List(vec![
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("0".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                        ]),
-=======
                         FieldValue::List(vec![FieldValue::Record(vec![
                             (
                                 "slot".to_string(),
@@ -60099,7 +53722,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 },
                             ),
                         ])]),
->>>>>>> origin/main
                     ),
                     (
                         "cost".to_string(),
@@ -60136,7 +53758,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2348),
+                            constructor: DeclarationId(2347),
                             payload: vec![],
                         },
                     ),
@@ -60151,11 +53773,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2329),
-=======
                                         constructor: DeclarationId(2331),
->>>>>>> origin/main
                                         payload: vec![],
                                     },
                                 ),
@@ -60168,9 +53786,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2329),
-=======
                                         constructor: DeclarationId(2332),
                                         payload: vec![],
                                     },
@@ -60395,7 +54010,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                     "disposition".to_string(),
                                     FieldValue::Variant {
                                         constructor: DeclarationId(2331),
->>>>>>> origin/main
                                         payload: vec![],
                                     },
                                 ),
@@ -60550,29 +54164,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2350),
-=======
                             constructor: DeclarationId(2352),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-<<<<<<< HEAD
-                        FieldValue::Reference(DeclarationId(1816)),
-                    ),
-                    (
-                        "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1818)),
-=======
                         FieldValue::Reference(DeclarationId(1818)),
                     ),
                     (
                         "cons_variant".to_string(),
                         FieldValue::Reference(DeclarationId(1820)),
->>>>>>> origin/main
                     ),
                     (
                         "scrutinee".to_string(),
@@ -60657,77 +54259,49 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2177),
-=======
                             constructor: DeclarationId(2179),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2182),
-=======
                             constructor: DeclarationId(2184),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2183),
-=======
                             constructor: DeclarationId(2185),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2186),
-=======
                             constructor: DeclarationId(2188),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2190),
-=======
                             constructor: DeclarationId(2192),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2191),
-=======
                             constructor: DeclarationId(2193),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2196),
-=======
                             constructor: DeclarationId(2198),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -60762,11 +54336,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2198),
-=======
                                     constructor: DeclarationId(2200),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -60823,22 +54393,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2245),
-=======
                             constructor: DeclarationId(2247),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2246),
-=======
                             constructor: DeclarationId(2248),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -61256,17 +54818,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2324),
-                            payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1911),
-                                payload: vec![
-                                    FieldValue::Literal(LiteralBits::Int("0".to_string())),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(1910),
-                                        payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1908),
-=======
                             constructor: DeclarationId(2326),
                             payload: vec![FieldValue::Variant {
                                 constructor: DeclarationId(1913),
@@ -61276,7 +54827,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                         constructor: DeclarationId(1912),
                                         payload: vec![FieldValue::Variant {
                                             constructor: DeclarationId(1910),
->>>>>>> origin/main
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 "4294967295".to_string(),
                                             ))],
@@ -61325,29 +54875,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2324),
-                            payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1911),
-=======
                             constructor: DeclarationId(2326),
                             payload: vec![FieldValue::Variant {
                                 constructor: DeclarationId(1913),
->>>>>>> origin/main
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(
                                         "-2147483648".to_string(),
                                     )),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(1910),
-                                        payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1908),
-=======
                                         constructor: DeclarationId(1912),
                                         payload: vec![FieldValue::Variant {
                                             constructor: DeclarationId(1910),
->>>>>>> origin/main
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 "4294967295".to_string(),
                                             ))],
@@ -61396,11 +54934,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2323),
-=======
                             constructor: DeclarationId(2325),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -61443,11 +54977,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2323),
-=======
                             constructor: DeclarationId(2325),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -61490,11 +55020,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2323),
-=======
                             constructor: DeclarationId(2325),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -61537,11 +55063,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2323),
-=======
                             constructor: DeclarationId(2325),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -61584,11 +55106,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2325),
-=======
                             constructor: DeclarationId(2327),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -61631,11 +55149,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2325),
-=======
                             constructor: DeclarationId(2327),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -61935,11 +55449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2326),
-=======
                                     constructor: DeclarationId(2328),
->>>>>>> origin/main
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "declaration".to_string(),
                                     ))],
@@ -62043,11 +55553,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2327),
-=======
                                         constructor: DeclarationId(2329),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -62066,11 +55572,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2327),
-=======
                                         constructor: DeclarationId(2329),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "state_value".to_string(),
                                         ))],
@@ -62091,11 +55593,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "produced_by".to_string(),
                                         ))],
@@ -62159,11 +55657,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "file".to_string(),
                                         ))],
@@ -62182,11 +55676,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_start".to_string(),
                                         ))],
@@ -62205,11 +55695,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_end".to_string(),
                                         ))],
@@ -62521,11 +56007,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -62544,11 +56026,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -62614,11 +56092,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -62637,11 +56111,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -62707,11 +56177,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -62730,11 +56196,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "algebra".to_string(),
                                         ))],
@@ -62799,11 +56261,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2326),
-=======
                                     constructor: DeclarationId(2328),
->>>>>>> origin/main
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "permitted_accessors".to_string(),
                                     ))],
@@ -62868,11 +56326,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "0".to_string(),
                                         ))],
@@ -62891,11 +56345,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "1".to_string(),
                                         ))],
@@ -62959,11 +56409,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -62982,11 +56428,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -63050,11 +56492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -63073,11 +56511,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "second".to_string(),
                                         ))],
@@ -63096,11 +56530,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -63163,11 +56593,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2327),
-=======
                                     constructor: DeclarationId(2329),
->>>>>>> origin/main
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "index_of".to_string(),
                                     ))],
@@ -63230,11 +56656,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2327),
-=======
                                         constructor: DeclarationId(2329),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "member_of".to_string(),
                                         ))],
@@ -63253,11 +56675,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2327),
-=======
                                         constructor: DeclarationId(2329),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "slot_of".to_string(),
                                         ))],
@@ -63320,11 +56738,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2327),
-=======
                                     constructor: DeclarationId(2329),
->>>>>>> origin/main
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "node_id".to_string(),
                                     ))],
@@ -63386,11 +56800,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2326),
-=======
                                     constructor: DeclarationId(2328),
->>>>>>> origin/main
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "param".to_string(),
                                     ))],
@@ -63452,11 +56862,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2326),
-=======
                                     constructor: DeclarationId(2328),
->>>>>>> origin/main
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "transform".to_string(),
                                     ))],
@@ -63519,11 +56925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "members".to_string(),
                                         ))],
@@ -63544,11 +56946,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "intra_cluster_calls".to_string(),
                                         ))],
@@ -63776,11 +57174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -63799,11 +57193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -63824,11 +57214,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "connective".to_string(),
                                         ))],
@@ -63849,11 +57235,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "type_params".to_string(),
                                         ))],
@@ -63874,11 +57256,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "phantom_params".to_string(),
                                         ))],
@@ -63899,11 +57277,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "meta_tag".to_string(),
                                         ))],
@@ -63924,11 +57298,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inhabits".to_string(),
                                         ))],
@@ -63949,11 +57319,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value_body".to_string(),
                                         ))],
@@ -63974,11 +57340,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nominal_opacity".to_string(),
                                         ))],
@@ -63997,11 +57359,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -64313,11 +57671,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding_name".to_string(),
                                         ))],
@@ -64338,11 +57692,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload_port".to_string(),
                                         ))],
@@ -64406,11 +57756,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -64431,11 +57777,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2327),
-=======
                                         constructor: DeclarationId(2329),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -64454,11 +57796,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -64477,11 +57815,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -64586,11 +57920,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -64609,11 +57939,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "data".to_string(),
                                         ))],
@@ -64634,11 +57960,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2327),
-=======
                                         constructor: DeclarationId(2329),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -64657,11 +57979,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -64682,11 +58000,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2327),
-=======
                                         constructor: DeclarationId(2329),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "lane2_workflow".to_string(),
                                         ))],
@@ -64750,11 +58064,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -64773,11 +58083,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "target".to_string(),
                                         ))],
@@ -64796,11 +58102,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inputs".to_string(),
                                         ))],
@@ -64821,11 +58123,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2327),
-=======
                                         constructor: DeclarationId(2329),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -64844,11 +58142,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -64912,11 +58206,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -64935,11 +58225,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "input".to_string(),
                                         ))],
@@ -64958,11 +58244,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "paths".to_string(),
                                         ))],
@@ -64983,11 +58265,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2327),
-=======
                                         constructor: DeclarationId(2329),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -65006,11 +58284,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -65031,11 +58305,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2327),
-=======
                                         constructor: DeclarationId(2329),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -65099,11 +58369,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -65122,11 +58388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "source".to_string(),
                                         ))],
@@ -65145,11 +58407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "init".to_string(),
                                         ))],
@@ -65168,11 +58426,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -65191,11 +58445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "bound".to_string(),
                                         ))],
@@ -65216,11 +58466,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2327),
-=======
                                         constructor: DeclarationId(2329),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -65239,11 +58485,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -65307,11 +58549,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -65330,11 +58568,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -65355,11 +58589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2327),
-=======
                                         constructor: DeclarationId(2329),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -65378,11 +58608,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "params".to_string(),
                                         ))],
@@ -65401,11 +58627,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -65426,11 +58648,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2327),
-=======
                                         constructor: DeclarationId(2329),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "lane2_workflow".to_string(),
                                         ))],
@@ -65451,11 +58669,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2327),
-=======
                                         constructor: DeclarationId(2329),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -65562,11 +58776,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2327),
-=======
                                         constructor: DeclarationId(2329),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "declarations".to_string(),
                                         ))],
@@ -65585,11 +58795,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2327),
-=======
                                         constructor: DeclarationId(2329),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nodes".to_string(),
                                         ))],
@@ -65608,11 +58814,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2327),
-=======
                                         constructor: DeclarationId(2329),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ports".to_string(),
                                         ))],
@@ -65633,11 +58835,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2327),
-=======
                                         constructor: DeclarationId(2329),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "clusters".to_string(),
                                         ))],
@@ -65702,11 +58900,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2326),
-=======
                                     constructor: DeclarationId(2328),
->>>>>>> origin/main
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "items".to_string(),
                                     ))],
@@ -65814,11 +59008,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -65837,11 +59027,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -65862,11 +59048,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "refinement".to_string(),
                                         ))],
@@ -65932,11 +59114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -65955,11 +59133,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -66025,11 +59199,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -66048,11 +59218,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -66071,11 +59237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -66227,11 +59389,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -66250,11 +59408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -66273,11 +59427,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -66343,11 +59493,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key".to_string(),
                                         ))],
@@ -66368,11 +59514,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key_span".to_string(),
                                         ))],
@@ -66391,11 +59533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -66414,11 +59552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -66484,11 +59618,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -66507,11 +59637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -66530,11 +59656,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -66600,11 +59722,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -66623,11 +59741,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -66646,11 +59760,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2326),
-=======
                                         constructor: DeclarationId(2328),
->>>>>>> origin/main
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -67647,11 +60757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2339),
-=======
                             constructor: DeclarationId(2341),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -67691,206 +60797,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2340),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "parameters".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "slot".to_string(),
-                                FieldValue::Literal(LiteralBits::Int("0".to_string())),
-                            ),
-                            (
-                                "disposition".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2330),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                    (
-                        "cost".to_string(),
-                        FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                    ),
-                ],
-            }),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 37227, 37423),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1624),
-            name: Some("rust_cons_callable".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
-                arguments: vec![],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
-            specialization_parent: None,
-            inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![
-                    (
-                        "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1660)),
-                    ),
-                    (
-                        "target".to_string(),
-                        FieldValue::Reference(DeclarationId(689)),
-                    ),
-                    (
-                        "strategy".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2341),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "parameters".to_string(),
-                        FieldValue::List(vec![
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("0".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                        ]),
-                    ),
-                    (
-                        "cost".to_string(),
-                        FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                    ),
-                ],
-            }),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 37425, 37646),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1625),
-            name: Some("rust_concat_callable".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
-                arguments: vec![],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
-            specialization_parent: None,
-            inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![
-                    (
-                        "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1660)),
-                    ),
-                    (
-                        "target".to_string(),
-                        FieldValue::Reference(DeclarationId(699)),
-                    ),
-                    (
-                        "strategy".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2342),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "parameters".to_string(),
-                        FieldValue::List(vec![
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("0".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                        ]),
-                    ),
-                    (
-                        "cost".to_string(),
-                        FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                    ),
-                ],
-            }),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 37648, 37875),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1626),
-            name: Some("rust_length_callable".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
-                arguments: vec![],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
-            specialization_parent: None,
-            inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![
-                    (
-                        "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1660)),
-                    ),
-                    (
-                        "target".to_string(),
-                        FieldValue::Reference(DeclarationId(709)),
-                    ),
-                    (
-                        "strategy".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2343),
-=======
                             constructor: DeclarationId(2342),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -67904,9 +60811,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2329),
-=======
                                     constructor: DeclarationId(2332),
                                     payload: vec![],
                                 },
@@ -68103,7 +61007,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 "disposition".to_string(),
                                 FieldValue::Variant {
                                     constructor: DeclarationId(2331),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -68476,11 +61379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2344),
-=======
                             constructor: DeclarationId(2346),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -68494,11 +61393,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2329),
-=======
                                     constructor: DeclarationId(2331),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -68539,8 +61434,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2345),
+                            constructor: DeclarationId(2347),
                             payload: vec![],
                         },
                     ),
@@ -68555,7 +61449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2331),
                                         payload: vec![],
                                     },
                                 ),
@@ -68568,7 +61462,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2330),
+                                        constructor: DeclarationId(2332),
                                         payload: vec![],
                                     },
                                 ),
@@ -68581,7 +61475,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2331),
                                         payload: vec![],
                                     },
                                 ),
@@ -68599,7 +61493,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 39982, 40243),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1638),
+            id: DeclarationId(1641),
             name: Some("rust_map_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
@@ -68614,159 +61508,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1660)),
+                        FieldValue::Reference(DeclarationId(1663)),
                     ),
                     (
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(701)),
                     ),
-                    (
-                        "strategy".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2346),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "parameters".to_string(),
-                        FieldValue::List(vec![
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("0".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                        ]),
-                    ),
-                    (
-                        "cost".to_string(),
-                        FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                    ),
-                ],
-            }),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 40245, 40463),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1639),
-            name: Some("rust_filter_callable".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
-                arguments: vec![],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
-            specialization_parent: None,
-            inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![
-                    (
-                        "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1660)),
-                    ),
-                    (
-                        "target".to_string(),
-                        FieldValue::Reference(DeclarationId(704)),
-                    ),
-                    (
-                        "strategy".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2347),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "parameters".to_string(),
-                        FieldValue::List(vec![
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("0".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                        ]),
-                    ),
-                    (
-                        "cost".to_string(),
-                        FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                    ),
-                ],
-            }),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 40465, 40692),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1640),
-            name: Some("rust_contains_callable".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
-                arguments: vec![],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
-            specialization_parent: None,
-            inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![
-                    (
-                        "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1660)),
-                    ),
-                    (
-                        "target".to_string(),
-                        FieldValue::Reference(DeclarationId(719)),
-                    ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
                             constructor: DeclarationId(2348),
-=======
-                            constructor: DeclarationId(2347),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -68781,11 +61532,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2329),
-=======
                                         constructor: DeclarationId(2331),
->>>>>>> origin/main
                                         payload: vec![],
                                     },
                                 ),
@@ -68798,22 +61545,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-<<<<<<< HEAD
-                                        constructor: DeclarationId(2329),
-=======
-                                        constructor: DeclarationId(2332),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("2".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
                                         constructor: DeclarationId(2331),
                                         payload: vec![],
                                     },
@@ -68829,11 +61560,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 39982, 40243),
+            span: SourceSpan::new("src/v3/spec/rust.dag", 40245, 40463),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1641),
-            name: Some("rust_map_callable".to_string()),
+            id: DeclarationId(1642),
+            name: Some("rust_filter_callable".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1023),
                 arguments: vec![],
@@ -68851,82 +61582,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(701)),
+                        FieldValue::Reference(DeclarationId(704)),
                     ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2348),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "parameters".to_string(),
-                        FieldValue::List(vec![
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("0".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2331),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2331),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                        ]),
-                    ),
-                    (
-                        "cost".to_string(),
-                        FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                    ),
-                ],
-            }),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 40245, 40463),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1642),
-            name: Some("rust_filter_callable".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
-                arguments: vec![],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
-            specialization_parent: None,
-            inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![
-                    (
-                        "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
-                    ),
-                    (
-                        "target".to_string(),
-                        FieldValue::Reference(DeclarationId(704)),
-                    ),
-                    (
-                        "strategy".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2349),
+                            constructor: DeclarationId(2349),
                             payload: vec![],
                         },
                     ),
@@ -69025,7 +61686,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                     "disposition".to_string(),
                                     FieldValue::Variant {
                                         constructor: DeclarationId(2331),
->>>>>>> origin/main
                                         payload: vec![],
                                     },
                                 ),
@@ -69067,29 +61727,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2350),
-=======
                             constructor: DeclarationId(2352),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-<<<<<<< HEAD
-                        FieldValue::Reference(DeclarationId(1816)),
-                    ),
-                    (
-                        "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1818)),
-=======
                         FieldValue::Reference(DeclarationId(1818)),
                     ),
                     (
                         "cons_variant".to_string(),
                         FieldValue::Reference(DeclarationId(1820)),
->>>>>>> origin/main
                     ),
                     (
                         "scrutinee".to_string(),
@@ -69523,11 +62171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{ let mut __left = {left}; __left.extend({right}); __left }"
                                     .to_string(),
@@ -69541,11 +62185,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -69585,11 +62225,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).len() as i64".to_string(),
                             ))],
@@ -69602,11 +62238,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -69644,11 +62276,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).is_empty()".to_string(),
                             ))],
@@ -69661,11 +62289,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -69705,11 +62329,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).iter().fold({init}, {body})".to_string(),
                             ))],
@@ -69722,11 +62342,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -69766,11 +62382,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2357),
-=======
                             constructor: DeclarationId(2359),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).iter().map({body}).collect::<Vec<_>>()".to_string(),
                             ))],
@@ -69783,11 +62395,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2356),
-=======
                             constructor: DeclarationId(2358),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -69859,22 +62467,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "read".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2351),
-=======
                             constructor: DeclarationId(2353),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "construct".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2353),
-=======
                             constructor: DeclarationId(2355),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -70005,77 +62605,49 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2177),
-=======
                             constructor: DeclarationId(2179),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2180),
-=======
                             constructor: DeclarationId(2182),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2184),
-=======
                             constructor: DeclarationId(2186),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2186),
-=======
                             constructor: DeclarationId(2188),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2189),
-=======
                             constructor: DeclarationId(2191),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2192),
-=======
                             constructor: DeclarationId(2194),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2195),
-=======
                             constructor: DeclarationId(2197),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -70113,11 +62685,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(2198),
-=======
                                     constructor: DeclarationId(2200),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -70728,13 +63296,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "SnapshotSurface".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2762),
-                    },
-                    Field {
-                        label: "SnapshotDag".to_string(),
-                        ty: DeclarationId(2763),
-=======
                         ty: DeclarationId(2766),
                     },
                     Field {
@@ -70744,11 +63305,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "SnapshotText".to_string(),
                         ty: DeclarationId(2768),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "SnapshotText".to_string(),
-                        ty: DeclarationId(2764),
                     },
                 ],
             },
@@ -70948,116 +63504,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-<<<<<<< HEAD
-            meta_tag: Some(DeclarationId(1685)),
-            specialization_parent: None,
-            inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![
-                    (
-                        "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1698)),
-                    ),
-                    (
-                        "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1686)),
-                    ),
-                    (
-                        "snapshot".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2762),
-                            payload: vec![],
-                        },
-                    ),
-                ],
-            }),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1254, 1382),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1693),
-            name: Some("lower_stage_binding".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1685),
-                arguments: vec![],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1685)),
-            specialization_parent: None,
-            inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![
-                    (
-                        "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1699)),
-                    ),
-                    (
-                        "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1687)),
-                    ),
-                    (
-                        "snapshot".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2763),
-                            payload: vec![],
-                        },
-                    ),
-                ],
-            }),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1384, 1508),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1694),
-            name: Some("infer_stage_binding".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1685),
-                arguments: vec![],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1685)),
-            specialization_parent: None,
-            inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![
-                    (
-                        "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1700)),
-                    ),
-                    (
-                        "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1688)),
-                    ),
-                    (
-                        "snapshot".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2763),
-                            payload: vec![],
-                        },
-                    ),
-                ],
-            }),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1510, 1634),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1695),
-            name: Some("compute_ownership_stage_binding".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1685),
-                arguments: vec![],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1685)),
-=======
             meta_tag: Some(DeclarationId(1688)),
->>>>>>> origin/main
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -71073,11 +63520,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2763),
-=======
                             constructor: DeclarationId(2766),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -71112,11 +63555,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2763),
-=======
                             constructor: DeclarationId(2767),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -71151,9 +63590,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2764),
-=======
                             constructor: DeclarationId(2767),
                             payload: vec![],
                         },
@@ -71260,7 +63696,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "snapshot".to_string(),
                         FieldValue::Variant {
                             constructor: DeclarationId(2768),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -71410,11 +63845,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("from_symbol".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230)],
-<<<<<<< HEAD
-                output: DeclarationId(2765),
-=======
                 output: DeclarationId(2769),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/compiler/operators.dag",
                     156,
@@ -71644,47 +64075,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2818, 3035),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1713),
-            name: Some("lens_parallelism_entry".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1708),
-                arguments: vec![],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1708)),
-            specialization_parent: None,
-            inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![
-                    (
-                        "name".to_string(),
-                        FieldValue::Literal(LiteralBits::String("parallelism".to_string())),
-                    ),
-                    (
-                        "lens_file".to_string(),
-                        FieldValue::Literal(LiteralBits::String(
-                            "src/v3/lenses/parallelism.dag".to_string(),
-                        )),
-                    ),
-                    (
-                        "generated_file".to_string(),
-                        FieldValue::Literal(LiteralBits::String(
-                            "src/v3/compiler/src/lens_parallelism_generated.rs".to_string(),
-                        )),
-                    ),
-                ],
-            }),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 3037, 3226),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1714),
-=======
             id: DeclarationId(1716),
->>>>>>> origin/main
             name: Some("lens_provenance_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1711),
@@ -71717,14 +64108,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 3228, 3413),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 3037, 3222),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1715),
-=======
             id: DeclarationId(1717),
->>>>>>> origin/main
             name: Some("lens_structural_resolution_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1711),
@@ -71760,14 +64147,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 3415, 3644),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 3224, 3453),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1716),
-=======
             id: DeclarationId(1718),
->>>>>>> origin/main
             name: Some("lens_unused_parameters_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1711),
@@ -71800,14 +64183,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 3646, 3859),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 3455, 3668),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1717),
-=======
             id: DeclarationId(1719),
->>>>>>> origin/main
             name: Some("lens_infer_helpers_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1711),
@@ -71840,14 +64219,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 4486, 4678),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 4295, 4487),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1718),
-=======
             id: DeclarationId(1720),
->>>>>>> origin/main
             name: Some("lens_variant_payload_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1711),
@@ -71880,14 +64255,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 4680, 4880),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 4489, 4689),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1719),
-=======
             id: DeclarationId(1721),
->>>>>>> origin/main
             name: Some("lens_lower_helpers_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1711),
@@ -71920,32 +64291,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 5130, 5322),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 4939, 5131),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1720),
-=======
             id: DeclarationId(1722),
->>>>>>> origin/main
             name: Some("IntegerAlgebra".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "OrderedRingAlgebra".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2766),
-                    },
-                    Field {
-                        label: "SemiringAlgebra".to_string(),
-                        ty: DeclarationId(2767),
-=======
                         ty: DeclarationId(2770),
                     },
                     Field {
                         label: "SemiringAlgebra".to_string(),
                         ty: DeclarationId(2771),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -71960,23 +64319,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6404, 6466),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1721),
-=======
             id: DeclarationId(1723),
->>>>>>> origin/main
             name: Some("NonIntegerAlgebra".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ApproximateFieldAlgebra".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2768),
-                    },
-                    Field {
-                        label: "BooleanAlgebraAlgebra".to_string(),
-                        ty: DeclarationId(2769),
-=======
                         ty: DeclarationId(2772),
                     },
                     Field {
@@ -71986,11 +64334,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "TerminalAlgebra".to_string(),
                         ty: DeclarationId(2774),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "TerminalAlgebra".to_string(),
-                        ty: DeclarationId(2770),
                     },
                 ],
             },
@@ -72005,44 +64348,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6468, 6564),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1722),
-=======
             id: DeclarationId(1724),
->>>>>>> origin/main
             name: Some("TargetCarrier".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BitCarrier".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2771),
-                    },
-                    Field {
-                        label: "ByteCarrier".to_string(),
-                        ty: DeclarationId(2772),
-                    },
-                    Field {
-                        label: "Word16Carrier".to_string(),
-                        ty: DeclarationId(2773),
-                    },
-                    Field {
-                        label: "Word32Carrier".to_string(),
-                        ty: DeclarationId(2774),
-                    },
-                    Field {
-                        label: "Word64Carrier".to_string(),
-                        ty: DeclarationId(2775),
-                    },
-                    Field {
-                        label: "Word128Carrier".to_string(),
-                        ty: DeclarationId(2776),
-                    },
-                    Field {
-                        label: "TerminalCarrier".to_string(),
-                        ty: DeclarationId(2777),
-                    },
-=======
                         ty: DeclarationId(2775),
                     },
                     Field {
@@ -72069,7 +64380,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         label: "TerminalCarrier".to_string(),
                         ty: DeclarationId(2781),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -72083,23 +64393,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8154, 8296),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1723),
-=======
             id: DeclarationId(1725),
->>>>>>> origin/main
             name: Some("IntegerOverflow".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TwoComplementWrap".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2778),
-                    },
-                    Field {
-                        label: "Saturating".to_string(),
-                        ty: DeclarationId(2779),
-=======
                         ty: DeclarationId(2782),
                     },
                     Field {
@@ -72109,11 +64408,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "Trap".to_string(),
                         ty: DeclarationId(2784),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "Trap".to_string(),
-                        ty: DeclarationId(2780),
                     },
                 ],
             },
@@ -72128,29 +64422,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9013, 9079),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1724),
-=======
             id: DeclarationId(1726),
->>>>>>> origin/main
             name: Some("RustPrimitive".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IntegerPrimitive".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2781),
-                    },
-                    Field {
-                        label: "NonIntegerPrimitive".to_string(),
-                        ty: DeclarationId(2782),
-=======
                         ty: DeclarationId(2785),
                     },
                     Field {
                         label: "NonIntegerPrimitive".to_string(),
                         ty: DeclarationId(2786),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -72165,41 +64447,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9834, 10616),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1725),
-=======
             id: DeclarationId(1727),
->>>>>>> origin/main
             name: Some("rust_pilot_primitives".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-<<<<<<< HEAD
-                    value: DeclarationId(1724),
-=======
                     value: DeclarationId(1726),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-<<<<<<< HEAD
-            meta_tag: Some(DeclarationId(2783)),
-=======
             meta_tag: Some(DeclarationId(2787)),
->>>>>>> origin/main
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
                 FieldValue::Variant {
-<<<<<<< HEAD
-                    constructor: DeclarationId(2781),
-                    payload: vec![
-                        FieldValue::Literal(LiteralBits::String("i8".to_string())),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2766),
-=======
                     constructor: DeclarationId(2785),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i8".to_string())),
@@ -72226,98 +64489,52 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         FieldValue::Literal(LiteralBits::String("i16".to_string())),
                         FieldValue::Variant {
                             constructor: DeclarationId(2770),
->>>>>>> origin/main
                             payload: vec![],
                         },
                         FieldValue::Variant {
                             constructor: DeclarationId(2777),
                             payload: vec![],
                         },
-                        FieldValue::Literal(LiteralBits::String("-128".to_string())),
-                        FieldValue::Literal(LiteralBits::String("127".to_string())),
-                        FieldValue::Literal(LiteralBits::Bool(true)),
-                        FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2778),
-=======
-                            constructor: DeclarationId(2782),
->>>>>>> origin/main
-                            payload: vec![],
-                        },
-                    ],
-                },
-                FieldValue::Variant {
-<<<<<<< HEAD
-                    constructor: DeclarationId(2781),
-=======
-                    constructor: DeclarationId(2785),
->>>>>>> origin/main
-                    payload: vec![
-                        FieldValue::Literal(LiteralBits::String("i16".to_string())),
-                        FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2766),
-=======
-                            constructor: DeclarationId(2770),
->>>>>>> origin/main
-                            payload: vec![],
-                        },
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2778),
-                            payload: vec![],
-                        },
                         FieldValue::Literal(LiteralBits::String("-32768".to_string())),
                         FieldValue::Literal(LiteralBits::String("32767".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2778),
-=======
                             constructor: DeclarationId(2782),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-<<<<<<< HEAD
-                    constructor: DeclarationId(2781),
-=======
                     constructor: DeclarationId(2785),
->>>>>>> origin/main
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i32".to_string())),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2766),
-=======
                             constructor: DeclarationId(2770),
->>>>>>> origin/main
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2779),
+                            constructor: DeclarationId(2778),
                             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(2778),
+                            constructor: DeclarationId(2782),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2781),
+                    constructor: DeclarationId(2785),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2766),
+                            constructor: DeclarationId(2770),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2775),
+                            constructor: DeclarationId(2779),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -72326,27 +64543,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         FieldValue::Literal(LiteralBits::String("9223372036854775807".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2778),
-=======
                             constructor: DeclarationId(2782),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-<<<<<<< HEAD
-                    constructor: DeclarationId(2781),
-                    payload: vec![
-                        FieldValue::Literal(LiteralBits::String("i128".to_string())),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2766),
-                            payload: vec![],
-                        },
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2776),
-=======
                     constructor: DeclarationId(2785),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i128".to_string())),
@@ -72356,7 +64558,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         },
                         FieldValue::Variant {
                             constructor: DeclarationId(2780),
->>>>>>> origin/main
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -72367,23 +64568,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2778),
-=======
                             constructor: DeclarationId(2782),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-<<<<<<< HEAD
-                    constructor: DeclarationId(2781),
-                    payload: vec![
-                        FieldValue::Literal(LiteralBits::String("u8".to_string())),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2767),
-=======
                     constructor: DeclarationId(2785),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u8".to_string())),
@@ -72410,7 +64600,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         FieldValue::Literal(LiteralBits::String("u16".to_string())),
                         FieldValue::Variant {
                             constructor: DeclarationId(2771),
->>>>>>> origin/main
                             payload: vec![],
                         },
                         FieldValue::Variant {
@@ -72418,102 +64607,45 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
-                        FieldValue::Literal(LiteralBits::String("255".to_string())),
-                        FieldValue::Literal(LiteralBits::Bool(true)),
-                        FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2778),
-=======
-                            constructor: DeclarationId(2782),
->>>>>>> origin/main
-                            payload: vec![],
-                        },
-                    ],
-                },
-                FieldValue::Variant {
-<<<<<<< HEAD
-                    constructor: DeclarationId(2781),
-=======
-                    constructor: DeclarationId(2785),
->>>>>>> origin/main
-                    payload: vec![
-                        FieldValue::Literal(LiteralBits::String("u16".to_string())),
-                        FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2767),
-=======
-                            constructor: DeclarationId(2771),
->>>>>>> origin/main
-                            payload: vec![],
-                        },
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2778),
-                            payload: vec![],
-                        },
-                        FieldValue::Literal(LiteralBits::String("0".to_string())),
                         FieldValue::Literal(LiteralBits::String("65535".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2778),
-=======
                             constructor: DeclarationId(2782),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-<<<<<<< HEAD
-                    constructor: DeclarationId(2781),
-=======
                     constructor: DeclarationId(2785),
->>>>>>> origin/main
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u32".to_string())),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2767),
-=======
                             constructor: DeclarationId(2771),
->>>>>>> origin/main
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2779),
+                            constructor: DeclarationId(2778),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
                         FieldValue::Literal(LiteralBits::String("4294967295".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2778),
-=======
                             constructor: DeclarationId(2782),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-<<<<<<< HEAD
-                    constructor: DeclarationId(2781),
-=======
                     constructor: DeclarationId(2785),
->>>>>>> origin/main
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u64".to_string())),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2767),
-=======
                             constructor: DeclarationId(2771),
->>>>>>> origin/main
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2780),
+                            constructor: DeclarationId(2779),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
@@ -72522,21 +64654,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2778),
+                            constructor: DeclarationId(2782),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2781),
+                    constructor: DeclarationId(2785),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u128".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2767),
+                            constructor: DeclarationId(2771),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2776),
+                            constructor: DeclarationId(2780),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
@@ -72545,25 +64677,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2778),
-=======
                             constructor: DeclarationId(2782),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-<<<<<<< HEAD
-                    constructor: DeclarationId(2782),
-                    payload: vec![
-                        FieldValue::Literal(LiteralBits::String("f32".to_string())),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2768),
-                            payload: vec![],
-                        },
-=======
                     constructor: DeclarationId(2786),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("f32".to_string())),
@@ -72612,59 +64731,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     constructor: DeclarationId(2786),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("()".to_string())),
->>>>>>> origin/main
                         FieldValue::Variant {
                             constructor: DeclarationId(2774),
                             payload: vec![],
                         },
-<<<<<<< HEAD
-                        FieldValue::Literal(LiteralBits::Bool(true)),
-                    ],
-                },
-                FieldValue::Variant {
-                    constructor: DeclarationId(2782),
-                    payload: vec![
-                        FieldValue::Literal(LiteralBits::String("f64".to_string())),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2768),
-                            payload: vec![],
-                        },
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2775),
-                            payload: vec![],
-                        },
-                        FieldValue::Literal(LiteralBits::Bool(true)),
-                    ],
-                },
-                FieldValue::Variant {
-                    constructor: DeclarationId(2782),
-                    payload: vec![
-                        FieldValue::Literal(LiteralBits::String("bool".to_string())),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2769),
-                            payload: vec![],
-                        },
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2771),
-                            payload: vec![],
-                        },
-                        FieldValue::Literal(LiteralBits::Bool(true)),
-                    ],
-                },
-                FieldValue::Variant {
-                    constructor: DeclarationId(2782),
-                    payload: vec![
-                        FieldValue::Literal(LiteralBits::String("()".to_string())),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2770),
-                            payload: vec![],
-                        },
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2777),
-=======
                         FieldValue::Variant {
                             constructor: DeclarationId(2781),
->>>>>>> origin/main
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
@@ -72676,31 +64748,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10937, 15660),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1726),
-=======
             id: DeclarationId(1728),
->>>>>>> origin/main
             name: Some("CronField".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Wildcard".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2784),
-                    },
-                    Field {
-                        label: "Exact".to_string(),
-                        ty: DeclarationId(2785),
-                    },
-                    Field {
-                        label: "Listed".to_string(),
-                        ty: DeclarationId(2787),
-                    },
-                    Field {
-                        label: "Ranged".to_string(),
-                        ty: DeclarationId(2788),
-=======
                         ty: DeclarationId(2788),
                     },
                     Field {
@@ -72718,11 +64771,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "Step".to_string(),
                         ty: DeclarationId(2793),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "Step".to_string(),
-                        ty: DeclarationId(2789),
                     },
                 ],
             },
@@ -72737,35 +64785,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4214, 4433),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1727),
-=======
             id: DeclarationId(1729),
->>>>>>> origin/main
             name: Some("CronSchedule".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "minute".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1726),
-                    },
-                    Field {
-                        label: "hour".to_string(),
-                        ty: DeclarationId(1726),
-                    },
-                    Field {
-                        label: "day_of_month".to_string(),
-                        ty: DeclarationId(1726),
-                    },
-                    Field {
-                        label: "month".to_string(),
-                        ty: DeclarationId(1726),
-                    },
-                    Field {
-                        label: "day_of_week".to_string(),
-                        ty: DeclarationId(1726),
-=======
                         ty: DeclarationId(1728),
                     },
                     Field {
@@ -72783,7 +64808,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "day_of_week".to_string(),
                         ty: DeclarationId(1728),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -72798,11 +64822,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4435, 4564),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1728),
-=======
             id: DeclarationId(1730),
->>>>>>> origin/main
             name: Some("CronEntry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72812,11 +64832,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "schedule".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1727),
-=======
                         ty: DeclarationId(1729),
->>>>>>> origin/main
                     },
                     Field {
                         label: "command".to_string(),
@@ -72835,17 +64851,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4566, 4641),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1729),
-            name: Some("render_cron_field".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1726)],
-=======
             id: DeclarationId(1731),
             name: Some("render_cron_field".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1728)],
->>>>>>> origin/main
                 output: DeclarationId(230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "dsl/extdeps/cron_schedule_model.dag",
@@ -72864,17 +64873,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4643, 4963),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1730),
-            name: Some("render_cron_schedule".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1727)],
-=======
             id: DeclarationId(1732),
             name: Some("render_cron_schedule".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1729)],
->>>>>>> origin/main
                 output: DeclarationId(230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "dsl/extdeps/cron_schedule_model.dag",
@@ -72893,11 +64895,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4965, 5253),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1731),
-=======
             id: DeclarationId(1733),
->>>>>>> origin/main
             name: Some("wire_contract".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(312),
@@ -72918,23 +64916,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 684, 758),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1732),
-=======
             id: DeclarationId(1734),
->>>>>>> origin/main
             name: Some("UserType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "User".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2790),
-                    },
-                    Field {
-                        label: "Bot".to_string(),
-                        ty: DeclarationId(2791),
-=======
                         ty: DeclarationId(2794),
                     },
                     Field {
@@ -72944,11 +64931,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "Organization".to_string(),
                         ty: DeclarationId(2796),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "Organization".to_string(),
-                        ty: DeclarationId(2792),
                     },
                 ],
             },
@@ -72963,11 +64945,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 831, 872),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1733),
-=======
             id: DeclarationId(1735),
->>>>>>> origin/main
             name: Some("GitHubUser".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72981,11 +64959,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1732),
-=======
                         ty: DeclarationId(1734),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -73000,11 +64974,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 874, 936),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1734),
-=======
             id: DeclarationId(1736),
->>>>>>> origin/main
             name: Some("Repository".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73041,11 +65011,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1009, 1120),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1735),
-=======
             id: DeclarationId(1737),
->>>>>>> origin/main
             name: Some("GitHubAuthToken".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73055,19 +65021,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "scopes".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2793),
-                    },
-                    Field {
-                        label: "expires_at".to_string(),
-                        ty: DeclarationId(2794),
-=======
                         ty: DeclarationId(2797),
                     },
                     Field {
                         label: "expires_at".to_string(),
                         ty: DeclarationId(2798),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -73082,31 +65040,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1193, 1286),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1736),
-=======
             id: DeclarationId(1738),
->>>>>>> origin/main
             name: Some("GitHubScope".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ScopeRepo".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2795),
-                    },
-                    Field {
-                        label: "ScopeGist".to_string(),
-                        ty: DeclarationId(2796),
-                    },
-                    Field {
-                        label: "ScopeWorkflow".to_string(),
-                        ty: DeclarationId(2797),
-                    },
-                    Field {
-                        label: "ScopeReadOrg".to_string(),
-                        ty: DeclarationId(2798),
-=======
                         ty: DeclarationId(2799),
                     },
                     Field {
@@ -73124,11 +65063,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "ScopeReadUser".to_string(),
                         ty: DeclarationId(2803),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "ScopeReadUser".to_string(),
-                        ty: DeclarationId(2799),
                     },
                 ],
             },
@@ -73143,11 +65077,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1288, 1385),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1737),
-=======
             id: DeclarationId(1739),
->>>>>>> origin/main
             name: Some("Pagination".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73157,11 +65087,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "cursor".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2800),
-=======
                         ty: DeclarationId(2804),
->>>>>>> origin/main
                     },
                     Field {
                         label: "has_next".to_string(),
@@ -73180,23 +65106,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1510, 1580),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1738),
-=======
             id: DeclarationId(1740),
->>>>>>> origin/main
             name: Some("GitHubPermission".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PermRead".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2801),
-                    },
-                    Field {
-                        label: "PermWrite".to_string(),
-                        ty: DeclarationId(2802),
-=======
                         ty: DeclarationId(2805),
                     },
                     Field {
@@ -73206,11 +65121,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "PermAdmin".to_string(),
                         ty: DeclarationId(2807),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "PermAdmin".to_string(),
-                        ty: DeclarationId(2803),
                     },
                 ],
             },
@@ -73225,11 +65135,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1653, 1709),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1739),
-=======
             id: DeclarationId(1741),
->>>>>>> origin/main
             name: Some("default_api_base".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -73248,11 +65154,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1782, 1838),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1740),
-=======
             id: DeclarationId(1742),
->>>>>>> origin/main
             name: Some("default_per_page".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -73269,11 +65171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1840, 1871),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1741),
-=======
             id: DeclarationId(1743),
->>>>>>> origin/main
             name: Some("max_per_page".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -73290,11 +65188,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1873, 1901),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1742),
-=======
             id: DeclarationId(1744),
->>>>>>> origin/main
             name: Some("Workflow".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73304,13 +65198,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "on".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2804),
-                    },
-                    Field {
-                        label: "concurrency".to_string(),
-                        ty: DeclarationId(2805),
-=======
                         ty: DeclarationId(2808),
                     },
                     Field {
@@ -73320,27 +65207,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "jobs".to_string(),
                         ty: DeclarationId(2810),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "jobs".to_string(),
-                        ty: DeclarationId(2806),
                     },
                     Field {
                         label: "env".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2808),
-                    },
-                    Field {
-                        label: "permissions".to_string(),
-                        ty: DeclarationId(2809),
-=======
                         ty: DeclarationId(2812),
                     },
                     Field {
                         label: "permissions".to_string(),
                         ty: DeclarationId(2813),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -73355,31 +65229,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1484, 1748),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1743),
-=======
             id: DeclarationId(1745),
->>>>>>> origin/main
             name: Some("WorkflowPermissions".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "contents".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1744),
-                    },
-                    Field {
-                        label: "pull_requests".to_string(),
-                        ty: DeclarationId(1744),
-                    },
-                    Field {
-                        label: "issues".to_string(),
-                        ty: DeclarationId(1744),
-                    },
-                    Field {
-                        label: "actions".to_string(),
-                        ty: DeclarationId(1744),
-=======
                         ty: DeclarationId(1746),
                     },
                     Field {
@@ -73393,7 +65248,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "actions".to_string(),
                         ty: DeclarationId(1746),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -73408,23 +65262,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1750, 1892),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1744),
-=======
             id: DeclarationId(1746),
->>>>>>> origin/main
             name: Some("PermissionLevel".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PermRead".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2810),
-                    },
-                    Field {
-                        label: "PermWrite".to_string(),
-                        ty: DeclarationId(2811),
-=======
                         ty: DeclarationId(2814),
                     },
                     Field {
@@ -73434,11 +65277,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "PermNone".to_string(),
                         ty: DeclarationId(2816),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "PermNone".to_string(),
-                        ty: DeclarationId(2812),
                     },
                 ],
             },
@@ -73453,23 +65291,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1894, 1948),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1745),
-=======
             id: DeclarationId(1747),
->>>>>>> origin/main
             name: Some("WorkflowTrigger".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Push".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2815),
-                    },
-                    Field {
-                        label: "PullRequest".to_string(),
-                        ty: DeclarationId(2818),
-=======
                         ty: DeclarationId(2819),
                     },
                     Field {
@@ -73479,27 +65306,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "Schedule".to_string(),
                         ty: DeclarationId(2823),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "Schedule".to_string(),
-                        ty: DeclarationId(2819),
                     },
                     Field {
                         label: "WorkflowDispatch".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2821),
-                    },
-                    Field {
-                        label: "WorkflowCall".to_string(),
-                        ty: DeclarationId(2823),
-=======
                         ty: DeclarationId(2825),
                     },
                     Field {
                         label: "WorkflowCall".to_string(),
                         ty: DeclarationId(2827),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -73514,31 +65328,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2064, 2356),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1746),
-=======
             id: DeclarationId(1748),
->>>>>>> origin/main
             name: Some("PullRequestActivity".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Opened".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2824),
-                    },
-                    Field {
-                        label: "Synchronize".to_string(),
-                        ty: DeclarationId(2825),
-                    },
-                    Field {
-                        label: "Reopened".to_string(),
-                        ty: DeclarationId(2826),
-                    },
-                    Field {
-                        label: "ReadyForReview".to_string(),
-                        ty: DeclarationId(2827),
-=======
                         ty: DeclarationId(2828),
                     },
                     Field {
@@ -73556,11 +65351,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "Closed".to_string(),
                         ty: DeclarationId(2832),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "Closed".to_string(),
-                        ty: DeclarationId(2828),
                     },
                 ],
             },
@@ -73575,11 +65365,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2358, 2452),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1747),
-=======
             id: DeclarationId(1749),
->>>>>>> origin/main
             name: Some("DispatchInput".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73589,11 +65375,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "description".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2829),
-=======
                         ty: DeclarationId(2833),
->>>>>>> origin/main
                     },
                     Field {
                         label: "required".to_string(),
@@ -73601,19 +65383,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "default".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2830),
-                    },
-                    Field {
-                        label: "type".to_string(),
-                        ty: DeclarationId(1748),
-=======
                         ty: DeclarationId(2834),
                     },
                     Field {
                         label: "type".to_string(),
                         ty: DeclarationId(1750),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -73628,27 +65402,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2454, 2576),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1748),
-=======
             id: DeclarationId(1750),
->>>>>>> origin/main
             name: Some("DispatchInputType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "InputString".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2831),
-                    },
-                    Field {
-                        label: "InputBoolean".to_string(),
-                        ty: DeclarationId(2832),
-                    },
-                    Field {
-                        label: "InputChoice".to_string(),
-                        ty: DeclarationId(2833),
-=======
                         ty: DeclarationId(2835),
                     },
                     Field {
@@ -73662,11 +65421,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "InputEnvironment".to_string(),
                         ty: DeclarationId(2838),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "InputEnvironment".to_string(),
-                        ty: DeclarationId(2834),
                     },
                 ],
             },
@@ -73681,23 +65435,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2578, 2662),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1749),
-=======
             id: DeclarationId(1751),
->>>>>>> origin/main
             name: Some("SecretScope".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "StepScope".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2835),
-                    },
-                    Field {
-                        label: "JobScope".to_string(),
-                        ty: DeclarationId(2836),
-=======
                         ty: DeclarationId(2839),
                     },
                     Field {
@@ -73707,11 +65450,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "WorkflowScope".to_string(),
                         ty: DeclarationId(2841),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "WorkflowScope".to_string(),
-                        ty: DeclarationId(2837),
                     },
                 ],
             },
@@ -73726,11 +65464,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4765, 4820),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1750),
-=======
             id: DeclarationId(1752),
->>>>>>> origin/main
             name: Some("WorkflowSecret".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73740,11 +65474,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "scope".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1749),
-=======
                         ty: DeclarationId(1751),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -73759,11 +65489,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5095, 5158),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1751),
-=======
             id: DeclarationId(1753),
->>>>>>> origin/main
             name: Some("Job".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73773,37 +65499,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "name".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2838),
-                    },
-                    Field {
-                        label: "runner".to_string(),
-                        ty: DeclarationId(1755),
-                    },
-                    Field {
-                        label: "steps".to_string(),
-                        ty: DeclarationId(2839),
-                    },
-                    Field {
-                        label: "needs".to_string(),
-                        ty: DeclarationId(2840),
-                    },
-                    Field {
-                        label: "env".to_string(),
-                        ty: DeclarationId(2842),
-                    },
-                    Field {
-                        label: "outputs".to_string(),
-                        ty: DeclarationId(2844),
-                    },
-                    Field {
-                        label: "if_condition".to_string(),
-                        ty: DeclarationId(2845),
-                    },
-                    Field {
-                        label: "strategy".to_string(),
-                        ty: DeclarationId(2846),
-=======
                         ty: DeclarationId(2842),
                     },
                     Field {
@@ -73837,11 +65532,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "timeout_minutes".to_string(),
                         ty: DeclarationId(2851),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "timeout_minutes".to_string(),
-                        ty: DeclarationId(2847),
                     },
                     Field {
                         label: "continue_on_error".to_string(),
@@ -73849,11 +65539,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "concurrency".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2848),
-=======
                         ty: DeclarationId(2852),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -73868,29 +65554,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5302, 5771),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1752),
-=======
             id: DeclarationId(1754),
->>>>>>> origin/main
             name: Some("CancelInProgressSpec".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "CancelInProgressBool".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2849),
-                    },
-                    Field {
-                        label: "CancelInProgressExpression".to_string(),
-                        ty: DeclarationId(2850),
-=======
                         ty: DeclarationId(2853),
                     },
                     Field {
                         label: "CancelInProgressExpression".to_string(),
                         ty: DeclarationId(2854),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -73905,29 +65579,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6589, 6709),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1753),
-=======
             id: DeclarationId(1755),
->>>>>>> origin/main
             name: Some("CancelInProgressWhenQueueMax".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "QueueMaxCancelInProgressFalse".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2851),
-                    },
-                    Field {
-                        label: "QueueMaxCancelInProgressExpression".to_string(),
-                        ty: DeclarationId(2852),
-=======
                         ty: DeclarationId(2855),
                     },
                     Field {
                         label: "QueueMaxCancelInProgressExpression".to_string(),
                         ty: DeclarationId(2856),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -73942,27 +65604,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7517, 7646),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1754),
-=======
             id: DeclarationId(1756),
->>>>>>> origin/main
             name: Some("ConcurrencySpec".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ConcurrencyScalar".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2853),
-                    },
-                    Field {
-                        label: "ConcurrencyMappingQueueMax".to_string(),
-                        ty: DeclarationId(2855),
-                    },
-                    Field {
-                        label: "ConcurrencyMappingQueueNotMax".to_string(),
-                        ty: DeclarationId(2858),
-=======
                         ty: DeclarationId(2857),
                     },
                     Field {
@@ -73972,7 +65619,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "ConcurrencyMappingQueueNotMax".to_string(),
                         ty: DeclarationId(2862),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -73987,27 +65633,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8199, 8845),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1755),
-=======
             id: DeclarationId(1757),
->>>>>>> origin/main
             name: Some("RunnerSpec".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "HostedRunner".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2859),
-                    },
-                    Field {
-                        label: "SelfHosted".to_string(),
-                        ty: DeclarationId(2861),
-                    },
-                    Field {
-                        label: "RunsOnExpression".to_string(),
-                        ty: DeclarationId(2862),
-=======
                         ty: DeclarationId(2863),
                     },
                     Field {
@@ -74017,7 +65648,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "RunsOnExpression".to_string(),
                         ty: DeclarationId(2866),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -74032,35 +65662,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10017, 10240),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1756),
-=======
             id: DeclarationId(1758),
->>>>>>> origin/main
             name: Some("RunnerLabel".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "UbuntuLatest".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2863),
-                    },
-                    Field {
-                        label: "Ubuntu2404".to_string(),
-                        ty: DeclarationId(2864),
-                    },
-                    Field {
-                        label: "Ubuntu2204".to_string(),
-                        ty: DeclarationId(2865),
-                    },
-                    Field {
-                        label: "MacosLatest".to_string(),
-                        ty: DeclarationId(2866),
-                    },
-                    Field {
-                        label: "Macos14".to_string(),
-                        ty: DeclarationId(2867),
-=======
                         ty: DeclarationId(2867),
                     },
                     Field {
@@ -74082,11 +65689,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "WindowsLatest".to_string(),
                         ty: DeclarationId(2872),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "WindowsLatest".to_string(),
-                        ty: DeclarationId(2868),
                     },
                 ],
             },
@@ -74101,29 +65703,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10242, 10351),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1757),
-=======
             id: DeclarationId(1759),
->>>>>>> origin/main
             name: Some("Step".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "RunStep".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2876),
-                    },
-                    Field {
-                        label: "UsesStep".to_string(),
-                        ty: DeclarationId(2885),
-=======
                         ty: DeclarationId(2880),
                     },
                     Field {
                         label: "UsesStep".to_string(),
                         ty: DeclarationId(2889),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -74138,31 +65728,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10496, 11091),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1758),
-=======
             id: DeclarationId(1760),
->>>>>>> origin/main
             name: Some("ShellType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Bash".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2886),
-                    },
-                    Field {
-                        label: "Sh".to_string(),
-                        ty: DeclarationId(2887),
-                    },
-                    Field {
-                        label: "Pwsh".to_string(),
-                        ty: DeclarationId(2888),
-                    },
-                    Field {
-                        label: "Python".to_string(),
-                        ty: DeclarationId(2889),
-=======
                         ty: DeclarationId(2890),
                     },
                     Field {
@@ -74180,11 +65751,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "Cmd".to_string(),
                         ty: DeclarationId(2894),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "Cmd".to_string(),
-                        ty: DeclarationId(2890),
                     },
                 ],
             },
@@ -74199,11 +65765,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11093, 11141),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1759),
-=======
             id: DeclarationId(1761),
->>>>>>> origin/main
             name: Some("ActionRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -74232,43 +65794,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11143, 11206),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1760),
-=======
             id: DeclarationId(1762),
->>>>>>> origin/main
             name: Some("LogAnnotation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "AnnotationError".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2894),
-                    },
-                    Field {
-                        label: "AnnotationWarning".to_string(),
-                        ty: DeclarationId(2898),
-                    },
-                    Field {
-                        label: "AnnotationNotice".to_string(),
-                        ty: DeclarationId(2902),
-                    },
-                    Field {
-                        label: "AnnotationGroup".to_string(),
-                        ty: DeclarationId(2903),
-                    },
-                    Field {
-                        label: "AnnotationEndGroup".to_string(),
-                        ty: DeclarationId(2904),
-                    },
-                    Field {
-                        label: "SetOutput".to_string(),
-                        ty: DeclarationId(2905),
-                    },
-                    Field {
-                        label: "AddMask".to_string(),
-                        ty: DeclarationId(2906),
-=======
                         ty: DeclarationId(2898),
                     },
                     Field {
@@ -74298,11 +65829,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "StopCommands".to_string(),
                         ty: DeclarationId(2911),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "StopCommands".to_string(),
-                        ty: DeclarationId(2907),
                     },
                 ],
             },
@@ -74317,11 +65843,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11440, 11867),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1761),
-=======
             id: DeclarationId(1763),
->>>>>>> origin/main
             name: Some("annotation_error_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -74340,11 +65862,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11933, 11982),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1762),
-=======
             id: DeclarationId(1764),
->>>>>>> origin/main
             name: Some("annotation_warning_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -74363,11 +65881,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11983, 12036),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1763),
-=======
             id: DeclarationId(1765),
->>>>>>> origin/main
             name: Some("annotation_notice_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -74386,11 +65900,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12037, 12088),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1764),
-=======
             id: DeclarationId(1766),
->>>>>>> origin/main
             name: Some("annotation_group_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -74409,11 +65919,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12089, 12139),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1765),
-=======
             id: DeclarationId(1767),
->>>>>>> origin/main
             name: Some("annotation_endgroup".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -74432,11 +65938,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12140, 12189),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1766),
-=======
             id: DeclarationId(1768),
->>>>>>> origin/main
             name: Some("annotation_set_output_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -74455,11 +65957,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12190, 12254),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1767),
-=======
             id: DeclarationId(1769),
->>>>>>> origin/main
             name: Some("annotation_add_mask_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -74478,11 +65976,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12255, 12311),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1768),
-=======
             id: DeclarationId(1770),
->>>>>>> origin/main
             name: Some("annotation_stop_commands_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -74501,29 +65995,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12312, 12378),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1769),
-=======
             id: DeclarationId(1771),
->>>>>>> origin/main
             name: Some("ArtifactOp".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Upload".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2909),
-                    },
-                    Field {
-                        label: "Download".to_string(),
-                        ty: DeclarationId(2911),
-=======
                         ty: DeclarationId(2913),
                     },
                     Field {
                         label: "Download".to_string(),
                         ty: DeclarationId(2915),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -74538,23 +66020,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12600, 12765),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1770),
-=======
             id: DeclarationId(1772),
->>>>>>> origin/main
             name: Some("MissingFilesBehavior".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Warn".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2912),
-                    },
-                    Field {
-                        label: "ErrorOut".to_string(),
-                        ty: DeclarationId(2913),
-=======
                         ty: DeclarationId(2916),
                     },
                     Field {
@@ -74564,11 +66035,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "Ignore".to_string(),
                         ty: DeclarationId(2918),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "Ignore".to_string(),
-                        ty: DeclarationId(2914),
                     },
                 ],
             },
@@ -74583,26 +66049,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12767, 12819),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1771),
-            name: Some("upload_artifact_action".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1759),
-=======
             id: DeclarationId(1773),
             name: Some("upload_artifact_action".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1761),
->>>>>>> origin/main
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-<<<<<<< HEAD
-            meta_tag: Some(DeclarationId(1759)),
-=======
             meta_tag: Some(DeclarationId(1761)),
->>>>>>> origin/main
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -74615,26 +66070,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12870, 12979),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1772),
-            name: Some("download_artifact_action".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1759),
-=======
             id: DeclarationId(1774),
             name: Some("download_artifact_action".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1761),
->>>>>>> origin/main
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-<<<<<<< HEAD
-            meta_tag: Some(DeclarationId(1759)),
-=======
             meta_tag: Some(DeclarationId(1761)),
->>>>>>> origin/main
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -74647,27 +66091,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12981, 13094),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1773),
-=======
             id: DeclarationId(1775),
->>>>>>> origin/main
             name: Some("MatrixStrategy".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "dimensions".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2916),
-                    },
-                    Field {
-                        label: "include".to_string(),
-                        ty: DeclarationId(2918),
-                    },
-                    Field {
-                        label: "exclude".to_string(),
-                        ty: DeclarationId(2920),
-=======
                         ty: DeclarationId(2920),
                     },
                     Field {
@@ -74677,7 +66106,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "exclude".to_string(),
                         ty: DeclarationId(2924),
->>>>>>> origin/main
                     },
                     Field {
                         label: "fail_fast".to_string(),
@@ -74685,11 +66113,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "max_parallel".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2921),
-=======
                         ty: DeclarationId(2925),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -74704,35 +66128,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13233, 13409),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1774),
-=======
             id: DeclarationId(1776),
->>>>>>> origin/main
             name: Some("CheckConclusion".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Success".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2922),
-                    },
-                    Field {
-                        label: "Failure".to_string(),
-                        ty: DeclarationId(2923),
-                    },
-                    Field {
-                        label: "Cancelled".to_string(),
-                        ty: DeclarationId(2924),
-                    },
-                    Field {
-                        label: "Skipped".to_string(),
-                        ty: DeclarationId(2925),
-                    },
-                    Field {
-                        label: "TimedOut".to_string(),
-                        ty: DeclarationId(2926),
-=======
                         ty: DeclarationId(2926),
                     },
                     Field {
@@ -74754,11 +66155,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "ActionRequired".to_string(),
                         ty: DeclarationId(2931),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "ActionRequired".to_string(),
-                        ty: DeclarationId(2927),
                     },
                 ],
             },
@@ -74773,26 +66169,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13538, 13640),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1775),
-            name: Some("checkout_action".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1759),
-=======
             id: DeclarationId(1777),
             name: Some("checkout_action".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1761),
->>>>>>> origin/main
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-<<<<<<< HEAD
-            meta_tag: Some(DeclarationId(1759)),
-=======
             meta_tag: Some(DeclarationId(1761)),
->>>>>>> origin/main
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -74805,26 +66190,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13766, 13861),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1776),
-            name: Some("setup_rust_action".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1759),
-=======
             id: DeclarationId(1778),
             name: Some("setup_rust_action".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1761),
->>>>>>> origin/main
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-<<<<<<< HEAD
-            meta_tag: Some(DeclarationId(1759)),
-=======
             meta_tag: Some(DeclarationId(1761)),
->>>>>>> origin/main
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -74837,26 +66211,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13863, 13987),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1777),
-            name: Some("cache_action".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1759),
-=======
             id: DeclarationId(1779),
             name: Some("cache_action".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1761),
->>>>>>> origin/main
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-<<<<<<< HEAD
-            meta_tag: Some(DeclarationId(1759)),
-=======
             meta_tag: Some(DeclarationId(1761)),
->>>>>>> origin/main
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -74869,11 +66232,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13989, 14078),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1778),
-=======
             id: DeclarationId(1780),
->>>>>>> origin/main
             name: Some("max_job_timeout_minutes".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -74890,11 +66249,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14154, 14193),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1779),
-=======
             id: DeclarationId(1781),
->>>>>>> origin/main
             name: Some("default_job_timeout_minutes".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -74911,11 +66266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14195, 14238),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1780),
-=======
             id: DeclarationId(1782),
->>>>>>> origin/main
             name: Some("max_matrix_combinations".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -74932,11 +66283,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14240, 14279),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1781),
-=======
             id: DeclarationId(1783),
->>>>>>> origin/main
             name: Some("github_actions_workflows_dir".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -74955,29 +66302,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1207, 1270),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1782),
-=======
             id: DeclarationId(1784),
->>>>>>> origin/main
             name: Some("GitHubActionsWorkflowExtension".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "GitHubActionsWorkflowYml".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2928),
-                    },
-                    Field {
-                        label: "GitHubActionsWorkflowYaml".to_string(),
-                        ty: DeclarationId(2929),
-=======
                         ty: DeclarationId(2932),
                     },
                     Field {
                         label: "GitHubActionsWorkflowYaml".to_string(),
                         ty: DeclarationId(2933),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -74992,11 +66327,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1895, 1989),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1783),
-=======
             id: DeclarationId(1785),
->>>>>>> origin/main
             name: Some("GitHubActionsWorkflowStemSegment".to_string()),
             connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
@@ -75005,29 +66336,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-<<<<<<< HEAD
-            refinement: Some(DeclarationId(2930)),
-=======
             refinement: Some(DeclarationId(2934)),
->>>>>>> origin/main
             nominal_opacity: None,
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2615, 2714),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1784),
-=======
             id: DeclarationId(1786),
->>>>>>> origin/main
             name: Some("GitHubActionsWorkflowStem".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "segment".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1783),
-=======
                     ty: DeclarationId(1785),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -75041,29 +66360,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2916, 2994),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1785),
-=======
             id: DeclarationId(1787),
->>>>>>> origin/main
             name: Some("GitHubActionsWorkflowFileRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "stem".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1784),
-                    },
-                    Field {
-                        label: "extension".to_string(),
-                        ty: DeclarationId(1782),
-=======
                         ty: DeclarationId(1786),
                     },
                     Field {
                         label: "extension".to_string(),
                         ty: DeclarationId(1784),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -75078,11 +66385,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 3398, 3513),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1786),
-=======
             id: DeclarationId(1788),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75102,11 +66405,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3259, 3272),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1787),
-=======
             id: DeclarationId(1789),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75126,11 +66425,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3421, 3434),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1788),
-=======
             id: DeclarationId(1790),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75150,11 +66445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3439, 3452),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1789),
-=======
             id: DeclarationId(1791),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75174,11 +66465,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3556, 3569),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1790),
-=======
             id: DeclarationId(1792),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75198,11 +66485,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4162, 4169),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1791),
-=======
             id: DeclarationId(1793),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(695), DeclarationId(694)],
@@ -75220,11 +66503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1792),
-=======
             id: DeclarationId(1794),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75244,11 +66523,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4617, 4624),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1793),
-=======
             id: DeclarationId(1795),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(697), DeclarationId(698)],
@@ -75266,9 +66541,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4638, 4651),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1794),
-=======
             id: DeclarationId(1796),
             name: None,
             connective: TypeConnective::Instantiation {
@@ -75290,27 +66562,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         });
         declarations.push(Declaration {
             id: DeclarationId(1797),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(700),
-                }],
-            },
-            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/list.dag", 5336, 5349),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1798),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75330,7 +66581,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5354, 5367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1799),
+            id: DeclarationId(1798),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75350,7 +66601,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5372, 5385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1797),
+            id: DeclarationId(1799),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75370,11 +66621,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5686, 5693),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1798),
-=======
             id: DeclarationId(1800),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(702)],
@@ -75392,11 +66639,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5698, 5708),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1799),
-=======
             id: DeclarationId(1801),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75416,11 +66659,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5713, 5720),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1800),
-=======
             id: DeclarationId(1802),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75440,11 +66679,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5867, 5874),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1801),
-=======
             id: DeclarationId(1803),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(705)],
@@ -75462,11 +66697,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1802),
-=======
             id: DeclarationId(1804),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75486,11 +66717,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5897, 5904),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1803),
-=======
             id: DeclarationId(1805),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75510,11 +66737,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6130, 6137),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1804),
-=======
             id: DeclarationId(1806),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75534,19 +66757,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6151, 6158),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1805),
-            name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(707)],
-                output: DeclarationId(1804),
-=======
             id: DeclarationId(1807),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(707)],
                 output: DeclarationId(1806),
->>>>>>> origin/main
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -75560,11 +66775,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6142, 6158),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1806),
-=======
             id: DeclarationId(1808),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75584,11 +66795,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6163, 6170),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1807),
-=======
             id: DeclarationId(1809),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75608,11 +66815,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6356, 6363),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1808),
-=======
             id: DeclarationId(1810),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75632,11 +66835,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6588, 6595),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1809),
-=======
             id: DeclarationId(1811),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75656,11 +66855,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7202, 7209),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1810),
-=======
             id: DeclarationId(1812),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(713),
@@ -75680,21 +66875,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7219, 7236),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1811),
-=======
             id: DeclarationId(1813),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-<<<<<<< HEAD
-                    value: DeclarationId(1810),
-=======
                     value: DeclarationId(1812),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -75708,11 +66895,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7214, 7237),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1812),
-=======
             id: DeclarationId(1814),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75732,11 +66915,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7415, 7422),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1813),
-=======
             id: DeclarationId(1815),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(713),
@@ -75756,21 +66935,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7444, 7461),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1814),
-=======
             id: DeclarationId(1816),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-<<<<<<< HEAD
-                    value: DeclarationId(1813),
-=======
                     value: DeclarationId(1815),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -75784,11 +66955,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7439, 7462),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1815),
-=======
             id: DeclarationId(1817),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75808,11 +66975,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 8177, 8184),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1816),
-=======
             id: DeclarationId(1818),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75826,11 +66989,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 2106, 2111),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1817),
-=======
             id: DeclarationId(1819),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75850,11 +67009,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 2144, 2157),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1818),
-=======
             id: DeclarationId(1820),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -75864,11 +67019,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "tail".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1817),
-=======
                         ty: DeclarationId(1819),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -75883,11 +67034,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 2116, 2159),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1819),
-=======
             id: DeclarationId(1821),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75907,11 +67054,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1477, 1490),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1820),
-=======
             id: DeclarationId(1822),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75931,11 +67074,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1570, 1583),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1821),
-=======
             id: DeclarationId(1823),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -75954,11 +67093,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1822),
-=======
             id: DeclarationId(1824),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -75975,14 +67110,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20914, 20941),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20916, 20943),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1823),
-=======
             id: DeclarationId(1825),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(713),
@@ -75999,75 +67130,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20993, 21024),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1824),
-=======
-            id: DeclarationId(1826),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(813),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(814),
-                    value: DeclarationId(744),
-                }],
-            },
-            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/effects.dag", 21029, 21056),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1825),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1824),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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/effects.dag", 21029, 21057),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20995, 21026),
         });
         declarations.push(Declaration {
             id: DeclarationId(1826),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(744),
-                }],
-            },
-            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/effects.dag", 21183, 21204),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1827),
-            name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
                 arguments: vec![TemplateArgument {
@@ -76083,17 +67150,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21236),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21058),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1828),
-=======
             id: DeclarationId(1827),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1827),
+                    DeclarationId(1826),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -76105,14 +67169,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21237),
-=======
             span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
-            id: DeclarationId(1829),
+            id: DeclarationId(1828),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -76129,14 +67189,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/effects.dag", 22266, 22287),
-=======
             span: SourceSpan::new("src/v3/std/effects.dag", 21185, 21206),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
-            id: DeclarationId(1830),
+            id: DeclarationId(1829),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -76211,9 +67267,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
-=======
             span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706),
         });
         declarations.push(Declaration {
@@ -76234,7 +67287,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             refinement: None,
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(1834),
@@ -76253,30 +67305,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669),
         });
         declarations.push(Declaration {
             id: DeclarationId(1835),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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/effects.dag", 30660, 30667),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1833),
-            name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
@@ -76292,14 +67325,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 36579, 36600),
+            span: SourceSpan::new("src/v3/std/effects.dag", 36581, 36602),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1834),
-=======
             id: DeclarationId(1836),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -76316,14 +67345,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 36606, 36637),
+            span: SourceSpan::new("src/v3/std/effects.dag", 36608, 36639),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1835),
-=======
             id: DeclarationId(1837),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -76342,11 +67367,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 7532, 7561),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1836),
-=======
             id: DeclarationId(1838),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -76365,9 +67386,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 7566, 7595),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1837),
-=======
             id: DeclarationId(1839),
             name: None,
             connective: TypeConnective::Instantiation {
@@ -76389,27 +67407,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         });
         declarations.push(Declaration {
             id: DeclarationId(1840),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(729),
-                }],
-            },
-            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/effects.dag", 7627, 7645),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1841),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -76429,16 +67426,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8066, 8084),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1839),
+            id: DeclarationId(1841),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tokens".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1838),
-=======
                     ty: DeclarationId(1840),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -76452,11 +67445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8036, 8086),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1840),
-=======
             id: DeclarationId(1842),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -76481,11 +67470,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8091, 8147),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1841),
-=======
             id: DeclarationId(1843),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -76504,11 +67489,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8510, 8555),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1842),
-=======
             id: DeclarationId(1844),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -76537,11 +67518,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8560, 8630),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1843),
-=======
             id: DeclarationId(1845),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76552,9 +67529,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/effects.dag", 14353, 14363),
-=======
             span: SourceSpan::new("src/v3/std/effects.dag", 14355, 14365),
         });
         declarations.push(Declaration {
@@ -76575,7 +67549,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             refinement: None,
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/effects.dag", 14370, 14408),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(1847),
@@ -76594,30 +67567,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 14368, 14406),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14413, 14451),
         });
         declarations.push(Declaration {
             id: DeclarationId(1848),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "key_source".to_string(),
-                    ty: DeclarationId(740),
-                }],
-            },
-            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/effects.dag", 14411, 14449),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1846),
-            name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "cause".to_string(),
@@ -76632,14 +67586,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 14695, 14730),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14697, 14732),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1847),
-=======
             id: DeclarationId(1849),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76650,14 +67600,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 14735, 14747),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14737, 14749),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1848),
-=======
             id: DeclarationId(1850),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -76673,14 +67619,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 15169, 15198),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15171, 15200),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1849),
-=======
             id: DeclarationId(1851),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -76696,14 +67638,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 15203, 15228),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15205, 15230),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1850),
-=======
             id: DeclarationId(1852),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76714,14 +67652,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 15741, 15751),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15743, 15753),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1851),
-=======
             id: DeclarationId(1853),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -76737,14 +67671,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 15756, 15794),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15758, 15796),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1852),
-=======
             id: DeclarationId(1854),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -76760,14 +67690,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 16499, 16526),
+            span: SourceSpan::new("src/v3/std/effects.dag", 16501, 16528),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1853),
-=======
             id: DeclarationId(1855),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -76783,14 +67709,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 16531, 16559),
+            span: SourceSpan::new("src/v3/std/effects.dag", 16533, 16561),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1854),
-=======
             id: DeclarationId(1856),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -76807,23 +67729,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 16587, 16599),
+            span: SourceSpan::new("src/v3/std/effects.dag", 16589, 16601),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1855),
-=======
             id: DeclarationId(1857),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "fields".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1854),
-=======
                     ty: DeclarationId(1856),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -76834,9 +67748,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/effects.dag", 16564, 16601),
-=======
             span: SourceSpan::new("src/v3/std/effects.dag", 16566, 16603),
         });
         declarations.push(Declaration {
@@ -76852,7 +67763,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             refinement: None,
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/effects.dag", 17280, 17293),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(1859),
@@ -76866,25 +67776,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 17278, 17291),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17298, 17312),
         });
         declarations.push(Declaration {
             id: DeclarationId(1860),
             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/effects.dag", 17296, 17310),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1858),
-            name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "reason".to_string(),
@@ -76899,14 +67795,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 17315, 17347),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17317, 17349),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1859),
-=======
             id: DeclarationId(1861),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -76922,14 +67814,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 19517, 19558),
+            span: SourceSpan::new("src/v3/std/effects.dag", 19519, 19560),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1860),
-=======
             id: DeclarationId(1862),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -76951,14 +67839,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 19563, 19632),
+            span: SourceSpan::new("src/v3/std/effects.dag", 19565, 19634),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1861),
-=======
             id: DeclarationId(1863),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -76992,14 +67876,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 19637, 19787),
+            span: SourceSpan::new("src/v3/std/effects.dag", 19639, 19789),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1862),
-=======
             id: DeclarationId(1864),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77010,14 +67890,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20536, 20557),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20538, 20559),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1863),
-=======
             id: DeclarationId(1865),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -77034,23 +67910,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20588, 20615),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20590, 20617),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1864),
-=======
             id: DeclarationId(1866),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "first_breaker".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1863),
-=======
                     ty: DeclarationId(1865),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -77061,14 +67929,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20562, 20617),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20564, 20619),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1865),
-=======
             id: DeclarationId(1867),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -77085,23 +67949,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 24541, 24562),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24543, 24564),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1866),
-=======
             id: DeclarationId(1868),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "ops".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1865),
-=======
                     ty: DeclarationId(1867),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -77112,14 +67968,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 24521, 24564),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24523, 24566),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1867),
-=======
             id: DeclarationId(1869),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -77136,23 +67988,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 24590, 24617),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24592, 24619),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1868),
-=======
             id: DeclarationId(1870),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "arms".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1867),
-=======
                     ty: DeclarationId(1869),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -77163,14 +68007,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 24569, 24619),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24571, 24621),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1869),
-=======
             id: DeclarationId(1871),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77186,14 +68026,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 24624, 24659),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24626, 24661),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1870),
-=======
             id: DeclarationId(1872),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -77210,23 +68046,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 24691, 24723),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24693, 24725),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1871),
-=======
             id: DeclarationId(1873),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "branches".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1870),
-=======
                     ty: DeclarationId(1872),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -77237,14 +68065,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 24664, 24725),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24666, 24727),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1872),
-=======
             id: DeclarationId(1874),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77260,14 +68084,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 25362, 25408),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25364, 25410),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1873),
-=======
             id: DeclarationId(1875),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77283,9 +68103,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/effects.dag", 25413, 25465),
-=======
             span: SourceSpan::new("src/v3/std/effects.dag", 25415, 25467),
         });
         declarations.push(Declaration {
@@ -77301,7 +68118,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             refinement: None,
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/effects.dag", 25964, 25984),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(1877),
@@ -77315,7 +68131,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 25962, 25982),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25989, 26010),
         });
         declarations.push(Declaration {
             id: DeclarationId(1878),
@@ -77329,7 +68145,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 25987, 26008),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26015, 26038),
         });
         declarations.push(Declaration {
             id: DeclarationId(1879),
@@ -77343,7 +68159,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 26013, 26036),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26043, 26061),
         });
         declarations.push(Declaration {
             id: DeclarationId(1880),
@@ -77357,25 +68173,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 26041, 26059),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26066, 26084),
         });
         declarations.push(Declaration {
             id: DeclarationId(1881),
             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/effects.dag", 26064, 26082),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1879),
-            name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
@@ -77390,14 +68192,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 26399, 26445),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26401, 26447),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1880),
-=======
             id: DeclarationId(1882),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77413,14 +68211,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 26450, 26502),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26452, 26504),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1881),
-=======
             id: DeclarationId(1883),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77431,9 +68225,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/effects.dag", 32456, 32462),
-=======
             span: SourceSpan::new("src/v3/std/effects.dag", 32458, 32464),
         });
         declarations.push(Declaration {
@@ -77454,7 +68245,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             refinement: None,
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/effects.dag", 32469, 32506),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(1885),
@@ -77473,30 +68263,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 32467, 32504),
+            span: SourceSpan::new("src/v3/std/effects.dag", 32511, 32548),
         });
         declarations.push(Declaration {
             id: DeclarationId(1886),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "reason".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-            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/effects.dag", 32509, 32546),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1884),
-            name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -77506,14 +68277,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 33020, 33039),
+            span: SourceSpan::new("src/v3/std/effects.dag", 33022, 33041),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1885),
-=======
             id: DeclarationId(1887),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77529,14 +68296,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 33044, 33093),
+            span: SourceSpan::new("src/v3/std/effects.dag", 33046, 33095),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1886),
-=======
             id: DeclarationId(1888),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -77555,11 +68318,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1887),
-=======
             id: DeclarationId(1889),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -77578,11 +68337,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1888),
-=======
             id: DeclarationId(1890),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -77601,11 +68356,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1889),
-=======
             id: DeclarationId(1891),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -77624,11 +68375,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1890),
-=======
             id: DeclarationId(1892),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -77647,11 +68394,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1891),
-=======
             id: DeclarationId(1893),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -77670,9 +68413,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1892),
-=======
             id: DeclarationId(1894),
             name: None,
             connective: TypeConnective::Instantiation {
@@ -77694,27 +68434,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         });
         declarations.push(Declaration {
             id: DeclarationId(1895),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1143),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1144),
-                    value: DeclarationId(723),
-                }],
-            },
-            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/substrate.dag", 28003, 28024),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1896),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -77734,7 +68453,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 28088, 28109),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1894),
+            id: DeclarationId(1896),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77748,11 +68467,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 754, 764),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1895),
-=======
             id: DeclarationId(1897),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77771,11 +68486,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 769, 788),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1896),
-=======
             id: DeclarationId(1898),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77789,11 +68500,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 793, 803),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1897),
-=======
             id: DeclarationId(1899),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -77812,11 +68519,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1898),
-=======
             id: DeclarationId(1900),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77835,11 +68538,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 1379, 1393),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1899),
-=======
             id: DeclarationId(1901),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77858,11 +68557,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 1398, 1411),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1900),
-=======
             id: DeclarationId(1902),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77881,11 +68576,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 1416, 1433),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1901),
-=======
             id: DeclarationId(1903),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77904,11 +68595,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3566, 3586),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1902),
-=======
             id: DeclarationId(1904),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77927,11 +68614,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3591, 3619),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1903),
-=======
             id: DeclarationId(1905),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77950,11 +68633,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3624, 3658),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1904),
-=======
             id: DeclarationId(1906),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77973,11 +68652,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3663, 3692),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1905),
-=======
             id: DeclarationId(1907),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77996,11 +68671,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3697, 3714),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1906),
-=======
             id: DeclarationId(1908),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -78014,11 +68685,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 4338, 4345),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1907),
-=======
             id: DeclarationId(1909),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -78037,11 +68704,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 4350, 4400),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1908),
-=======
             id: DeclarationId(1910),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -78060,11 +68723,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 5964, 5988),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1909),
-=======
             id: DeclarationId(1911),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -78078,11 +68737,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6013, 6022),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1910),
-=======
             id: DeclarationId(1912),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -78101,11 +68756,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6027, 6063),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1911),
-=======
             id: DeclarationId(1913),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78130,11 +68781,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6375, 6425),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1912),
-=======
             id: DeclarationId(1914),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -78148,11 +68795,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6430, 6439),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1913),
-=======
             id: DeclarationId(1915),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(786),
@@ -78172,20 +68815,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7015, 7028),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1914),
-=======
             id: DeclarationId(1916),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1913),
-=======
                     ty: DeclarationId(1915),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -78199,11 +68834,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7003, 7029),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1915),
-=======
             id: DeclarationId(1917),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -78217,11 +68848,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7034, 7051),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1916),
-=======
             id: DeclarationId(1918),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -78240,11 +68867,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7302, 7312),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1917),
-=======
             id: DeclarationId(1919),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -78258,11 +68881,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7317, 7326),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1918),
-=======
             id: DeclarationId(1920),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -78276,11 +68895,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7331, 7340),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1919),
-=======
             id: DeclarationId(1921),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -78299,11 +68914,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7767, 7787),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1920),
-=======
             id: DeclarationId(1922),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -78322,11 +68933,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7792, 7816),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1921),
-=======
             id: DeclarationId(1923),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78346,20 +68953,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7828, 7844),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1922),
-=======
             id: DeclarationId(1924),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1921),
-=======
                     ty: DeclarationId(1923),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -78373,11 +68972,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7821, 7845),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1923),
-=======
             id: DeclarationId(1925),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78397,20 +68992,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7855, 7871),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1924),
-=======
             id: DeclarationId(1926),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1923),
-=======
                     ty: DeclarationId(1925),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -78424,11 +69011,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7850, 7872),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1925),
-=======
             id: DeclarationId(1927),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78448,20 +69031,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7881, 7897),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1926),
-=======
             id: DeclarationId(1928),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1925),
-=======
                     ty: DeclarationId(1927),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -78475,11 +69050,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7877, 7898),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1927),
-=======
             id: DeclarationId(1929),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78499,11 +69070,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7961, 7977),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1928),
-=======
             id: DeclarationId(1930),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78513,11 +69080,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "payload".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1927),
-=======
                         ty: DeclarationId(1929),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -78532,11 +69095,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7903, 7983),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1929),
-=======
             id: DeclarationId(1931),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -78555,11 +69114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9596, 9625),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1930),
-=======
             id: DeclarationId(1932),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78579,20 +69134,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9660, 9676),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1931),
-=======
             id: DeclarationId(1933),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "fields".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1930),
-=======
                     ty: DeclarationId(1932),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -78606,11 +69153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9630, 9678),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1932),
-=======
             id: DeclarationId(1934),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -78629,11 +69172,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9683, 9711),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1933),
-=======
             id: DeclarationId(1935),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78653,20 +69192,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9730, 9746),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1934),
-=======
             id: DeclarationId(1936),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1933),
-=======
                     ty: DeclarationId(1935),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -78680,11 +69211,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9716, 9747),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1935),
-=======
             id: DeclarationId(1937),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78704,20 +69231,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9765, 9781),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1936),
-=======
             id: DeclarationId(1938),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1935),
-=======
                     ty: DeclarationId(1937),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -78731,11 +69250,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9752, 9782),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1937),
-=======
             id: DeclarationId(1939),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -78754,11 +69269,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11036, 11059),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1938),
-=======
             id: DeclarationId(1940),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -78777,11 +69288,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11064, 11098),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1939),
-=======
             id: DeclarationId(1941),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -78795,11 +69302,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11103, 11110),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1940),
-=======
             id: DeclarationId(1942),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -78813,11 +69316,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11115, 11121),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1941),
-=======
             id: DeclarationId(1943),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -78836,11 +69335,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11126, 11146),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1942),
-=======
             id: DeclarationId(1944),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -78859,11 +69354,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11375, 11392),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1943),
-=======
             id: DeclarationId(1945),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78883,20 +69374,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11414, 11429),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1944),
-=======
             id: DeclarationId(1946),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "children".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1943),
-=======
                     ty: DeclarationId(1945),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -78910,11 +69393,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11397, 11431),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1945),
-=======
             id: DeclarationId(1947),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78934,20 +69413,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11453, 11468),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1946),
-=======
             id: DeclarationId(1948),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "variants".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1945),
-=======
                     ty: DeclarationId(1947),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -78961,11 +69432,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11436, 11470),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1947),
-=======
             id: DeclarationId(1949),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78985,21 +69452,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11497, 11516),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1948),
-=======
             id: DeclarationId(1950),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "inputs".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1947),
-=======
                         ty: DeclarationId(1949),
->>>>>>> origin/main
                     },
                     Field {
                         label: "output".to_string(),
@@ -79022,11 +69481,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11475, 11572),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1949),
-=======
             id: DeclarationId(1951),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -79051,11 +69506,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11577, 11655),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1950),
-=======
             id: DeclarationId(1952),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79075,11 +69526,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11723, 11745),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1951),
-=======
             id: DeclarationId(1953),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -79089,11 +69536,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "arguments".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1950),
-=======
                         ty: DeclarationId(1952),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -79108,11 +69551,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11660, 11751),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1952),
-=======
             id: DeclarationId(1954),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -79131,11 +69570,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1953),
-=======
             id: DeclarationId(1955),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79155,11 +69590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11852, 11871),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1954),
-=======
             id: DeclarationId(1956),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79179,11 +69610,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11890, 11912),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1955),
-=======
             id: DeclarationId(1957),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -79202,11 +69629,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1956),
-=======
             id: DeclarationId(1958),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -79225,11 +69648,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1957),
-=======
             id: DeclarationId(1959),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -79248,11 +69667,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1958),
-=======
             id: DeclarationId(1960),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -79271,11 +69686,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1959),
-=======
             id: DeclarationId(1961),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79295,11 +69706,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13149, 13168),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1960),
-=======
             id: DeclarationId(1962),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -79313,11 +69720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13449, 13452),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1961),
-=======
             id: DeclarationId(1963),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -79331,11 +69734,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13457, 13460),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1962),
-=======
             id: DeclarationId(1964),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -79349,11 +69748,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13465, 13468),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1963),
-=======
             id: DeclarationId(1965),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -79367,11 +69762,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13473, 13476),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1964),
-=======
             id: DeclarationId(1966),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -79385,11 +69776,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13600, 13602),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1965),
-=======
             id: DeclarationId(1967),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -79403,11 +69790,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13607, 13609),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1966),
-=======
             id: DeclarationId(1968),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -79421,11 +69804,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13614, 13616),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1967),
-=======
             id: DeclarationId(1969),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -79439,11 +69818,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13621, 13623),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1968),
-=======
             id: DeclarationId(1970),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -79457,11 +69832,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13628, 13630),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1969),
-=======
             id: DeclarationId(1971),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -79475,11 +69846,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13635, 13637),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1970),
-=======
             id: DeclarationId(1972),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -79493,11 +69860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14414, 14417),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1971),
-=======
             id: DeclarationId(1973),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -79511,11 +69874,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14422, 14424),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1972),
-=======
             id: DeclarationId(1974),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -79534,11 +69893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14660, 14684),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1973),
-=======
             id: DeclarationId(1975),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -79557,11 +69912,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14689, 14713),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1974),
-=======
             id: DeclarationId(1976),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -79580,11 +69931,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14718, 14736),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1975),
-=======
             id: DeclarationId(1977),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -79603,11 +69950,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14923, 14946),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1976),
-=======
             id: DeclarationId(1978),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -79626,11 +69969,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14951, 15007),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1977),
-=======
             id: DeclarationId(1979),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -79649,11 +69988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15012, 15066),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1978),
-=======
             id: DeclarationId(1980),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -79672,11 +70007,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15071, 15093),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1979),
-=======
             id: DeclarationId(1981),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -79701,11 +70032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15218, 15270),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1980),
-=======
             id: DeclarationId(1982),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -79724,11 +70051,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15275, 15305),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1981),
-=======
             id: DeclarationId(1983),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -79747,11 +70070,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1982),
-=======
             id: DeclarationId(1984),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -79771,11 +70090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 17460, 17491),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1983),
-=======
             id: DeclarationId(1985),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(725),
@@ -79795,11 +70110,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 17515, 17545),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1984),
-=======
             id: DeclarationId(1986),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -79818,11 +70129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18168, 18197),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1985),
-=======
             id: DeclarationId(1987),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -79847,11 +70154,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18202, 18249),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1986),
-=======
             id: DeclarationId(1988),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -79870,11 +70173,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1987),
-=======
             id: DeclarationId(1989),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79894,11 +70193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18607, 18619),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1988),
-=======
             id: DeclarationId(1990),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -79912,11 +70207,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18860, 18869),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1989),
-=======
             id: DeclarationId(1991),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79936,11 +70227,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18927, 18943),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1990),
-=======
             id: DeclarationId(1992),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -79959,11 +70246,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1991),
-=======
             id: DeclarationId(1993),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -79977,11 +70260,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19445, 19457),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1992),
-=======
             id: DeclarationId(1994),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80001,11 +70280,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19535, 19547),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1993),
-=======
             id: DeclarationId(1995),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -80024,11 +70299,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1994),
-=======
             id: DeclarationId(1996),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -80047,11 +70318,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1995),
-=======
             id: DeclarationId(1997),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -80070,11 +70337,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19737, 19753),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1996),
-=======
             id: DeclarationId(1998),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -80093,11 +70356,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19758, 19782),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1997),
-=======
             id: DeclarationId(1999),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -80116,11 +70375,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19787, 19805),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1998),
-=======
             id: DeclarationId(2000),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -80139,11 +70394,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19810, 19824),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1999),
-=======
             id: DeclarationId(2001),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -80162,11 +70413,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19829, 19843),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2000),
-=======
             id: DeclarationId(2002),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80186,11 +70433,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19872, 19889),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2001),
-=======
             id: DeclarationId(2003),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80210,11 +70453,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19899, 19913),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2002),
-=======
             id: DeclarationId(2004),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80234,11 +70473,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19923, 19936),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2003),
-=======
             id: DeclarationId(2005),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80258,11 +70493,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19949, 19962),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2004),
-=======
             id: DeclarationId(2006),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -80281,11 +70512,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 26045, 26063),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2005),
-=======
             id: DeclarationId(2007),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -80299,11 +70526,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 26068, 26074),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2006),
-=======
             id: DeclarationId(2008),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -80323,20 +70546,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 26107, 26131),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2007),
-=======
             id: DeclarationId(2009),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "candidates".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2006),
-=======
                     ty: DeclarationId(2008),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -80350,9 +70565,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 26079, 26133),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2008),
-=======
             id: DeclarationId(2010),
             name: None,
             connective: TypeConnective::Instantiation {
@@ -80374,27 +70586,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         });
         declarations.push(Declaration {
             id: DeclarationId(2011),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1143),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1144),
-                    value: DeclarationId(849),
-                }],
-            },
-            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/algebra.dag", 10942, 10962),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2012),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -80414,7 +70605,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11026, 11046),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2010),
+            id: DeclarationId(2012),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -80434,11 +70625,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11114, 11144),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2011),
-=======
             id: DeclarationId(2013),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80458,11 +70645,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11611, 11629),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2012),
-=======
             id: DeclarationId(2014),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -80482,11 +70665,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11635, 11665),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2013),
-=======
             id: DeclarationId(2015),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80506,11 +70685,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 14162, 14180),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2014),
-=======
             id: DeclarationId(2016),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -80530,11 +70705,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22217, 22247),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2015),
-=======
             id: DeclarationId(2017),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80554,11 +70725,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22252, 22270),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2016),
-=======
             id: DeclarationId(2018),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80578,11 +70745,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22530, 22548),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2017),
-=======
             id: DeclarationId(2019),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80602,11 +70765,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22553, 22571),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2018),
-=======
             id: DeclarationId(2020),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80626,11 +70785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23044, 23062),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2019),
-=======
             id: DeclarationId(2021),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80650,11 +70805,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23067, 23085),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2020),
-=======
             id: DeclarationId(2022),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80674,11 +70825,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23186, 23204),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2021),
-=======
             id: DeclarationId(2023),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80698,11 +70845,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23524, 23542),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2022),
-=======
             id: DeclarationId(2024),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80722,11 +70865,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23547, 23565),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2023),
-=======
             id: DeclarationId(2025),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80746,11 +70885,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 25113, 25131),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2024),
-=======
             id: DeclarationId(2026),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80770,11 +70905,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 25384, 25402),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2025),
-=======
             id: DeclarationId(2027),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80794,11 +70925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 25850, 25868),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2026),
-=======
             id: DeclarationId(2028),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80818,11 +70945,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 27885, 27903),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2027),
-=======
             id: DeclarationId(2029),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80842,11 +70965,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 27933, 27951),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2028),
-=======
             id: DeclarationId(2030),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80866,11 +70985,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28238, 28256),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2029),
-=======
             id: DeclarationId(2031),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80890,11 +71005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28284, 28302),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2030),
-=======
             id: DeclarationId(2032),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80914,11 +71025,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28662, 28680),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2031),
-=======
             id: DeclarationId(2033),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80938,11 +71045,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28685, 28703),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2032),
-=======
             id: DeclarationId(2034),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -80956,11 +71059,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 4953, 4965),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2033),
-=======
             id: DeclarationId(2035),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -80974,11 +71073,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 4970, 4986),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2034),
-=======
             id: DeclarationId(2036),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -80992,11 +71087,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 4991, 5005),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2035),
-=======
             id: DeclarationId(2037),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81010,11 +71101,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 5855, 5868),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2036),
-=======
             id: DeclarationId(2038),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81028,11 +71115,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 5873, 5888),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2037),
-=======
             id: DeclarationId(2039),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81046,11 +71129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 5893, 5909),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2038),
-=======
             id: DeclarationId(2040),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81064,11 +71143,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 5914, 5927),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2039),
-=======
             id: DeclarationId(2041),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -81087,11 +71162,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2040),
-=======
             id: DeclarationId(2042),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -81110,11 +71181,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2041),
-=======
             id: DeclarationId(2043),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -81133,11 +71200,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2042),
-=======
             id: DeclarationId(2044),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -81156,11 +71219,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2043),
-=======
             id: DeclarationId(2045),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81174,11 +71233,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 8405, 8414),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2044),
-=======
             id: DeclarationId(2046),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81197,11 +71252,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 8419, 8465),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2045),
-=======
             id: DeclarationId(2047),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81220,11 +71271,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9506, 9523),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2046),
-=======
             id: DeclarationId(2048),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81243,11 +71290,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9528, 9552),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2047),
-=======
             id: DeclarationId(2049),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -81272,11 +71315,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9557, 9619),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2048),
-=======
             id: DeclarationId(2050),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -81296,20 +71335,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9636, 9666),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2049),
-=======
             id: DeclarationId(2051),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2048),
-=======
                     ty: DeclarationId(2050),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -81323,11 +71354,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9624, 9667),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2050),
-=======
             id: DeclarationId(2052),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -81347,20 +71374,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9680, 9710),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2051),
-=======
             id: DeclarationId(2053),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2050),
-=======
                     ty: DeclarationId(2052),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -81374,11 +71393,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9672, 9711),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2052),
-=======
             id: DeclarationId(2054),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81397,11 +71412,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9716, 9737),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2053),
-=======
             id: DeclarationId(2055),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81420,11 +71431,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9742, 9761),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2054),
-=======
             id: DeclarationId(2056),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(31),
@@ -81444,11 +71451,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9479, 9501),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2055),
-=======
             id: DeclarationId(2057),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81462,11 +71465,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18143, 18156),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2056),
-=======
             id: DeclarationId(2058),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81480,11 +71479,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18161, 18169),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2057),
-=======
             id: DeclarationId(2059),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81498,11 +71493,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18174, 18185),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2058),
-=======
             id: DeclarationId(2060),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81516,11 +71507,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18190, 18207),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2059),
-=======
             id: DeclarationId(2061),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81534,11 +71521,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18212, 18226),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2060),
-=======
             id: DeclarationId(2062),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81557,11 +71540,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18231, 18280),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2061),
-=======
             id: DeclarationId(2063),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81575,11 +71554,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18285, 18301),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2062),
-=======
             id: DeclarationId(2064),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81593,11 +71568,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18306, 18318),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2063),
-=======
             id: DeclarationId(2065),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(43),
@@ -81617,11 +71588,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18107, 18138),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2064),
-=======
             id: DeclarationId(2066),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(691),
@@ -81641,11 +71608,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11495, 11507),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2065),
-=======
             id: DeclarationId(2067),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(728)],
@@ -81663,11 +71626,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2066),
-=======
             id: DeclarationId(2068),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(704),
@@ -81677,11 +71636,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         value: DeclarationId(849),
                     },
                     TemplateArgument {
-<<<<<<< HEAD
-                        parameter: DeclarationId(1801),
-=======
                         parameter: DeclarationId(1803),
->>>>>>> origin/main
                         value: DeclarationId(856),
                     },
                 ],
@@ -81697,11 +71652,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11488, 11535),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2067),
-=======
             id: DeclarationId(2069),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(691),
@@ -81721,11 +71672,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11795, 11810),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2068),
-=======
             id: DeclarationId(2070),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(849), DeclarationId(849)],
@@ -81743,11 +71690,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2069),
-=======
             id: DeclarationId(2071),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
@@ -81761,11 +71704,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         value: DeclarationId(849),
                     },
                     TemplateArgument {
-<<<<<<< HEAD
-                        parameter: DeclarationId(1791),
-=======
                         parameter: DeclarationId(1793),
->>>>>>> origin/main
                         value: DeclarationId(860),
                     },
                 ],
@@ -81781,11 +71720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 14202, 14245),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2070),
-=======
             id: DeclarationId(2072),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(850), DeclarationId(694)],
@@ -81803,11 +71738,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2071),
-=======
             id: DeclarationId(2073),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
@@ -81817,11 +71748,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         value: DeclarationId(850),
                     },
                     TemplateArgument {
-<<<<<<< HEAD
-                        parameter: DeclarationId(1791),
-=======
                         parameter: DeclarationId(1793),
->>>>>>> origin/main
                         value: DeclarationId(886),
                     },
                     TemplateArgument {
@@ -81841,11 +71768,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 16911, 17021),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2072),
-=======
             id: DeclarationId(2074),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(850), DeclarationId(694)],
@@ -81863,11 +71786,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2073),
-=======
             id: DeclarationId(2075),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
@@ -81877,11 +71796,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         value: DeclarationId(850),
                     },
                     TemplateArgument {
-<<<<<<< HEAD
-                        parameter: DeclarationId(1791),
-=======
                         parameter: DeclarationId(1793),
->>>>>>> origin/main
                         value: DeclarationId(886),
                     },
                     TemplateArgument {
@@ -81901,11 +71816,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 17076, 17186),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2074),
-=======
             id: DeclarationId(2076),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -81925,11 +71836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22293, 22323),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2075),
-=======
             id: DeclarationId(2077),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -81949,11 +71856,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22275, 22324),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2076),
-=======
             id: DeclarationId(2078),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -81973,11 +71876,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22603, 22610),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2077),
-=======
             id: DeclarationId(2079),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -81997,11 +71896,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22737, 22789),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2078),
-=======
             id: DeclarationId(2080),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -82021,11 +71916,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23140, 23147),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2079),
-=======
             id: DeclarationId(2081),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -82045,11 +71936,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23118, 23148),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2080),
-=======
             id: DeclarationId(2082),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -82069,11 +71956,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23597, 23604),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2081),
-=======
             id: DeclarationId(2083),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -82093,11 +71976,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23735, 23792),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2082),
-=======
             id: DeclarationId(2084),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -82117,11 +71996,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 25317, 25349),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2083),
-=======
             id: DeclarationId(2085),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -82141,11 +72016,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 27988, 27995),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2084),
-=======
             id: DeclarationId(2086),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -82165,11 +72036,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28136, 28201),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2085),
-=======
             id: DeclarationId(2087),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(850), DeclarationId(849)],
@@ -82187,11 +72054,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2086),
-=======
             id: DeclarationId(2088),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
@@ -82205,11 +72068,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         value: DeclarationId(849),
                     },
                     TemplateArgument {
-<<<<<<< HEAD
-                        parameter: DeclarationId(1791),
-=======
                         parameter: DeclarationId(1793),
->>>>>>> origin/main
                         value: DeclarationId(886),
                     },
                 ],
@@ -82225,11 +72084,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28319, 28377),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2087),
-=======
             id: DeclarationId(2089),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -82249,11 +72104,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28403, 28449),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2088),
-=======
             id: DeclarationId(2090),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -82273,19 +72124,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28720, 28727),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2089),
-            name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2031), DeclarationId(849)],
-                output: DeclarationId(2031),
-=======
             id: DeclarationId(2091),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(2033), DeclarationId(849)],
                 output: DeclarationId(2033),
->>>>>>> origin/main
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -82299,33 +72142,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2090),
-=======
             id: DeclarationId(2092),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
                 arguments: vec![
                     TemplateArgument {
                         parameter: DeclarationId(695),
-<<<<<<< HEAD
-                        value: DeclarationId(2031),
-=======
                         value: DeclarationId(2033),
->>>>>>> origin/main
                     },
                     TemplateArgument {
                         parameter: DeclarationId(694),
                         value: DeclarationId(849),
                     },
                     TemplateArgument {
-<<<<<<< HEAD
-                        parameter: DeclarationId(1791),
-=======
                         parameter: DeclarationId(1793),
->>>>>>> origin/main
                         value: DeclarationId(889),
                     },
                 ],
@@ -82341,11 +72172,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28708, 28749),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2091),
-=======
             id: DeclarationId(2093),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -82365,11 +72192,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4503, 4529),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2092),
-=======
             id: DeclarationId(2094),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -82388,11 +72211,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2093),
-=======
             id: DeclarationId(2095),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -82411,11 +72230,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2094),
-=======
             id: DeclarationId(2096),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -82435,11 +72250,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_operations.dag", 6546, 6561),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2095),
-=======
             id: DeclarationId(2097),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -82459,20 +72270,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2718, 2749),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2096),
-=======
             id: DeclarationId(2098),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "content".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2095),
-=======
                     ty: DeclarationId(2097),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -82486,11 +72289,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2690, 2751),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2097),
-=======
             id: DeclarationId(2099),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -82510,20 +72309,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2784, 2820),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2098),
-=======
             id: DeclarationId(2100),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "content".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2097),
-=======
                     ty: DeclarationId(2099),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -82537,11 +72328,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2756, 2822),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2099),
-=======
             id: DeclarationId(2101),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -82566,11 +72353,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3211, 3276),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2100),
-=======
             id: DeclarationId(2102),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -82589,11 +72372,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3281, 3305),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2101),
-=======
             id: DeclarationId(2103),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -82612,11 +72391,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3568, 3596),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2102),
-=======
             id: DeclarationId(2104),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -82635,11 +72410,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3601, 3637),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2103),
-=======
             id: DeclarationId(2105),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -82658,11 +72429,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4332, 4354),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2104),
-=======
             id: DeclarationId(2106),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -82682,20 +72449,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4376, 4406),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2105),
-=======
             id: DeclarationId(2107),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2104),
-=======
                     ty: DeclarationId(2106),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -82709,11 +72468,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4359, 4407),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2106),
-=======
             id: DeclarationId(2108),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82727,11 +72482,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5616, 5623),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2107),
-=======
             id: DeclarationId(2109),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82745,11 +72496,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5749, 5761),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2108),
-=======
             id: DeclarationId(2110),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -82768,11 +72515,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5979, 6014),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2109),
-=======
             id: DeclarationId(2111),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -82791,11 +72534,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6019, 6062),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2110),
-=======
             id: DeclarationId(2112),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -82814,11 +72553,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6067, 6144),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2111),
-=======
             id: DeclarationId(2113),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -82838,11 +72573,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6234, 6268),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2112),
-=======
             id: DeclarationId(2114),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -82861,11 +72592,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2113),
-=======
             id: DeclarationId(2115),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -82884,11 +72611,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2114),
-=======
             id: DeclarationId(2116),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -82902,13 +72625,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "content".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2111),
-                    },
-                    Field {
-                        label: "citations".to_string(),
-                        ty: DeclarationId(2112),
-=======
                         ty: DeclarationId(2113),
                     },
                     Field {
@@ -82918,11 +72634,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "cache_control".to_string(),
                         ty: DeclarationId(2115),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "cache_control".to_string(),
-                        ty: DeclarationId(2113),
                     },
                 ],
             },
@@ -82937,11 +72648,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6149, 6364),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2115),
-=======
             id: DeclarationId(2117),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -82960,11 +72667,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6369, 6418),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2116),
-=======
             id: DeclarationId(2118),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -82983,11 +72686,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6926, 6962),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2117),
-=======
             id: DeclarationId(2119),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -83006,11 +72705,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2118),
-=======
             id: DeclarationId(2120),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -83029,11 +72724,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2119),
-=======
             id: DeclarationId(2121),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83043,19 +72734,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "content".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2117),
-                    },
-                    Field {
-                        label: "is_error".to_string(),
-                        ty: DeclarationId(2118),
-=======
                         ty: DeclarationId(2119),
                     },
                     Field {
                         label: "is_error".to_string(),
                         ty: DeclarationId(2120),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -83070,11 +72753,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6967, 7085),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2120),
-=======
             id: DeclarationId(2122),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -83093,11 +72772,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7532, 7570),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2121),
-=======
             id: DeclarationId(2123),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83126,11 +72801,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7575, 7658),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2122),
-=======
             id: DeclarationId(2124),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83144,11 +72815,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8016, 8023),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2123),
-=======
             id: DeclarationId(2125),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83162,11 +72829,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8028, 8037),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2124),
-=======
             id: DeclarationId(2126),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83180,11 +72843,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8042, 8054),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2125),
-=======
             id: DeclarationId(2127),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83198,11 +72857,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8059, 8066),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2126),
-=======
             id: DeclarationId(2128),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83216,11 +72871,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8071, 8080),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2127),
-=======
             id: DeclarationId(2129),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83234,11 +72885,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8085, 8092),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2128),
-=======
             id: DeclarationId(2130),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83252,90 +72899,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8097, 8123),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2129),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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/anthropic_schema.dag", 8435, 8442),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2130),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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/anthropic_schema.dag", 8453, 8460),
-        });
-        declarations.push(Declaration {
             id: DeclarationId(2131),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "cited_text".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "document_index".to_string(),
-                        ty: DeclarationId(93),
-                    },
-                    Field {
-                        label: "document_title".to_string(),
-                        ty: DeclarationId(2129),
-                    },
-                    Field {
-                        label: "file_id".to_string(),
-                        ty: DeclarationId(2130),
-                    },
-                    Field {
-                        label: "start_char_index".to_string(),
-                        ty: DeclarationId(93),
-                    },
-                    Field {
-                        label: "end_char_index".to_string(),
-                        ty: DeclarationId(93),
-                    },
-                ],
-            },
-            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/anthropic_schema.dag", 8363, 8506),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2132),
-=======
-            id: DeclarationId(2131),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -83354,7 +72918,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2133),
+            id: DeclarationId(2132),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -83373,7 +72937,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2134),
+            id: DeclarationId(2133),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83387,11 +72951,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "document_title".to_string(),
-                        ty: DeclarationId(2132),
+                        ty: DeclarationId(2131),
                     },
                     Field {
                         label: "file_id".to_string(),
-                        ty: DeclarationId(2133),
+                        ty: DeclarationId(2132),
                     },
                     Field {
                         label: "start_char_index".to_string(),
@@ -83414,7 +72978,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8363, 8506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2135),
+            id: DeclarationId(2134),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -83433,7 +72997,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2136),
+            id: DeclarationId(2135),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -83452,7 +73016,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2137),
+            id: DeclarationId(2136),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83466,11 +73030,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "document_title".to_string(),
-                        ty: DeclarationId(2135),
+                        ty: DeclarationId(2134),
                     },
                     Field {
                         label: "file_id".to_string(),
-                        ty: DeclarationId(2136),
+                        ty: DeclarationId(2135),
                     },
                     Field {
                         label: "start_page_number".to_string(),
@@ -83572,11 +73136,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8661, 8814),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2138),
-=======
             id: DeclarationId(2140),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -83595,11 +73155,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2139),
-=======
             id: DeclarationId(2141),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83613,11 +73169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "title".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2138),
-=======
                         ty: DeclarationId(2140),
->>>>>>> origin/main
                     },
                     Field {
                         label: "url".to_string(),
@@ -83636,11 +73188,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8819, 8919),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2140),
-=======
             id: DeclarationId(2142),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -83659,11 +73207,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2141),
-=======
             id: DeclarationId(2143),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83677,11 +73221,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "title".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2140),
-=======
                         ty: DeclarationId(2142),
->>>>>>> origin/main
                     },
                     Field {
                         label: "search_result_index".to_string(),
@@ -83708,11 +73248,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8924, 9071),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2142),
-=======
             id: DeclarationId(2144),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -83732,19 +73268,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9729),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2143),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2142),
-=======
             id: DeclarationId(2145),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
                     DeclarationId(2144),
->>>>>>> origin/main
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -83759,11 +73287,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2144),
-=======
             id: DeclarationId(2146),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83773,11 +73297,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "citations".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2143),
-=======
                         ty: DeclarationId(2145),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -83792,11 +73312,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9650, 9732),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2145),
-=======
             id: DeclarationId(2147),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83821,11 +73337,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9737, 9798),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2146),
-=======
             id: DeclarationId(2148),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -83844,11 +73356,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9803, 9858),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2147),
-=======
             id: DeclarationId(2149),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -83867,11 +73375,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2148),
-=======
             id: DeclarationId(2150),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83889,11 +73393,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "caller".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2147),
-=======
                         ty: DeclarationId(2149),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -83908,11 +73408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9863, 9940),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2149),
-=======
             id: DeclarationId(2151),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -83931,11 +73427,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2150),
-=======
             id: DeclarationId(2152),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83953,11 +73445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "caller".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2149),
-=======
                         ty: DeclarationId(2151),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -83972,11 +73460,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9945, 10045),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2151),
-=======
             id: DeclarationId(2153),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -83995,11 +73479,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2152),
-=======
             id: DeclarationId(2154),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84013,11 +73493,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "caller".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2151),
-=======
                         ty: DeclarationId(2153),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -84032,11 +73508,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10050, 10136),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2153),
-=======
             id: DeclarationId(2155),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84050,11 +73522,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10357, 10366),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2154),
-=======
             id: DeclarationId(2156),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84068,11 +73536,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10371, 10379),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2155),
-=======
             id: DeclarationId(2157),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84086,11 +73550,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10384, 10397),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2156),
-=======
             id: DeclarationId(2158),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84104,11 +73564,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10402, 10419),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2157),
-=======
             id: DeclarationId(2159),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84122,11 +73578,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10424, 10447),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2158),
-=======
             id: DeclarationId(2160),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84140,11 +73592,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10452, 10471),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2159),
-=======
             id: DeclarationId(2161),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84158,11 +73606,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10476, 10494),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2160),
-=======
             id: DeclarationId(2162),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84176,9 +73620,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10499, 10506),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2161),
-=======
             id: DeclarationId(2163),
             name: None,
             connective: TypeConnective::Cardinality(
@@ -84199,26 +73640,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         });
         declarations.push(Declaration {
             id: DeclarationId(2164),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(93),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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/anthropic_schema.dag", 10756, 10760),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2165),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -84237,7 +73658,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2163),
+            id: DeclarationId(2165),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -84256,11 +73677,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2164),
-=======
             id: DeclarationId(2166),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84274,11 +73691,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11192, 11201),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2165),
-=======
             id: DeclarationId(2167),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -84298,11 +73711,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11687, 11725),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2166),
-=======
             id: DeclarationId(2168),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -84321,11 +73730,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2167),
-=======
             id: DeclarationId(2169),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -84344,11 +73749,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2168),
-=======
             id: DeclarationId(2170),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84362,11 +73763,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1013, 1025),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2169),
-=======
             id: DeclarationId(2171),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84380,11 +73777,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1030, 1044),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2170),
-=======
             id: DeclarationId(2172),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84398,11 +73791,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1049, 1064),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2171),
-=======
             id: DeclarationId(2173),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84416,11 +73805,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1069, 1086),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2172),
-=======
             id: DeclarationId(2174),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84434,11 +73819,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1091, 1114),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2173),
-=======
             id: DeclarationId(2175),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84452,11 +73833,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4719, 4726),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2174),
-=======
             id: DeclarationId(2176),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84470,11 +73847,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4731, 4735),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2175),
-=======
             id: DeclarationId(2177),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -84494,11 +73867,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6983, 7004),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2176),
-=======
             id: DeclarationId(2178),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84512,11 +73881,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2224, 2238),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2177),
-=======
             id: DeclarationId(2179),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84530,11 +73895,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2243, 2268),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2178),
-=======
             id: DeclarationId(2180),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84548,11 +73909,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2273, 2283),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2179),
-=======
             id: DeclarationId(2181),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84566,11 +73923,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2548, 2565),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2180),
-=======
             id: DeclarationId(2182),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84584,11 +73937,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2570, 2594),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2181),
-=======
             id: DeclarationId(2183),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84602,11 +73951,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2599, 2631),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2182),
-=======
             id: DeclarationId(2184),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84620,11 +73965,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2636, 2663),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2183),
-=======
             id: DeclarationId(2185),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84638,11 +73979,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3369, 3393),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2184),
-=======
             id: DeclarationId(2186),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84656,11 +73993,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3398, 3430),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2185),
-=======
             id: DeclarationId(2187),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84674,11 +74007,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3564, 3588),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2186),
-=======
             id: DeclarationId(2188),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84692,11 +74021,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3593, 3614),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2187),
-=======
             id: DeclarationId(2189),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84710,11 +74035,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3619, 3637),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2188),
-=======
             id: DeclarationId(2190),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84728,11 +74049,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3781, 3796),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2189),
-=======
             id: DeclarationId(2191),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84746,11 +74063,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3801, 3831),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2190),
-=======
             id: DeclarationId(2192),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84764,11 +74077,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3836, 3857),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2191),
-=======
             id: DeclarationId(2193),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84782,11 +74091,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4024, 4044),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2192),
-=======
             id: DeclarationId(2194),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84800,11 +74105,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4049, 4076),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2193),
-=======
             id: DeclarationId(2195),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84818,11 +74119,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4081, 4095),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2194),
-=======
             id: DeclarationId(2196),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84836,11 +74133,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4354, 4362),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2195),
-=======
             id: DeclarationId(2197),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84854,11 +74147,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4367, 4393),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2196),
-=======
             id: DeclarationId(2198),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84872,11 +74161,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4398, 4423),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2197),
-=======
             id: DeclarationId(2199),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -84896,11 +74181,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5320, 5332),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2198),
-=======
             id: DeclarationId(2200),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84914,11 +74195,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5693, 5713),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2199),
-=======
             id: DeclarationId(2201),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84932,11 +74209,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5718, 5736),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2200),
-=======
             id: DeclarationId(2202),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84950,11 +74223,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5741, 5759),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2201),
-=======
             id: DeclarationId(2203),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84968,11 +74237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5764, 5791),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2202),
-=======
             id: DeclarationId(2204),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -84991,11 +74256,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2203),
-=======
             id: DeclarationId(2205),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -85014,11 +74275,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2204),
-=======
             id: DeclarationId(2206),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -85037,11 +74294,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2205),
-=======
             id: DeclarationId(2207),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -85060,11 +74313,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2206),
-=======
             id: DeclarationId(2208),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -85083,11 +74332,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2207),
-=======
             id: DeclarationId(2209),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -85106,11 +74351,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2208),
-=======
             id: DeclarationId(2210),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -85129,11 +74370,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1430, 1462),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2209),
-=======
             id: DeclarationId(2211),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -85152,11 +74389,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1467, 1503),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2210),
-=======
             id: DeclarationId(2212),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -85175,11 +74408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1508, 1545),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2211),
-=======
             id: DeclarationId(2213),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -85198,11 +74427,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1550, 1576),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2212),
-=======
             id: DeclarationId(2214),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -85221,11 +74446,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1581, 1614),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2213),
-=======
             id: DeclarationId(2215),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85239,11 +74460,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1619, 1636),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2214),
-=======
             id: DeclarationId(2216),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -85262,11 +74479,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1641, 1695),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2215),
-=======
             id: DeclarationId(2217),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85280,11 +74493,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1700, 1707),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2216),
-=======
             id: DeclarationId(2218),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -85303,11 +74512,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2059, 2097),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2217),
-=======
             id: DeclarationId(2219),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -85332,11 +74537,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2102, 2176),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2218),
-=======
             id: DeclarationId(2220),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -85361,11 +74562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2181, 2256),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2219),
-=======
             id: DeclarationId(2221),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -85390,11 +74587,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2261, 2334),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2220),
-=======
             id: DeclarationId(2222),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -85413,11 +74606,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2339, 2376),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2221),
-=======
             id: DeclarationId(2223),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -85436,11 +74625,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2381, 2418),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2222),
-=======
             id: DeclarationId(2224),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -85459,11 +74644,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2423, 2464),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2223),
-=======
             id: DeclarationId(2225),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85477,11 +74658,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2469, 2485),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2224),
-=======
             id: DeclarationId(2226),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85495,11 +74672,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3221, 3231),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2225),
-=======
             id: DeclarationId(2227),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -85518,11 +74691,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3236, 3283),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2226),
-=======
             id: DeclarationId(2228),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -85541,11 +74710,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3288, 3339),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2227),
-=======
             id: DeclarationId(2229),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85559,11 +74724,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3529, 3533),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2228),
-=======
             id: DeclarationId(2230),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85577,11 +74738,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3538, 3545),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2229),
-=======
             id: DeclarationId(2231),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85595,11 +74752,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3550, 3556),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2230),
-=======
             id: DeclarationId(2232),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -85618,11 +74771,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2231),
-=======
             id: DeclarationId(2233),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85636,11 +74785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7493, 7504),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2232),
-=======
             id: DeclarationId(2234),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85654,11 +74799,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7553, 7567),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2233),
-=======
             id: DeclarationId(2235),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85672,11 +74813,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7632, 7648),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2234),
-=======
             id: DeclarationId(2236),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85690,11 +74827,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 360, 369),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2235),
-=======
             id: DeclarationId(2237),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85708,11 +74841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 374, 381),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2236),
-=======
             id: DeclarationId(2238),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85726,11 +74855,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 614, 618),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2237),
-=======
             id: DeclarationId(2239),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85744,11 +74869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 623, 632),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2238),
-=======
             id: DeclarationId(2240),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85762,11 +74883,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 910, 921),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2239),
-=======
             id: DeclarationId(2241),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85780,11 +74897,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 926, 935),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2240),
-=======
             id: DeclarationId(2242),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85798,11 +74911,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 1166, 1173),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2241),
-=======
             id: DeclarationId(2243),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85816,11 +74925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 1178, 1187),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2242),
-=======
             id: DeclarationId(2244),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85834,11 +74939,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2035, 2044),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2243),
-=======
             id: DeclarationId(2245),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85852,11 +74953,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2049, 2065),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2244),
-=======
             id: DeclarationId(2246),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85870,11 +74967,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2070, 2080),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2245),
-=======
             id: DeclarationId(2247),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85888,11 +74981,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2085, 2099),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2246),
-=======
             id: DeclarationId(2248),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85906,11 +74995,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2385, 2399),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2247),
-=======
             id: DeclarationId(2249),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85924,9 +75009,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2404, 2418),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2248),
-=======
             id: DeclarationId(2250),
             name: None,
             connective: TypeConnective::Instantiation {
@@ -85948,27 +75030,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         });
         declarations.push(Declaration {
             id: DeclarationId(2251),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(230),
-                }],
-            },
-            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/computation_model.dag", 2818, 2830),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2252),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -85988,7 +75049,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3210, 3222),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2253),
+            id: DeclarationId(2252),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86002,7 +75063,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3694, 3708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2254),
+            id: DeclarationId(2253),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86016,7 +75077,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3713, 3729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2252),
+            id: DeclarationId(2254),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -86035,11 +75096,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 6759, 6786),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2253),
-=======
             id: DeclarationId(2255),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86053,11 +75110,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7611, 7616),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2254),
-=======
             id: DeclarationId(2256),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86071,11 +75124,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7621, 7630),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2255),
-=======
             id: DeclarationId(2257),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -86101,11 +75150,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 9513, 9555),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2256),
-=======
             id: DeclarationId(2258),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86119,11 +75164,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3853, 3857),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2257),
-=======
             id: DeclarationId(2259),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86137,11 +75178,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3860, 3864),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2258),
-=======
             id: DeclarationId(2260),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86155,11 +75192,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3867, 3871),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2259),
-=======
             id: DeclarationId(2261),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86173,11 +75206,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3874, 3879),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2260),
-=======
             id: DeclarationId(2262),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86191,11 +75220,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3882, 3893),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2261),
-=======
             id: DeclarationId(2263),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86209,11 +75234,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3896, 3909),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2262),
-=======
             id: DeclarationId(2264),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86227,11 +75248,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4489, 4494),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2263),
-=======
             id: DeclarationId(2265),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86245,11 +75262,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4497, 4506),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2264),
-=======
             id: DeclarationId(2266),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86263,11 +75276,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4509, 4515),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2265),
-=======
             id: DeclarationId(2267),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86281,11 +75290,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4518, 4522),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2266),
-=======
             id: DeclarationId(2268),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86299,11 +75304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4525, 4529),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2267),
-=======
             id: DeclarationId(2269),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -86323,11 +75324,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5923, 5941),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2268),
-=======
             id: DeclarationId(2270),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -86347,11 +75344,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6396, 6424),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2269),
-=======
             id: DeclarationId(2271),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86365,11 +75358,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1099, 1113),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2270),
-=======
             id: DeclarationId(2272),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86383,11 +75372,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1118, 1128),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2271),
-=======
             id: DeclarationId(2273),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86401,11 +75386,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1133, 1145),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2272),
-=======
             id: DeclarationId(2274),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86419,11 +75400,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1150, 1163),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2273),
-=======
             id: DeclarationId(2275),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86437,11 +75414,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1168, 1180),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2274),
-=======
             id: DeclarationId(2276),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86455,11 +75428,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1185, 1197),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2275),
-=======
             id: DeclarationId(2277),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86473,11 +75442,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1202, 1224),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2276),
-=======
             id: DeclarationId(2278),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86491,11 +75456,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1229, 1248),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2277),
-=======
             id: DeclarationId(2279),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86509,11 +75470,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1253, 1278),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2278),
-=======
             id: DeclarationId(2280),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86527,11 +75484,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1283, 1306),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2279),
-=======
             id: DeclarationId(2281),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -86550,11 +75503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5506, 5542),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2280),
-=======
             id: DeclarationId(2282),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -86573,11 +75522,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5547, 5588),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2281),
-=======
             id: DeclarationId(2283),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -86597,11 +75542,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 6047, 6063),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2282),
-=======
             id: DeclarationId(2284),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -86620,11 +75561,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9175, 9216),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2283),
-=======
             id: DeclarationId(2285),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86638,11 +75575,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9513, 9525),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2284),
-=======
             id: DeclarationId(2286),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -86662,11 +75595,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9795, 9807),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2285),
-=======
             id: DeclarationId(2287),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -86676,11 +75605,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "sites".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2284),
-=======
                         ty: DeclarationId(2286),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -86695,11 +75620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9752, 9809),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2286),
-=======
             id: DeclarationId(2288),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -86718,11 +75639,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10119, 10153),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2287),
-=======
             id: DeclarationId(2289),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -86741,11 +75658,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10556, 10607),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2288),
-=======
             id: DeclarationId(2290),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86759,11 +75672,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10950, 10968),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2289),
-=======
             id: DeclarationId(2291),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -86792,11 +75701,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 11357, 11469),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2290),
-=======
             id: DeclarationId(2292),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -86816,9 +75721,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4846, 4866),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2291),
-=======
             id: DeclarationId(2293),
             name: None,
             connective: TypeConnective::Instantiation {
@@ -86846,7 +75748,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         });
         declarations.push(Declaration {
             id: DeclarationId(2294),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -86869,7 +75770,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4876, 4900),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4911, 4935),
         });
         declarations.push(Declaration {
             id: DeclarationId(2295),
@@ -86895,21 +75796,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4911, 4935),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 4941, 4965),
         });
         declarations.push(Declaration {
             id: DeclarationId(2296),
             name: None,
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(37),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(38),
+                    value: DeclarationId(1006),
+                }],
+            },
+            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", 5042, 5062),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2297),
+            name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
                 arguments: vec![
                     TemplateArgument {
                         parameter: DeclarationId(992),
-                        value: DeclarationId(1002),
+                        value: DeclarationId(1005),
                     },
                     TemplateArgument {
                         parameter: DeclarationId(993),
-                        value: DeclarationId(1003),
+                        value: DeclarationId(1006),
                     },
                 ],
             },
@@ -86921,17 +75842,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4941, 4965),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5072, 5096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2294),
+            id: DeclarationId(2298),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(37),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(38),
-                    value: DeclarationId(1006),
-                }],
+                template: DeclarationId(991),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(992),
+                        value: DeclarationId(1005),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(993),
+                        value: DeclarationId(1006),
+                    },
+                ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -86941,92 +75868,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 5042, 5062),
+            span: SourceSpan::new("src/v3/std/dimensions.dag", 5107, 5131),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2295),
-=======
-            id: DeclarationId(2297),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(992),
-                        value: DeclarationId(1005),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(993),
-                        value: DeclarationId(1006),
-                    },
-                ],
-            },
-            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", 5072, 5096),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2298),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(992),
-                        value: DeclarationId(1005),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(993),
-                        value: DeclarationId(1006),
-                    },
-                ],
-            },
-            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", 5072, 5096),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2299),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(992),
-                        value: DeclarationId(1005),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(993),
-                        value: DeclarationId(1006),
-                    },
-                ],
-            },
-            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", 5107, 5131),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2300),
+            id: DeclarationId(2299),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -87052,7 +75897,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5137, 5161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2298),
+            id: DeclarationId(2300),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -87072,9 +75917,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5245, 5265),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2299),
-=======
             id: DeclarationId(2301),
             name: None,
             connective: TypeConnective::Instantiation {
@@ -87102,33 +75944,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         });
         declarations.push(Declaration {
             id: DeclarationId(2302),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(992),
-                        value: DeclarationId(1008),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(993),
-                        value: DeclarationId(1009),
-                    },
-                ],
-            },
-            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", 5276, 5300),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2303),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -87154,7 +75969,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5325, 5349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2301),
+            id: DeclarationId(2303),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -87174,9 +75989,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5440, 5460),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2302),
-=======
             id: DeclarationId(2304),
             name: None,
             connective: TypeConnective::Instantiation {
@@ -87204,33 +76016,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         });
         declarations.push(Declaration {
             id: DeclarationId(2305),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(992),
-                        value: DeclarationId(1011),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(993),
-                        value: DeclarationId(1012),
-                    },
-                ],
-            },
-            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", 5471, 5495),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2306),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -87256,7 +76041,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5520, 5544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2304),
+            id: DeclarationId(2306),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87275,11 +76060,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1634, 1651),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2305),
-=======
             id: DeclarationId(2307),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -87304,11 +76085,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1656, 1697),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2306),
-=======
             id: DeclarationId(2308),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87322,11 +76099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1879, 1891),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2307),
-=======
             id: DeclarationId(2309),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87345,11 +76118,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1896, 1932),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2308),
-=======
             id: DeclarationId(2310),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -87369,21 +76138,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2414, 2430),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2309),
-=======
             id: DeclarationId(2311),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-<<<<<<< HEAD
-                    value: DeclarationId(2308),
-=======
                     value: DeclarationId(2310),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -87397,11 +76158,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2409, 2431),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2310),
-=======
             id: DeclarationId(2312),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -87415,11 +76172,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "witnesses".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2309),
-=======
                         ty: DeclarationId(2311),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -87434,11 +76187,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2325, 2437),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2311),
-=======
             id: DeclarationId(2313),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -87458,11 +76207,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2505, 2521),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2312),
-=======
             id: DeclarationId(2314),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -87482,21 +76227,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2544, 2560),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2313),
-=======
             id: DeclarationId(2315),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-<<<<<<< HEAD
-                    value: DeclarationId(2312),
-=======
                     value: DeclarationId(2314),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -87510,11 +76247,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2539, 2561),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2314),
-=======
             id: DeclarationId(2316),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -87524,19 +76257,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "violations".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2311),
-                    },
-                    Field {
-                        label: "witnesses".to_string(),
-                        ty: DeclarationId(2313),
-=======
                         ty: DeclarationId(2313),
                     },
                     Field {
                         label: "witnesses".to_string(),
                         ty: DeclarationId(2315),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -87551,11 +76276,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2442, 2567),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2315),
-=======
             id: DeclarationId(2317),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -87575,19 +76296,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3902, 3918),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2316),
-            name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2315),
-=======
             id: DeclarationId(2318),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
                 output: DeclarationId(2317),
->>>>>>> origin/main
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -87601,11 +76314,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3881, 3918),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2317),
-=======
             id: DeclarationId(2319),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
@@ -87625,11 +76334,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3930, 3945),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2318),
-=======
             id: DeclarationId(2320),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(827), DeclarationId(990)],
@@ -87647,11 +76352,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3966, 4009),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2319),
-=======
             id: DeclarationId(2321),
->>>>>>> origin/main
             name: Some("DimensionUnitAbelianGroup".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(25),
@@ -87671,11 +76372,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2320),
-=======
             id: DeclarationId(2322),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87689,11 +76386,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3709, 3721),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2321),
-=======
             id: DeclarationId(2323),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87712,11 +76405,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3726, 3762),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2322),
-=======
             id: DeclarationId(2324),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -87736,11 +76425,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 855, 873),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2323),
-=======
             id: DeclarationId(2325),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87754,11 +76439,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4373, 4389),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2324),
-=======
             id: DeclarationId(2326),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87777,11 +76458,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4394, 4422),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2325),
-=======
             id: DeclarationId(2327),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87795,9 +76472,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4665, 4686),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2326),
-=======
             id: DeclarationId(2328),
             name: None,
             connective: TypeConnective::Conj {
@@ -87818,26 +76492,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         });
         declarations.push(Declaration {
             id: DeclarationId(2329),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-            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/emit_model.dag", 5176, 5195),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2330),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87856,7 +76510,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5200, 5222),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2328),
+            id: DeclarationId(2330),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -87876,11 +76530,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5591, 5614),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2329),
-=======
             id: DeclarationId(2331),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87894,11 +76544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6611, 6619),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2330),
-=======
             id: DeclarationId(2332),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87912,11 +76558,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6624, 6632),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2331),
-=======
             id: DeclarationId(2333),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87930,11 +76572,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7073, 7078),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2332),
-=======
             id: DeclarationId(2334),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87948,11 +76586,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7083, 7091),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2333),
-=======
             id: DeclarationId(2335),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87966,11 +76600,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7427, 7440),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2334),
-=======
             id: DeclarationId(2336),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87984,11 +76614,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7445, 7451),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2335),
-=======
             id: DeclarationId(2337),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88002,11 +76628,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7709, 7717),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2336),
-=======
             id: DeclarationId(2338),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88020,11 +76642,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7722, 7727),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2337),
-=======
             id: DeclarationId(2339),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88038,11 +76656,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7732, 7745),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2338),
-=======
             id: DeclarationId(2340),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88056,11 +76670,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8082, 8100),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2339),
-=======
             id: DeclarationId(2341),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88074,11 +76684,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9475, 9484),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2340),
-=======
             id: DeclarationId(2342),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88092,11 +76698,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9489, 9502),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2341),
-=======
             id: DeclarationId(2343),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88110,11 +76712,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9507, 9515),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2342),
-=======
             id: DeclarationId(2344),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88128,11 +76726,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9520, 9530),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2343),
-=======
             id: DeclarationId(2345),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88146,11 +76740,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9535, 9545),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2344),
-=======
             id: DeclarationId(2346),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88164,11 +76754,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9550, 9561),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2345),
-=======
             id: DeclarationId(2347),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88182,11 +76768,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9566, 9574),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2346),
-=======
             id: DeclarationId(2348),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88200,11 +76782,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9579, 9586),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2347),
-=======
             id: DeclarationId(2349),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88218,11 +76796,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9591, 9601),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2348),
-=======
             id: DeclarationId(2350),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88236,11 +76810,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9606, 9618),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2349),
-=======
             id: DeclarationId(2351),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88254,11 +76824,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12311, 12337),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2350),
-=======
             id: DeclarationId(2352),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88272,11 +76838,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12342, 12352),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2351),
-=======
             id: DeclarationId(2353),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88290,11 +76852,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17117, 17123),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2352),
-=======
             id: DeclarationId(2354),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88308,11 +76866,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17128, 17139),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2353),
-=======
             id: DeclarationId(2355),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88326,11 +76880,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17459, 17470),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2354),
-=======
             id: DeclarationId(2356),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88344,11 +76894,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17475, 17486),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2355),
-=======
             id: DeclarationId(2357),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88362,11 +76908,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 19419, 19430),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2356),
-=======
             id: DeclarationId(2358),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88380,11 +76922,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 19435, 19443),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2357),
-=======
             id: DeclarationId(2359),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88403,11 +76941,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 20606, 20641),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2358),
-=======
             id: DeclarationId(2360),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -88432,11 +76966,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 20646, 20734),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2359),
-=======
             id: DeclarationId(2361),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -88456,11 +76986,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6894, 6922),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2360),
-=======
             id: DeclarationId(2362),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -88479,11 +77005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2361),
-=======
             id: DeclarationId(2363),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -88502,11 +77024,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2362),
-=======
             id: DeclarationId(2364),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -88526,11 +77044,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27850, 27865),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2363),
-=======
             id: DeclarationId(2365),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -88550,11 +77064,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 29879, 29895),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2364),
-=======
             id: DeclarationId(2366),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -88574,11 +77084,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 29988, 30004),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2365),
-=======
             id: DeclarationId(2367),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -88598,21 +77104,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 30102, 30118),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2366),
-=======
             id: DeclarationId(2368),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-<<<<<<< HEAD
-                    value: DeclarationId(2365),
-=======
                     value: DeclarationId(2367),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -88626,47 +77124,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 30097, 30119),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2367),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(93),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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/induction.dag", 33612, 33616),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2368),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(93),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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/induction.dag", 33908, 33912),
-        });
-        declarations.push(Declaration {
-=======
->>>>>>> origin/main
             id: DeclarationId(2369),
             name: None,
             connective: TypeConnective::Cardinality(
@@ -88683,11 +77140,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
-=======
             span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2370),
@@ -88706,11 +77159,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
-=======
             span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2371),
@@ -88729,11 +77178,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
-=======
             span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2372),
@@ -88752,11 +77197,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
-=======
             span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2373),
@@ -88775,11 +77216,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/induction.dag", 5629, 5644),
-=======
             span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2374),
@@ -88798,11 +77235,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/induction.dag", 5684, 5697),
-=======
             span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2375),
@@ -88816,11 +77249,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/induction.dag", 5745, 5762),
-=======
             span: SourceSpan::new("src/v3/std/induction.dag", 5629, 5644),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2376),
@@ -88834,11 +77263,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/induction.dag", 5801, 5813),
-=======
             span: SourceSpan::new("src/v3/std/induction.dag", 5684, 5697),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2377),
@@ -88852,12 +77277,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/induction.dag", 5861, 5878),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2378),
-=======
             span: SourceSpan::new("src/v3/std/induction.dag", 5745, 5762),
         });
         declarations.push(Declaration {
@@ -88890,7 +77309,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         });
         declarations.push(Declaration {
             id: DeclarationId(2380),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -88915,11 +77333,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 9971, 10033),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2379),
-=======
             id: DeclarationId(2381),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88938,11 +77352,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10038, 10080),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2380),
-=======
             id: DeclarationId(2382),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -88967,11 +77377,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10085, 10142),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2381),
-=======
             id: DeclarationId(2383),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88985,11 +77391,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10147, 10161),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2382),
-=======
             id: DeclarationId(2384),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89003,11 +77405,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10166, 10181),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2383),
-=======
             id: DeclarationId(2385),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89021,11 +77419,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24135, 24149),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2384),
-=======
             id: DeclarationId(2386),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89044,11 +77438,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24154, 24201),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2385),
-=======
             id: DeclarationId(2387),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -89073,11 +77463,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24206, 24283),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2386),
-=======
             id: DeclarationId(2388),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -89102,11 +77488,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24288, 24362),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2387),
-=======
             id: DeclarationId(2389),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -89131,11 +77513,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24982, 25038),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2388),
-=======
             id: DeclarationId(2390),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89154,11 +77532,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 25054, 25079),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2389),
-=======
             id: DeclarationId(2391),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89172,11 +77546,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26728, 26741),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2390),
-=======
             id: DeclarationId(2392),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89195,11 +77565,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26785, 26817),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2391),
-=======
             id: DeclarationId(2393),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -89219,20 +77585,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26880, 26896),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2392),
-=======
             id: DeclarationId(2394),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "factors".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2391),
-=======
                     ty: DeclarationId(2393),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -89246,11 +77604,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26856, 26898),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2393),
-=======
             id: DeclarationId(2395),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -89270,21 +77624,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26960, 26976),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2394),
-=======
             id: DeclarationId(2396),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-<<<<<<< HEAD
-                    value: DeclarationId(2393),
-=======
                     value: DeclarationId(2395),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -89298,20 +77644,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26955, 26977),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2395),
-=======
             id: DeclarationId(2397),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2394),
-=======
                     ty: DeclarationId(2396),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -89325,11 +77663,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26927, 26979),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2396),
-=======
             id: DeclarationId(2398),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -89349,20 +77683,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27277, 27292),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2397),
-=======
             id: DeclarationId(2399),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2396),
-=======
                     ty: DeclarationId(2398),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -89376,11 +77702,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27259, 27294),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2398),
-=======
             id: DeclarationId(2400),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89394,11 +77716,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27377, 27389),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2399),
-=======
             id: DeclarationId(2401),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89412,9 +77730,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27459, 27469),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2400),
-=======
             id: DeclarationId(2402),
             name: None,
             connective: TypeConnective::Instantiation {
@@ -89436,7 +77751,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         });
         declarations.push(Declaration {
             id: DeclarationId(2403),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -89453,30 +77767,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1234, 1254),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2404),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1313),
-                }],
-            },
-            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/integer_diagnostic_order.dag", 1414, 1434),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2402),
+            id: DeclarationId(2404),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -89496,19 +77790,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4180, 4190),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2403),
-            name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2402),
-=======
             id: DeclarationId(2405),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
                 output: DeclarationId(2404),
->>>>>>> origin/main
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -89522,11 +77808,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4159, 4190),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2404),
-=======
             id: DeclarationId(2406),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
@@ -89546,11 +77828,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4205, 4214),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2405),
-=======
             id: DeclarationId(2407),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1129), DeclarationId(1129)],
@@ -89568,11 +77846,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4225, 4238),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2406),
-=======
             id: DeclarationId(2408),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1129), DeclarationId(818)],
@@ -89590,11 +77864,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4250, 4271),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2407),
-=======
             id: DeclarationId(2409),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(1129)],
@@ -89612,11 +77882,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4284, 4316),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2408),
-=======
             id: DeclarationId(2410),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89635,11 +77901,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 3305, 3352),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2409),
-=======
             id: DeclarationId(2411),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -89664,11 +77926,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 3357, 3418),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2410),
-=======
             id: DeclarationId(2412),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89682,11 +77940,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 4297, 4302),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2411),
-=======
             id: DeclarationId(2413),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1133)],
@@ -89704,11 +77958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 5301, 5321),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2412),
-=======
             id: DeclarationId(2414),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1134), DeclarationId(1134)],
@@ -89726,11 +77976,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 5334, 5360),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2413),
-=======
             id: DeclarationId(2415),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1128),
@@ -89750,11 +77996,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 7360, 7372),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2414),
-=======
             id: DeclarationId(2416),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1132),
@@ -89780,11 +78022,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 7388, 7419),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2415),
-=======
             id: DeclarationId(2417),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1135),
@@ -89810,11 +78048,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 9093, 9124),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2416),
-=======
             id: DeclarationId(2418),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1128),
@@ -89834,11 +78068,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 10144, 10156),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2417),
-=======
             id: DeclarationId(2419),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -89858,11 +78088,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4589, 4600),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2418),
-=======
             id: DeclarationId(2420),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -89882,11 +78108,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4642, 4653),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2419),
-=======
             id: DeclarationId(2421),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89900,11 +78122,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4544, 4548),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2420),
-=======
             id: DeclarationId(2422),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89923,11 +78141,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4553, 4563),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2421),
-=======
             id: DeclarationId(2423),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -89947,11 +78161,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1179, 1196),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2422),
-=======
             id: DeclarationId(2424),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -89970,11 +78180,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2423),
-=======
             id: DeclarationId(2425),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -89994,20 +78200,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1747, 1764),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2424),
-=======
             id: DeclarationId(2426),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2423),
-=======
                     ty: DeclarationId(2425),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -90021,11 +78219,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1736, 1765),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2425),
-=======
             id: DeclarationId(2427),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -90045,20 +78239,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1777, 1795),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2426),
-=======
             id: DeclarationId(2428),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2425),
-=======
                     ty: DeclarationId(2427),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -90072,9 +78258,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1770, 1796),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2427),
-=======
             id: DeclarationId(2429),
             name: None,
             connective: TypeConnective::Conj {
@@ -90120,7 +78303,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         });
         declarations.push(Declaration {
             id: DeclarationId(2431),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -90145,11 +78327,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2452, 2492),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2428),
-=======
             id: DeclarationId(2432),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -90169,11 +78347,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2544, 2562),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2429),
-=======
             id: DeclarationId(2433),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -90183,11 +78357,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2428),
-=======
                         ty: DeclarationId(2432),
->>>>>>> origin/main
                     },
                     Field {
                         label: "span".to_string(),
@@ -90206,11 +78376,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2497, 2591),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2430),
-=======
             id: DeclarationId(2434),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -90235,11 +78401,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2596, 2660),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2431),
-=======
             id: DeclarationId(2435),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -90259,21 +78421,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2687, 2704),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2432),
-=======
             id: DeclarationId(2436),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "inputs".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2431),
-=======
                         ty: DeclarationId(2435),
->>>>>>> origin/main
                     },
                     Field {
                         label: "output".to_string(),
@@ -90296,11 +78450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2665, 2759),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2433),
-=======
             id: DeclarationId(2437),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -90325,11 +78475,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4129, 4175),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2434),
-=======
             id: DeclarationId(2438),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -90358,11 +78504,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4180, 4263),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2435),
-=======
             id: DeclarationId(2439),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -90382,11 +78524,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4317, 4342),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2436),
-=======
             id: DeclarationId(2440),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -90396,11 +78534,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "fields".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2435),
-=======
                         ty: DeclarationId(2439),
->>>>>>> origin/main
                     },
                     Field {
                         label: "span".to_string(),
@@ -90419,11 +78553,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4268, 4371),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2437),
-=======
             id: DeclarationId(2441),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90442,11 +78572,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5043, 5054),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2438),
-=======
             id: DeclarationId(2442),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90465,11 +78591,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5059, 5069),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2439),
-=======
             id: DeclarationId(2443),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90488,11 +78610,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5074, 5088),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2440),
-=======
             id: DeclarationId(2444),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -90517,11 +78635,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5202, 5253),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2441),
-=======
             id: DeclarationId(2445),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -90543,132 +78657,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 4878, 4916),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2442),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(230),
-                }],
-            },
-            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", 4944, 4956),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2443),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(159),
-                }],
-            },
-            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", 4978, 4994),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2444),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "segments".to_string(),
-                        ty: DeclarationId(2442),
-                    },
-                    Field {
-                        label: "segment_spans".to_string(),
-                        ty: DeclarationId(2443),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
-            },
-            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", 4921, 5023),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2445),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1160),
-                }],
-            },
-            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", 5068, 5085),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2446),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "target".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "args".to_string(),
-                        ty: DeclarationId(2445),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
-            },
-            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", 5028, 5114),
-=======
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5258, 5296),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
-            id: DeclarationId(2447),
+            id: DeclarationId(2446),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -90688,7 +78680,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5324, 5336),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2448),
+            id: DeclarationId(2447),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -90708,49 +78700,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5358, 5374),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2449),
-            name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1160),
-                }],
-            },
-            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", 5748, 5765),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2450),
+            id: DeclarationId(2448),
             name: None,
-=======
->>>>>>> origin/main
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "segments".to_string(),
-                        ty: DeclarationId(2447),
+                        ty: DeclarationId(2446),
                     },
                     Field {
-<<<<<<< HEAD
                         label: "segment_spans".to_string(),
-                        ty: DeclarationId(2448),
-                    },
-                    Field {
-                        label: "args".to_string(),
-                        ty: DeclarationId(2449),
+                        ty: DeclarationId(2447),
                     },
                     Field {
-=======
->>>>>>> origin/main
                         label: "span".to_string(),
                         ty: DeclarationId(159),
                     },
@@ -90767,11 +78729,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5301, 5403),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2451),
-=======
             id: DeclarationId(2449),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -90791,11 +78749,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5448, 5465),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2452),
-=======
             id: DeclarationId(2450),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -90804,62 +78758,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         ty: DeclarationId(230),
                     },
                     Field {
-<<<<<<< HEAD
-                        label: "fields".to_string(),
-                        ty: DeclarationId(2451),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
-            },
-            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", 5799, 5903),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2453),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1160),
-                }],
-            },
-            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", 5954, 5971),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2454),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "op".to_string(),
-                        ty: DeclarationId(806),
-                    },
-                    Field {
-                        label: "args".to_string(),
-                        ty: DeclarationId(2453),
-=======
                         label: "args".to_string(),
                         ty: DeclarationId(2449),
->>>>>>> origin/main
                     },
                     Field {
                         label: "span".to_string(),
@@ -90878,11 +78778,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5408, 5494),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2455),
-=======
             id: DeclarationId(2451),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -90975,212 +78871,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6038, 6174),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2456),
-            name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "params".to_string(),
-                        ty: DeclarationId(2455),
-                    },
-                    Field {
-                        label: "body".to_string(),
-                        ty: DeclarationId(1160),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
-            },
-            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", 6005, 6093),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2457),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "cond".to_string(),
-                        ty: DeclarationId(1160),
-                    },
-                    Field {
-                        label: "then_branch".to_string(),
-                        ty: DeclarationId(1160),
-                    },
-                    Field {
-                        label: "else_branch".to_string(),
-                        ty: DeclarationId(1160),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
-            },
-            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", 6098, 6217),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2458),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1156),
-                }],
-            },
-            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", 6271, 6292),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2459),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "scrutinee".to_string(),
-                        ty: DeclarationId(1160),
-                    },
-                    Field {
-                        label: "arms".to_string(),
-                        ty: DeclarationId(2458),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
-            },
-            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", 6222, 6321),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2460),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1154),
-                }],
-            },
-            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", 6349, 6373),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2461),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "fields".to_string(),
-                        ty: DeclarationId(2460),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
-            },
-            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", 6326, 6402),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2462),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1160),
-                }],
-            },
-            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", 6430, 6447),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2463),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "elements".to_string(),
-                        ty: DeclarationId(2462),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
-            },
-            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", 6407, 6476),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2464),
+            id: DeclarationId(2455),
             name: None,
-=======
->>>>>>> origin/main
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
@@ -91199,26 +78891,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6230, 6254),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2465),
-=======
             id: DeclarationId(2456),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-<<<<<<< HEAD
-                        label: "entries".to_string(),
-                        ty: DeclarationId(2464),
-=======
                         label: "target".to_string(),
                         ty: DeclarationId(230),
                     },
                     Field {
                         label: "fields".to_string(),
                         ty: DeclarationId(2455),
->>>>>>> origin/main
                     },
                     Field {
                         label: "span".to_string(),
@@ -91437,7 +79120,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6729, 6753),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2466),
+            id: DeclarationId(2465),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -91571,11 +79254,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9931, 9943),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2467),
-=======
             id: DeclarationId(2471),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -91585,11 +79264,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_ann".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2466),
-=======
                         ty: DeclarationId(2470),
->>>>>>> origin/main
                     },
                     Field {
                         label: "expr".to_string(),
@@ -91605,172 +79280,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9510, 9593),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2468),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(230),
-                }],
-            },
-            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", 9641, 9653),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2469),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1149),
-                }],
-            },
-            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", 9668, 9686),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2470),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "type_params".to_string(),
-                        ty: DeclarationId(2468),
-                    },
-                    Field {
-                        label: "params".to_string(),
-                        ty: DeclarationId(2469),
-                    },
-                    Field {
-                        label: "return_type".to_string(),
-                        ty: DeclarationId(1153),
-                    },
-                    Field {
-                        label: "body".to_string(),
-                        ty: DeclarationId(1160),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
-            },
-            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", 9598, 9770),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2471),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(230),
-                }],
-            },
-            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", 9830, 9842),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9890, 9973),
         });
         declarations.push(Declaration {
             id: DeclarationId(2472),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1149),
-                }],
-            },
-            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", 9857, 9875),
-=======
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9890, 9973),
->>>>>>> origin/main
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2473),
-            name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "type_params".to_string(),
-                        ty: DeclarationId(2471),
-                    },
-                    Field {
-                        label: "params".to_string(),
-                        ty: DeclarationId(2472),
-                    },
-                    Field {
-                        label: "return_type".to_string(),
-                        ty: DeclarationId(1153),
-                    },
-                    Field {
-                        label: "body_span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                    Field {
-                        label: "span".to_string(),
-                        ty: DeclarationId(159),
-                    },
-                ],
-=======
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(230),
                 }],
->>>>>>> origin/main
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -91783,7 +79303,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10021, 10033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2474),
+            id: DeclarationId(2473),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -91803,7 +79323,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10048, 10066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2475),
+            id: DeclarationId(2474),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -91816,13 +79336,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         ty: DeclarationId(2472),
                     },
                     Field {
-<<<<<<< HEAD
-                        label: "body".to_string(),
-                        ty: DeclarationId(2474),
-=======
                         label: "params".to_string(),
                         ty: DeclarationId(2473),
->>>>>>> origin/main
                     },
                     Field {
                         label: "return_type".to_string(),
@@ -91849,7 +79364,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9978, 10150),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2476),
+            id: DeclarationId(2475),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -91869,7 +79384,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10210, 10222),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2477),
+            id: DeclarationId(2476),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -91894,17 +79409,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-<<<<<<< HEAD
-                        label: "path".to_string(),
-                        ty: DeclarationId(2476),
-=======
                         label: "name".to_string(),
                         ty: DeclarationId(230),
                     },
                     Field {
                         label: "type_params".to_string(),
                         ty: DeclarationId(2475),
->>>>>>> origin/main
                     },
                     Field {
                         label: "params".to_string(),
@@ -91932,11 +79442,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10102, 10149),
-=======
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10155, 10343),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2478),
@@ -91955,46 +79461,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10175, 10187),
-=======
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10408, 10420),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2479),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(230),
-                }],
-            },
-            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", 10201, 10213),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2480),
-            name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-<<<<<<< HEAD
-                        label: "path".to_string(),
-                        ty: DeclarationId(2478),
-                    },
-                    Field {
-                        label: "names".to_string(),
-                        ty: DeclarationId(2479),
-=======
                         label: "name".to_string(),
                         ty: DeclarationId(230),
                     },
@@ -92005,7 +79479,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "body".to_string(),
                         ty: DeclarationId(2478),
->>>>>>> origin/main
                     },
                     Field {
                         label: "body_span".to_string(),
@@ -92028,7 +79501,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10348, 10477),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2481),
+            id: DeclarationId(2480),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -92048,22 +79521,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10497, 10509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2482),
+            id: DeclarationId(2481),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-<<<<<<< HEAD
-                        label: "name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "type_params".to_string(),
-                        ty: DeclarationId(2481),
-=======
                         label: "path".to_string(),
                         ty: DeclarationId(2480),
->>>>>>> origin/main
                     },
                     Field {
                         label: "span".to_string(),
@@ -92082,7 +79546,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10482, 10529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2483),
+            id: DeclarationId(2482),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -92102,7 +79566,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10555, 10567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2484),
+            id: DeclarationId(2483),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -92122,30 +79586,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10581, 10593),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2485),
+            id: DeclarationId(2484),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
-<<<<<<< HEAD
-                        label: "name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "type_params".to_string(),
-                        ty: DeclarationId(2483),
-                    },
-                    Field {
-                        label: "fields".to_string(),
-                        ty: DeclarationId(2484),
-=======
                         label: "path".to_string(),
                         ty: DeclarationId(2482),
                     },
                     Field {
                         label: "names".to_string(),
                         ty: DeclarationId(2483),
->>>>>>> origin/main
                     },
                     Field {
                         label: "span".to_string(),
@@ -92164,7 +79615,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10534, 10622),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2486),
+            id: DeclarationId(2485),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -92184,50 +79635,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10676, 10688),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2487),
-            name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1151),
-                }],
-            },
-            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", 10549, 10569),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2488),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1153),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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", 10586, 10598),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2489),
+            id: DeclarationId(2486),
             name: None,
-=======
->>>>>>> origin/main
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
@@ -92236,19 +79645,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2486),
-                    },
-                    Field {
-                        label: "variants".to_string(),
-                        ty: DeclarationId(2487),
-                    },
-                    Field {
-                        label: "inhabits".to_string(),
-                        ty: DeclarationId(2488),
-=======
                         ty: DeclarationId(2485),
->>>>>>> origin/main
                     },
                     Field {
                         label: "span".to_string(),
@@ -92267,11 +79664,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10627, 10717),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2490),
-=======
             id: DeclarationId(2487),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -92291,11 +79684,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10773, 10785),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2491),
-=======
             id: DeclarationId(2488),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -92315,11 +79704,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10800, 10818),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2492),
-=======
             id: DeclarationId(2489),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -92329,27 +79714,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2490),
-                    },
-                    Field {
-                        label: "nominal_opaque".to_string(),
-                        ty: DeclarationId(128),
-                    },
-                    Field {
-                        label: "target".to_string(),
-                        ty: DeclarationId(1153),
-                    },
-                    Field {
-                        label: "refinement".to_string(),
-                        ty: DeclarationId(2491),
-=======
                         ty: DeclarationId(2487),
                     },
                     Field {
                         label: "fields".to_string(),
                         ty: DeclarationId(2488),
->>>>>>> origin/main
                     },
                     Field {
                         label: "span".to_string(),
@@ -92408,7 +79777,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10929, 10949),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2493),
+            id: DeclarationId(2492),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -92568,11 +79937,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2494),
-=======
             id: DeclarationId(2498),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -92592,11 +79957,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 11243, 11254),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2495),
-=======
             id: DeclarationId(2499),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92615,11 +79976,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2137, 2162),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2496),
-=======
             id: DeclarationId(2500),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -92639,20 +79996,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2179, 2195),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2497),
-=======
             id: DeclarationId(2501),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2496),
-=======
                     ty: DeclarationId(2500),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -92666,11 +80015,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2167, 2196),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2498),
-=======
             id: DeclarationId(2502),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -92695,11 +80040,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2201, 2252),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2499),
-=======
             id: DeclarationId(2503),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92718,11 +80059,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2257, 2272),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2500),
-=======
             id: DeclarationId(2504),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92741,11 +80078,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2277, 2304),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2501),
-=======
             id: DeclarationId(2505),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -92771,11 +80104,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 3936, 3954),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2502),
-=======
             id: DeclarationId(2506),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -92795,11 +80124,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 4542, 4557),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2503),
-=======
             id: DeclarationId(2507),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92818,11 +80143,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 5388, 5442),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2504),
-=======
             id: DeclarationId(2508),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92836,11 +80157,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 5682, 5691),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2505),
-=======
             id: DeclarationId(2509),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92854,11 +80171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 5694, 5704),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2506),
-=======
             id: DeclarationId(2510),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -92878,11 +80191,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5769, 5797),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2507),
-=======
             id: DeclarationId(2511),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -92905,9 +80214,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/services.dag", 6784, 6807),
-=======
             span: SourceSpan::new("src/v3/std/services.dag", 6785, 6808),
         });
         declarations.push(Declaration {
@@ -92929,7 +80235,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             refinement: None,
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2513),
@@ -92949,30 +80254,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2514),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1237),
-                }],
-            },
-            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/t_ci_workflow_as_data_demo.dag", 4626, 4652),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2510),
+            id: DeclarationId(2514),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -92992,11 +80277,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4920, 4937),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2511),
-=======
             id: DeclarationId(2515),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -93016,11 +80297,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4988, 5002),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2512),
-=======
             id: DeclarationId(2516),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -93040,11 +80317,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5052, 5065),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2513),
-=======
             id: DeclarationId(2517),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -93064,111 +80337,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5115, 5128),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2514),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(982),
-                }],
-            },
-            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/t_ci_workflow_as_data_demo.dag", 5176, 5192),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2515),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1237),
-                }],
-            },
-            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/t_ci_workflow_as_data_demo.dag", 5245, 5271),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2516),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(2515),
-                }],
-            },
-            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/t_ci_workflow_as_data_demo.dag", 5240, 5272),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2517),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1237),
-                }],
-            },
-            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/t_ci_workflow_as_data_demo.dag", 5346, 5372),
-        });
-        declarations.push(Declaration {
             id: DeclarationId(2518),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(2517),
-                }],
-            },
-            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/t_ci_workflow_as_data_demo.dag", 5341, 5373),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2519),
-=======
-            id: DeclarationId(2518),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -93188,9 +80357,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5176, 5192),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2520),
-=======
             id: DeclarationId(2519),
             name: None,
             connective: TypeConnective::Instantiation {
@@ -93312,7 +80478,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         });
         declarations.push(Declaration {
             id: DeclarationId(2525),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -93329,7 +80494,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5639, 5673),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5885, 5919),
         });
         declarations.push(Declaration {
             id: DeclarationId(2526),
@@ -93349,7 +80514,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5885, 5919),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6404, 6438),
         });
         declarations.push(Declaration {
             id: DeclarationId(2527),
@@ -93369,7 +80534,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6404, 6438),
+            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6665, 6699),
         });
         declarations.push(Declaration {
             id: DeclarationId(2528),
@@ -93389,30 +80554,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6665, 6699),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2529),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(987),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(988),
-                    value: DeclarationId(1237),
-                }],
-            },
-            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/t_ci_workflow_as_data_demo.dag", 6955, 6989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2525),
+            id: DeclarationId(2529),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -93432,11 +80577,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7169, 7195),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2526),
-=======
             id: DeclarationId(2530),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -93456,11 +80597,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7200, 7234),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2527),
-=======
             id: DeclarationId(2531),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -93480,97 +80617,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8469, 8503),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2528),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2304),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1237),
-                }],
-            },
-            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/t_ci_workflow_as_data_demo.dag", 3054, 3080),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2529),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2304),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1237),
-                }],
-            },
-            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/t_ci_workflow_as_data_demo.dag", 3054, 3080),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2530),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2304),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1237),
-                }],
-            },
-            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/t_ci_workflow_as_data_demo.dag", 3054, 3080),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2531),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2304),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1237),
-                }],
-            },
-            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/t_ci_workflow_as_data_demo.dag", 3054, 3080),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2532),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2304),
-=======
             id: DeclarationId(2532),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(2306),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
@@ -93590,11 +80640,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2533),
             name: None,
             connective: TypeConnective::Instantiation {
-<<<<<<< HEAD
-                template: DeclarationId(2304),
-=======
                 template: DeclarationId(2306),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
@@ -93614,11 +80660,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2534),
             name: None,
             connective: TypeConnective::Instantiation {
-<<<<<<< HEAD
-                template: DeclarationId(2304),
-=======
                 template: DeclarationId(2306),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
@@ -93638,11 +80680,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2535),
             name: None,
             connective: TypeConnective::Instantiation {
-<<<<<<< HEAD
-                template: DeclarationId(2304),
-=======
                 template: DeclarationId(2306),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
@@ -93662,11 +80700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2536),
             name: None,
             connective: TypeConnective::Instantiation {
-<<<<<<< HEAD
-                template: DeclarationId(2304),
-=======
                 template: DeclarationId(2306),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
@@ -93686,17 +80720,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2537),
             name: None,
             connective: TypeConnective::Instantiation {
-<<<<<<< HEAD
-                template: DeclarationId(2304),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1237),
-=======
                 template: DeclarationId(2306),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -93713,9 +80740,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2538),
             name: None,
             connective: TypeConnective::Instantiation {
-<<<<<<< HEAD
-                template: DeclarationId(1816),
-=======
                 template: DeclarationId(2306),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
@@ -93797,7 +80821,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1818),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(799),
@@ -93814,17 +80837,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4920, 4937),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2539),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1816),
-=======
             id: DeclarationId(2543),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1818),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(827),
@@ -93841,17 +80857,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4988, 5002),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2540),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1816),
-=======
             id: DeclarationId(2544),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1818),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(781),
@@ -93868,17 +80877,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5052, 5065),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2541),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1816),
-=======
             id: DeclarationId(2545),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1818),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(817),
@@ -93895,17 +80897,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5115, 5128),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2542),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1816),
-=======
             id: DeclarationId(2546),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1818),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(982),
@@ -93922,15 +80917,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5176, 5192),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2543),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1816),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(2515),
-=======
             id: DeclarationId(2547),
             name: None,
             connective: TypeConnective::Instantiation {
@@ -93938,7 +80924,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(2519),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -93952,15 +80937,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5240, 5272),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2544),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1818),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(2517),
-=======
             id: DeclarationId(2548),
             name: None,
             connective: TypeConnective::Instantiation {
@@ -93968,7 +80944,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(2521),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -93982,17 +80957,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5341, 5373),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2545),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2304),
-=======
             id: DeclarationId(2549),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(2306),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
@@ -94009,17 +80977,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5346, 5372),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2546),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1818),
-=======
             id: DeclarationId(2550),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1820),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(982),
@@ -94036,17 +80997,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5498, 5514),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2547),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2310),
-=======
             id: DeclarationId(2551),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(2312),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(988),
                     value: DeclarationId(1238),
@@ -94063,17 +81017,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5639, 5673),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2548),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2314),
-=======
             id: DeclarationId(2552),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(2316),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(988),
                     value: DeclarationId(1238),
@@ -94090,9 +81037,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5885, 5919),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2549),
-=======
             id: DeclarationId(2553),
             name: None,
             connective: TypeConnective::Cardinality(
@@ -94113,7 +81057,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         });
         declarations.push(Declaration {
             id: DeclarationId(2554),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -94129,7 +81072,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
             id: DeclarationId(2555),
@@ -94148,19 +81091,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
             id: DeclarationId(2556),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1212),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-=======
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
                 arguments: vec![
@@ -94174,7 +81109,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                 ],
             },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -94183,7 +81117,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2732, 2760),
         });
         declarations.push(Declaration {
             id: DeclarationId(2557),
@@ -94209,36 +81143,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 2732, 2760),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2558),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(137),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(138),
-                        value: DeclarationId(230),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(139),
-                        value: DeclarationId(1212),
-                    },
-                ],
-            },
-            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/termination.dag", 2804, 2832),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2554),
+            id: DeclarationId(2558),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -94257,11 +81165,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2555),
-=======
             id: DeclarationId(2559),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -94280,11 +81184,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2556),
-=======
             id: DeclarationId(2560),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(11),
@@ -94310,11 +81210,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 12353, 12399),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2557),
-=======
             id: DeclarationId(2561),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94328,11 +81224,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 767, 773),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2558),
-=======
             id: DeclarationId(2562),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94346,11 +81238,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 778, 791),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2559),
-=======
             id: DeclarationId(2563),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94364,9 +81252,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 796, 810),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2560),
-=======
             id: DeclarationId(2564),
             name: None,
             connective: TypeConnective::Conj {
@@ -94387,26 +81272,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         });
         declarations.push(Declaration {
             id: DeclarationId(2565),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "param".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-            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/termination.dag", 3332, 3358),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2566),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94425,7 +81290,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3363, 3391),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2567),
+            id: DeclarationId(2566),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94444,7 +81309,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3396, 3429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2568),
+            id: DeclarationId(2567),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94463,7 +81328,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3434, 3465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2569),
+            id: DeclarationId(2568),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94482,7 +81347,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3470, 3502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2565),
+            id: DeclarationId(2569),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94496,11 +81361,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4509, 4516),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2566),
-=======
             id: DeclarationId(2570),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94519,11 +81380,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4521, 4571),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2567),
-=======
             id: DeclarationId(2571),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94537,11 +81394,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 5484, 5495),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2568),
-=======
             id: DeclarationId(2572),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94560,11 +81413,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 5500, 5545),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2569),
-=======
             id: DeclarationId(2573),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94583,11 +81432,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7649, 7683),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2570),
-=======
             id: DeclarationId(2574),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94606,11 +81451,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7688, 7732),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2571),
-=======
             id: DeclarationId(2575),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94629,11 +81470,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7737, 7795),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2572),
-=======
             id: DeclarationId(2576),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94652,11 +81489,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7800, 7856),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2573),
-=======
             id: DeclarationId(2577),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94675,11 +81508,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7861, 7894),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2574),
-=======
             id: DeclarationId(2578),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94698,11 +81527,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7899, 7929),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2575),
-=======
             id: DeclarationId(2579),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94716,11 +81541,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7934, 7947),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2576),
-=======
             id: DeclarationId(2580),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -94740,11 +81561,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7987, 8009),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2577),
-=======
             id: DeclarationId(2581),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -94764,11 +81581,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 8219, 8240),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2578),
-=======
             id: DeclarationId(2582),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94782,11 +81595,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 8740, 8746),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2579),
-=======
             id: DeclarationId(2583),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94800,11 +81609,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 9139, 9152),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2580),
-=======
             id: DeclarationId(2584),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94818,11 +81623,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 9157, 9171),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2581),
-=======
             id: DeclarationId(2585),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94841,11 +81642,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 10263, 10297),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2582),
-=======
             id: DeclarationId(2586),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94859,11 +81656,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 10302, 10320),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2583),
-=======
             id: DeclarationId(2587),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -94889,11 +81682,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 11234, 11261),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2584),
-=======
             id: DeclarationId(2588),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -94913,11 +81702,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9931, 9947),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2585),
-=======
             id: DeclarationId(2589),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -94937,11 +81722,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2586),
-=======
             id: DeclarationId(2590),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94960,11 +81741,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4032, 4066),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2587),
-=======
             id: DeclarationId(2591),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94978,11 +81755,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4071, 4081),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2588),
-=======
             id: DeclarationId(2592),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94996,11 +81769,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4086, 4095),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2589),
-=======
             id: DeclarationId(2593),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95014,11 +81783,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4100, 4105),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2590),
-=======
             id: DeclarationId(2594),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -95038,17 +81803,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7603, 7631),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2591),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1816),
-=======
             id: DeclarationId(2595),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1818),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(978),
@@ -95062,101 +81820,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8271, 8287),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2592),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2304),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1237),
-                }],
-            },
-            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/timing_lens.dag", 12180, 12206),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2593),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2304),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1237),
-                }],
-            },
-            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/timing_lens.dag", 12180, 12206),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2594),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2304),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1237),
-                }],
-            },
-            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/timing_lens.dag", 12180, 12206),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2595),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2304),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1237),
-                }],
-            },
-            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/timing_lens.dag", 12180, 12206),
-=======
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9931, 9947),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2596),
             name: None,
             connective: TypeConnective::Instantiation {
-<<<<<<< HEAD
-                template: DeclarationId(2304),
-=======
                 template: DeclarationId(2306),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
@@ -95176,11 +81846,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2597),
             name: None,
             connective: TypeConnective::Instantiation {
-<<<<<<< HEAD
-                template: DeclarationId(2304),
-=======
                 template: DeclarationId(2306),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
@@ -95200,11 +81866,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2598),
             name: None,
             connective: TypeConnective::Instantiation {
-<<<<<<< HEAD
-                template: DeclarationId(2304),
-=======
                 template: DeclarationId(2306),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
@@ -95224,11 +81886,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2599),
             name: None,
             connective: TypeConnective::Instantiation {
-<<<<<<< HEAD
-                template: DeclarationId(2304),
-=======
                 template: DeclarationId(2306),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
@@ -95248,11 +81906,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2600),
             name: None,
             connective: TypeConnective::Instantiation {
-<<<<<<< HEAD
-                template: DeclarationId(2304),
-=======
                 template: DeclarationId(2306),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
@@ -95272,17 +81926,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2601),
             name: None,
             connective: TypeConnective::Instantiation {
-<<<<<<< HEAD
-                template: DeclarationId(2304),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1237),
-=======
                 template: DeclarationId(2306),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -95293,11 +81940,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
-=======
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2602),
@@ -95317,11 +81960,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 646, 651),
-=======
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2603),
@@ -95341,11 +81980,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 656, 660),
-=======
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2604),
@@ -95365,11 +82000,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 665, 671),
-=======
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2605),
@@ -95389,11 +82020,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 676, 682),
-=======
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2606),
@@ -95407,11 +82034,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 687, 691),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 646, 651),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2607),
@@ -95425,11 +82048,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 696, 702),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 656, 660),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2608),
@@ -95443,11 +82062,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 707, 715),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 665, 671),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2609),
@@ -95461,11 +82076,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 720, 728),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 676, 682),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2610),
@@ -95479,11 +82090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 733, 740),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 687, 691),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2611),
@@ -95497,11 +82104,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 745, 751),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 696, 702),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2612),
@@ -95515,11 +82118,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 756, 763),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 707, 715),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2613),
@@ -95533,18 +82132,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 768, 774),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 720, 728),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2614),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
-<<<<<<< HEAD
-=======
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -95620,26 +82213,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ty: DeclarationId(230),
                 }],
             },
->>>>>>> origin/main
-            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/tokenize.dag", 779, 786),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2620),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -95651,7 +82224,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 791, 804),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2621),
+            id: DeclarationId(2620),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95670,7 +82243,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 889, 903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2622),
+            id: DeclarationId(2621),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95689,7 +82262,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 908, 925),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2623),
+            id: DeclarationId(2622),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95703,7 +82276,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 930, 932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2624),
+            id: DeclarationId(2623),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95717,7 +82290,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 937, 941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2625),
+            id: DeclarationId(2624),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95731,7 +82304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 946, 951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2626),
+            id: DeclarationId(2625),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95745,7 +82318,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 956, 958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2627),
+            id: DeclarationId(2626),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95759,7 +82332,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 963, 965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2628),
+            id: DeclarationId(2627),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95773,7 +82346,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 970, 972),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2629),
+            id: DeclarationId(2628),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95787,7 +82360,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 977, 979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2630),
+            id: DeclarationId(2629),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95801,7 +82374,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 984, 988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2631),
+            id: DeclarationId(2630),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95815,7 +82388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 993, 998),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2632),
+            id: DeclarationId(2631),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95829,7 +82402,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1003, 1007),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2633),
+            id: DeclarationId(2632),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95843,7 +82416,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1012, 1017),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2634),
+            id: DeclarationId(2633),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95857,7 +82430,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1022, 1028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2635),
+            id: DeclarationId(2634),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95871,7 +82444,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1033, 1041),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2636),
+            id: DeclarationId(2635),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95885,7 +82458,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1046, 1051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2637),
+            id: DeclarationId(2636),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95899,7 +82472,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1056, 1061),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2638),
+            id: DeclarationId(2637),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95913,7 +82486,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1066, 1074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2639),
+            id: DeclarationId(2638),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95927,7 +82500,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1079, 1088),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2640),
+            id: DeclarationId(2639),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95941,7 +82514,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1093, 1096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2641),
+            id: DeclarationId(2640),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95955,7 +82528,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1101, 1107),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2642),
+            id: DeclarationId(2641),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95969,7 +82542,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1112, 1118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2643),
+            id: DeclarationId(2642),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95983,7 +82556,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1123, 1129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2644),
+            id: DeclarationId(2643),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95997,7 +82570,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1134, 1140),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2645),
+            id: DeclarationId(2644),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96011,7 +82584,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1145, 1153),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2646),
+            id: DeclarationId(2645),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96025,7 +82598,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1158, 1166),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2647),
+            id: DeclarationId(2646),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96039,7 +82612,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1171, 1176),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2648),
+            id: DeclarationId(2647),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96053,7 +82626,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1181, 1190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2649),
+            id: DeclarationId(2648),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96067,7 +82640,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1195, 1199),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2650),
+            id: DeclarationId(2649),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96081,7 +82654,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1204, 1212),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2651),
+            id: DeclarationId(2650),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96095,7 +82668,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1217, 1220),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2652),
+            id: DeclarationId(2651),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96109,7 +82682,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1791, 1796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2653),
+            id: DeclarationId(2652),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96123,7 +82696,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1801, 1805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2654),
+            id: DeclarationId(2653),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96137,7 +82710,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1810, 1816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2655),
+            id: DeclarationId(2654),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96151,7 +82724,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1821, 1827),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2656),
+            id: DeclarationId(2655),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96165,7 +82738,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1832, 1836),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2657),
+            id: DeclarationId(2656),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96179,7 +82752,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1841, 1847),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2658),
+            id: DeclarationId(2657),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96193,7 +82766,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1852, 1860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2659),
+            id: DeclarationId(2658),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96207,7 +82780,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1865, 1873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2660),
+            id: DeclarationId(2659),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96221,7 +82794,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1878, 1885),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2661),
+            id: DeclarationId(2660),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96235,7 +82808,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1890, 1896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2662),
+            id: DeclarationId(2661),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96249,7 +82822,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1901, 1908),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2663),
+            id: DeclarationId(2662),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96263,7 +82836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1913, 1919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2664),
+            id: DeclarationId(2663),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96277,7 +82850,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1924, 1931),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2665),
+            id: DeclarationId(2664),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96291,7 +82864,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2371, 2373),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2666),
+            id: DeclarationId(2665),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96305,7 +82878,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2378, 2382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2667),
+            id: DeclarationId(2666),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96319,7 +82892,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2387, 2392),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2668),
+            id: DeclarationId(2667),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96333,7 +82906,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2397, 2399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2669),
+            id: DeclarationId(2668),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96347,7 +82920,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2404, 2406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2670),
+            id: DeclarationId(2669),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96361,7 +82934,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2411, 2413),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2671),
+            id: DeclarationId(2670),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96375,7 +82948,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2418, 2420),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2672),
+            id: DeclarationId(2671),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96389,7 +82962,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2425, 2429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2673),
+            id: DeclarationId(2672),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96403,7 +82976,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2434, 2439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2674),
+            id: DeclarationId(2673),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96417,7 +82990,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2444, 2448),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2675),
+            id: DeclarationId(2674),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96431,7 +83004,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2453, 2458),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2676),
+            id: DeclarationId(2675),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96445,7 +83018,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2463, 2469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2677),
+            id: DeclarationId(2676),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96459,7 +83032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2474, 2482),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2678),
+            id: DeclarationId(2677),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96473,7 +83046,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2487, 2492),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2679),
+            id: DeclarationId(2678),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96487,7 +83060,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2497, 2502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2680),
+            id: DeclarationId(2679),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96501,7 +83074,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2507, 2515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2681),
+            id: DeclarationId(2680),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96515,7 +83088,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2520, 2529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2682),
+            id: DeclarationId(2681),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96529,7 +83102,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2534, 2537),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2683),
+            id: DeclarationId(2682),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96543,7 +83116,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2542, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2684),
+            id: DeclarationId(2683),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96557,7 +83130,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2553, 2559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2685),
+            id: DeclarationId(2684),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96571,7 +83144,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2564, 2570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2686),
+            id: DeclarationId(2685),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96585,7 +83158,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2575, 2581),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2687),
+            id: DeclarationId(2686),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96599,7 +83172,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2586, 2594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2688),
+            id: DeclarationId(2687),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96613,7 +83186,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2599, 2607),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2689),
+            id: DeclarationId(2688),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96627,7 +83200,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2612, 2617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2690),
+            id: DeclarationId(2689),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96641,7 +83214,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2622, 2631),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2691),
+            id: DeclarationId(2690),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96655,7 +83228,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2636, 2640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2692),
+            id: DeclarationId(2691),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96669,7 +83242,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2645, 2653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2688),
+            id: DeclarationId(2692),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -96686,14 +83259,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 27585, 27608),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27581, 27604),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2689),
-=======
             id: DeclarationId(2693),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -96710,14 +83279,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 28677, 28693),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28673, 28689),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2690),
-=======
             id: DeclarationId(2694),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -96734,9 +83299,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/verification.dag", 28698, 28718),
-=======
             span: SourceSpan::new("src/v3/std/verification.dag", 28694, 28714),
         });
         declarations.push(Declaration {
@@ -96752,7 +83314,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             refinement: None,
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/verification.dag", 2826, 2840),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2696),
@@ -96766,24 +83327,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 2826, 2840),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2697),
-            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", 2845, 2855),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2698),
+            id: DeclarationId(2697),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96797,7 +83344,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2860, 2872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2699),
+            id: DeclarationId(2698),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96811,7 +83358,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2877, 2890),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2700),
+            id: DeclarationId(2699),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96825,7 +83372,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2895, 2907),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2701),
+            id: DeclarationId(2700),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96839,7 +83386,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2912, 2924),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2702),
+            id: DeclarationId(2701),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96853,7 +83400,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2929, 2951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2703),
+            id: DeclarationId(2702),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96867,7 +83414,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2956, 2975),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2704),
+            id: DeclarationId(2703),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96881,7 +83428,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2980, 3005),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2705),
+            id: DeclarationId(2704),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96895,7 +83442,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3010, 3033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2706),
+            id: DeclarationId(2705),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96909,7 +83456,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3439, 3448),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2702),
+            id: DeclarationId(2706),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -96928,11 +83475,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3453, 3469),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2703),
-=======
             id: DeclarationId(2707),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96946,11 +83489,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4128, 4136),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2704),
-=======
             id: DeclarationId(2708),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96964,11 +83503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4141, 4151),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2705),
-=======
             id: DeclarationId(2709),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -96982,11 +83517,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4376, 4388),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2706),
-=======
             id: DeclarationId(2710),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -97000,11 +83531,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5203, 5216),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2707),
-=======
             id: DeclarationId(2711),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -97018,11 +83545,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5221, 5234),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2708),
-=======
             id: DeclarationId(2712),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -97036,11 +83559,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5239, 5247),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2709),
-=======
             id: DeclarationId(2713),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -97065,11 +83584,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5792, 5859),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2710),
-=======
             id: DeclarationId(2714),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -97088,11 +83603,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5900, 5953),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2711),
-=======
             id: DeclarationId(2715),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -97106,11 +83617,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5986, 6015),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2712),
-=======
             id: DeclarationId(2716),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -97124,11 +83631,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6617, 6649),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2713),
-=======
             id: DeclarationId(2717),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -97142,11 +83645,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6654, 6685),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2714),
-=======
             id: DeclarationId(2718),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -97160,11 +83659,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6727, 6759),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2715),
-=======
             id: DeclarationId(2719),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -97178,11 +83673,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6764, 6795),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2716),
-=======
             id: DeclarationId(2720),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -97196,11 +83687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6800, 6828),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2717),
-=======
             id: DeclarationId(2721),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -97214,11 +83701,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6833, 6859),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2718),
-=======
             id: DeclarationId(2722),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -97232,11 +83715,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6898, 6920),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2719),
-=======
             id: DeclarationId(2723),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -97250,11 +83729,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6925, 6953),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2720),
-=======
             id: DeclarationId(2724),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -97268,11 +83743,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6958, 6987),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2721),
-=======
             id: DeclarationId(2725),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -97283,14 +83754,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9797, 9805),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9793, 9801),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2722),
-=======
             id: DeclarationId(2726),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -97306,14 +83773,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9810, 9850),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9806, 9846),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2723),
-=======
             id: DeclarationId(2727),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -97329,14 +83792,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9855, 9888),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9851, 9884),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2724),
-=======
             id: DeclarationId(2728),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -97358,14 +83817,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9893, 9971),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9889, 9967),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2725),
-=======
             id: DeclarationId(2729),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -97381,14 +83836,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 10137, 10200),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10133, 10196),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2726),
-=======
             id: DeclarationId(2730),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -97414,14 +83865,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 10205, 10296),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10201, 10292),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2727),
-=======
             id: DeclarationId(2731),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -97447,14 +83894,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 10301, 10433),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10297, 10429),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2728),
-=======
             id: DeclarationId(2732),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -97476,14 +83919,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 10648, 10737),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10644, 10733),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2729),
-=======
             id: DeclarationId(2733),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -97500,14 +83939,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 11537, 11549),
+            span: SourceSpan::new("src/v3/std/verification.dag", 11533, 11545),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2730),
-=======
             id: DeclarationId(2734),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -97517,11 +83952,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2729),
-=======
                         ty: DeclarationId(2733),
->>>>>>> origin/main
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -97537,14 +83968,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 11486, 11583),
+            span: SourceSpan::new("src/v3/std/verification.dag", 11482, 11579),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2731),
-=======
             id: DeclarationId(2735),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -97561,14 +83988,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 12298, 12310),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12294, 12306),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2732),
-=======
             id: DeclarationId(2736),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -97578,11 +84001,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2731),
-=======
                         ty: DeclarationId(2735),
->>>>>>> origin/main
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -97602,14 +84021,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 12248, 12376),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12244, 12372),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2733),
-=======
             id: DeclarationId(2737),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -97635,14 +84050,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 12674, 12796),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12670, 12792),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2734),
-=======
             id: DeclarationId(2738),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -97668,14 +84079,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 13058, 13183),
+            span: SourceSpan::new("src/v3/std/verification.dag", 13054, 13179),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2735),
-=======
             id: DeclarationId(2739),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -97691,14 +84098,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 15236, 15297),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15232, 15293),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2736),
-=======
             id: DeclarationId(2740),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -97720,14 +84123,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 15302, 15401),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15298, 15397),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2737),
-=======
             id: DeclarationId(2741),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -97753,14 +84152,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 15755, 15887),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15751, 15883),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2738),
-=======
             id: DeclarationId(2742),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -97782,14 +84177,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 16454, 16566),
+            span: SourceSpan::new("src/v3/std/verification.dag", 16450, 16562),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2739),
-=======
             id: DeclarationId(2743),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -97811,14 +84202,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 17263, 17342),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17259, 17338),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2740),
-=======
             id: DeclarationId(2744),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -97844,14 +84231,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 17562, 17675),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17558, 17671),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2741),
-=======
             id: DeclarationId(2745),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -97877,14 +84260,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 17680, 17816),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17676, 17812),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2742),
-=======
             id: DeclarationId(2746),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -97906,14 +84285,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 18302, 18384),
+            span: SourceSpan::new("src/v3/std/verification.dag", 18298, 18380),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2743),
-=======
             id: DeclarationId(2747),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -97935,14 +84310,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 18389, 18475),
+            span: SourceSpan::new("src/v3/std/verification.dag", 18385, 18471),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2744),
-=======
             id: DeclarationId(2748),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -97959,14 +84330,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 18554, 18564),
+            span: SourceSpan::new("src/v3/std/verification.dag", 18550, 18560),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2745),
-=======
             id: DeclarationId(2749),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -97976,11 +84343,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "generated_paths".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2744),
-=======
                         ty: DeclarationId(2748),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -97992,14 +84355,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 18480, 18570),
+            span: SourceSpan::new("src/v3/std/verification.dag", 18476, 18566),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2746),
-=======
             id: DeclarationId(2750),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -98021,9 +84380,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/verification.dag", 19784, 19909),
-=======
             span: SourceSpan::new("src/v3/std/verification.dag", 19780, 19905),
         });
         declarations.push(Declaration {
@@ -98054,7 +84410,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             refinement: None,
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/verification.dag", 20847, 20981),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2752),
@@ -98083,40 +84438,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 20851, 20985),
+            span: SourceSpan::new("src/v3/std/verification.dag", 21620, 21764),
         });
         declarations.push(Declaration {
             id: DeclarationId(2753),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "deferred_gate".to_string(),
-                        ty: DeclarationId(1313),
-                    },
-                    Field {
-                        label: "target_lane".to_string(),
-                        ty: DeclarationId(1313),
-                    },
-                    Field {
-                        label: "authority_doc".to_string(),
-                        ty: DeclarationId(1313),
-                    },
-                ],
-            },
-            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", 21624, 21768),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2749),
-            name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "ledger".to_string(),
@@ -98131,14 +84457,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 22613, 22667),
+            span: SourceSpan::new("src/v3/std/verification.dag", 22609, 22663),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2750),
-=======
             id: DeclarationId(2754),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -98155,9 +84477,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/verification.dag", 23711, 23734),
-=======
             span: SourceSpan::new("src/v3/std/verification.dag", 23707, 23730),
         });
         declarations.push(Declaration {
@@ -98173,7 +84492,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             refinement: None,
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/verification.dag", 23933, 23939),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2756),
@@ -98187,25 +84505,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 23937, 23943),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23944, 23950),
         });
         declarations.push(Declaration {
             id: DeclarationId(2757),
             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", 23948, 23954),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2753),
-            name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
@@ -98221,9 +84525,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/verification.dag", 24092, 24115),
-=======
             span: SourceSpan::new("src/v3/std/verification.dag", 24088, 24111),
         });
         declarations.push(Declaration {
@@ -98244,7 +84545,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             refinement: None,
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/verification.dag", 25834, 25863),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2759),
@@ -98252,30 +84552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1293),
-                }],
-            },
-            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", 25838, 25867),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2755),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1295),
-=======
                     ty: DeclarationId(1298),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -98286,14 +84563,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 25872, 25911),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25868, 25907),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2756),
-=======
             id: DeclarationId(2760),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -98309,14 +84582,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26769, 26790),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26765, 26786),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2757),
-=======
             id: DeclarationId(2761),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -98332,14 +84601,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26795, 26826),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26791, 26822),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2758),
-=======
             id: DeclarationId(2762),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -98356,14 +84621,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26870, 26886),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26866, 26882),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2759),
-=======
             id: DeclarationId(2763),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -98380,14 +84641,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 27142, 27165),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27138, 27161),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2760),
-=======
             id: DeclarationId(2764),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -98407,11 +84664,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 7221, 7252),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2761),
-=======
             id: DeclarationId(2765),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -98431,11 +84684,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/workflows.dag", 992, 1006),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2762),
-=======
             id: DeclarationId(2766),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -98449,11 +84698,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 532, 547),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2763),
-=======
             id: DeclarationId(2767),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -98467,11 +84712,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 550, 561),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2764),
-=======
             id: DeclarationId(2768),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -98485,11 +84726,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 564, 576),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2765),
-=======
             id: DeclarationId(2769),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -98508,11 +84745,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2766),
-=======
             id: DeclarationId(2770),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -98526,11 +84759,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6428, 6446),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2767),
-=======
             id: DeclarationId(2771),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -98544,11 +84773,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6451, 6466),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2768),
-=======
             id: DeclarationId(2772),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -98562,11 +84787,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6495, 6518),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2769),
-=======
             id: DeclarationId(2773),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -98580,11 +84801,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6523, 6544),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2770),
-=======
             id: DeclarationId(2774),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -98598,11 +84815,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6549, 6564),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2771),
-=======
             id: DeclarationId(2775),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -98616,11 +84829,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8177, 8187),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2772),
-=======
             id: DeclarationId(2776),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -98634,11 +84843,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8192, 8203),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2773),
-=======
             id: DeclarationId(2777),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -98652,11 +84857,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8208, 8221),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2774),
-=======
             id: DeclarationId(2778),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -98670,11 +84871,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8226, 8239),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2775),
-=======
             id: DeclarationId(2779),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -98688,11 +84885,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8244, 8257),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2776),
-=======
             id: DeclarationId(2780),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -98706,11 +84899,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8262, 8276),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2777),
-=======
             id: DeclarationId(2781),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -98724,11 +84913,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8281, 8296),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2778),
-=======
             id: DeclarationId(2782),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -98742,11 +84927,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9038, 9055),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2779),
-=======
             id: DeclarationId(2783),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -98760,11 +84941,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9060, 9070),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2780),
-=======
             id: DeclarationId(2784),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -98778,9 +84955,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9075, 9079),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2781),
-=======
             id: DeclarationId(2785),
             name: None,
             connective: TypeConnective::Conj {
@@ -98827,7 +85001,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         });
         declarations.push(Declaration {
             id: DeclarationId(2786),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -98841,56 +85014,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "carrier".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1722),
-                    },
-                    Field {
-                        label: "range_min_inclusive".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "range_max_inclusive".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "is_copy".to_string(),
-                        ty: DeclarationId(128),
-                    },
-                    Field {
-                        label: "overflow".to_string(),
-                        ty: DeclarationId(1723),
-                    },
-                ],
-            },
-            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("dsl/extdeps/languages/rust/primitives.dag", 9857, 10429),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2782),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "target_name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "algebra".to_string(),
-                        ty: DeclarationId(1721),
-=======
                         ty: DeclarationId(1724),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "carrier".to_string(),
-                        ty: DeclarationId(1722),
                     },
                     Field {
                         label: "is_copy".to_string(),
@@ -98909,21 +85033,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10434, 10616),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2783),
-=======
             id: DeclarationId(2787),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-<<<<<<< HEAD
-                    value: DeclarationId(1724),
-=======
                     value: DeclarationId(1726),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -98937,11 +85053,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10965, 10984),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2784),
-=======
             id: DeclarationId(2788),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -98955,11 +85067,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4233, 4241),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2785),
-=======
             id: DeclarationId(2789),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -98978,11 +85086,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4246, 4277),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2786),
-=======
             id: DeclarationId(2790),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -99002,20 +85106,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4299, 4319),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2787),
-=======
             id: DeclarationId(2791),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "values".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2786),
-=======
                     ty: DeclarationId(2790),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -99029,11 +85125,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4282, 4321),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2788),
-=======
             id: DeclarationId(2792),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -99058,11 +85150,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4326, 4379),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2789),
-=======
             id: DeclarationId(2793),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -99087,11 +85175,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4384, 4433),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2790),
-=======
             id: DeclarationId(2794),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -99105,11 +85189,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 847, 851),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2791),
-=======
             id: DeclarationId(2795),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -99123,11 +85203,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 854, 857),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2792),
-=======
             id: DeclarationId(2796),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -99141,21 +85217,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 860, 872),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2793),
-=======
             id: DeclarationId(2797),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-<<<<<<< HEAD
-                    value: DeclarationId(1736),
-=======
                     value: DeclarationId(1738),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -99169,11 +85237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1242, 1259),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2794),
-=======
             id: DeclarationId(2798),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -99192,11 +85256,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2795),
-=======
             id: DeclarationId(2799),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -99210,11 +85270,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1309, 1318),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2796),
-=======
             id: DeclarationId(2800),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -99228,11 +85284,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1323, 1332),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2797),
-=======
             id: DeclarationId(2801),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -99246,11 +85298,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1337, 1350),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2798),
-=======
             id: DeclarationId(2802),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -99264,11 +85312,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1355, 1367),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2799),
-=======
             id: DeclarationId(2803),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -99282,11 +85326,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1372, 1385),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2800),
-=======
             id: DeclarationId(2804),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -99305,11 +85345,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2801),
-=======
             id: DeclarationId(2805),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -99323,11 +85359,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1677, 1685),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2802),
-=======
             id: DeclarationId(2806),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -99341,11 +85373,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1688, 1697),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2803),
-=======
             id: DeclarationId(2807),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -99359,21 +85387,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1700, 1709),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2804),
-=======
             id: DeclarationId(2808),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-<<<<<<< HEAD
-                    value: DeclarationId(1745),
-=======
                     value: DeclarationId(1747),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -99387,19 +85407,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1521, 1542),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2805),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1754),
-=======
             id: DeclarationId(2809),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
                     DeclarationId(1756),
->>>>>>> origin/main
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -99414,21 +85426,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2806),
-=======
             id: DeclarationId(2810),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-<<<<<<< HEAD
-                    value: DeclarationId(1751),
-=======
                     value: DeclarationId(1753),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -99442,11 +85446,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1583, 1592),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2807),
-=======
             id: DeclarationId(2811),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -99472,19 +85472,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1709),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2808),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2807),
-=======
             id: DeclarationId(2812),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
                     DeclarationId(2811),
->>>>>>> origin/main
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -99499,19 +85491,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2809),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1743),
-=======
             id: DeclarationId(2813),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
                     DeclarationId(1745),
->>>>>>> origin/main
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -99526,11 +85510,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2810),
-=======
             id: DeclarationId(2814),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -99544,11 +85524,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1917, 1925),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2811),
-=======
             id: DeclarationId(2815),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -99562,11 +85538,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1928, 1937),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2812),
-=======
             id: DeclarationId(2816),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -99580,9 +85552,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1940, 1948),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2813),
-=======
             id: DeclarationId(2817),
             name: None,
             connective: TypeConnective::Instantiation {
@@ -99604,27 +85573,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         });
         declarations.push(Declaration {
             id: DeclarationId(2818),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(230),
-                }],
-            },
-            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("dsl/extdeps/github/actions.dag", 2106, 2118),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2819),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -99644,25 +85592,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2127, 2139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2815),
+            id: DeclarationId(2819),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "branches".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2813),
-                    },
-                    Field {
-                        label: "paths".to_string(),
-                        ty: DeclarationId(2814),
-=======
                         ty: DeclarationId(2817),
                     },
                     Field {
                         label: "paths".to_string(),
                         ty: DeclarationId(2818),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -99677,11 +85617,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2089, 2141),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2816),
-=======
             id: DeclarationId(2820),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -99701,21 +85637,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2170, 2182),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2817),
-=======
             id: DeclarationId(2821),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-<<<<<<< HEAD
-                    value: DeclarationId(1746),
-=======
                     value: DeclarationId(1748),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -99729,29 +85657,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2191, 2216),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2818),
-=======
             id: DeclarationId(2822),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "branches".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2816),
-                    },
-                    Field {
-                        label: "types".to_string(),
-                        ty: DeclarationId(2817),
-=======
                         ty: DeclarationId(2820),
                     },
                     Field {
                         label: "types".to_string(),
                         ty: DeclarationId(2821),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -99766,20 +85682,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2146, 2218),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2819),
-=======
             id: DeclarationId(2823),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "cron".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1727),
-=======
                     ty: DeclarationId(1729),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -99793,21 +85701,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2223, 2254),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2820),
-=======
             id: DeclarationId(2824),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-<<<<<<< HEAD
-                    value: DeclarationId(1747),
-=======
                     value: DeclarationId(1749),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -99821,20 +85721,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2286, 2305),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2821),
-=======
             id: DeclarationId(2825),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "inputs".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2820),
-=======
                     ty: DeclarationId(2824),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -99848,21 +85740,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2259, 2307),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2822),
-=======
             id: DeclarationId(2826),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-<<<<<<< HEAD
-                    value: DeclarationId(1747),
-=======
                     value: DeclarationId(1749),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -99876,20 +85760,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2335, 2354),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2823),
-=======
             id: DeclarationId(2827),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "inputs".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2822),
-=======
                     ty: DeclarationId(2826),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -99903,11 +85779,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2312, 2356),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2824),
-=======
             id: DeclarationId(2828),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -99921,11 +85793,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2387, 2393),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2825),
-=======
             id: DeclarationId(2829),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -99939,11 +85807,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2398, 2409),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2826),
-=======
             id: DeclarationId(2830),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -99957,11 +85821,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2414, 2422),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2827),
-=======
             id: DeclarationId(2831),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -99975,11 +85835,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2427, 2441),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2828),
-=======
             id: DeclarationId(2832),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -99993,9 +85849,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2446, 2452),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2829),
-=======
             id: DeclarationId(2833),
             name: None,
             connective: TypeConnective::Cardinality(
@@ -100016,26 +85869,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         });
         declarations.push(Declaration {
             id: DeclarationId(2834),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 2505, 2512),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2835),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -100054,7 +85887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2836),
+            id: DeclarationId(2835),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -100068,7 +85901,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2603, 2614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2837),
+            id: DeclarationId(2836),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -100082,7 +85915,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2617, 2629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2838),
+            id: DeclarationId(2837),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -100096,7 +85929,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2632, 2643),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2839),
+            id: DeclarationId(2838),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -100110,7 +85943,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2646, 2662),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2840),
+            id: DeclarationId(2839),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -100124,7 +85957,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4784, 4793),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2841),
+            id: DeclarationId(2840),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -100138,7 +85971,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4796, 4804),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2842),
+            id: DeclarationId(2841),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -100152,7 +85985,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4807, 4820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2838),
+            id: DeclarationId(2842),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -100171,21 +86004,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2839),
-=======
             id: DeclarationId(2843),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-<<<<<<< HEAD
-                    value: DeclarationId(1757),
-=======
                     value: DeclarationId(1759),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -100199,11 +86024,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5372, 5382),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2840),
-=======
             id: DeclarationId(2844),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -100223,11 +86044,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5392, 5404),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2841),
-=======
             id: DeclarationId(2845),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -100253,19 +86070,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5511),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2842),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2841),
-=======
             id: DeclarationId(2846),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
                     DeclarationId(2845),
->>>>>>> origin/main
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -100280,11 +86089,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2843),
-=======
             id: DeclarationId(2847),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -100310,19 +86115,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5634),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2844),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2843),
-=======
             id: DeclarationId(2848),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
                     DeclarationId(2847),
->>>>>>> origin/main
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -100337,11 +86134,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2845),
-=======
             id: DeclarationId(2849),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -100360,19 +86153,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2846),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1773),
-=======
             id: DeclarationId(2850),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
                     DeclarationId(1775),
->>>>>>> origin/main
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -100387,11 +86172,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2847),
-=======
             id: DeclarationId(2851),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -100410,19 +86191,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2848),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1754),
-=======
             id: DeclarationId(2852),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
                     DeclarationId(1756),
->>>>>>> origin/main
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -100437,11 +86210,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2849),
-=======
             id: DeclarationId(2853),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -100460,11 +86229,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6619, 6655),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2850),
-=======
             id: DeclarationId(2854),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -100483,11 +86248,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6660, 6709),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2851),
-=======
             id: DeclarationId(2855),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -100501,11 +86262,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7555, 7584),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2852),
-=======
             id: DeclarationId(2856),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -100524,11 +86281,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7589, 7646),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2853),
-=======
             id: DeclarationId(2857),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -100547,55 +86300,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8224, 8259),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2854),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1753),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 8418, 8447),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2855),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "group".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "cancel_in_progress".to_string(),
-                        ty: DeclarationId(2854),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/actions.dag", 8264, 8453),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2856),
-=======
             id: DeclarationId(2858),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -100611,12 +86316,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2857),
-=======
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
@@ -100665,7 +86364,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         });
         declarations.push(Declaration {
             id: DeclarationId(2861),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -100684,11 +86382,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2858),
-=======
             id: DeclarationId(2862),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -100698,19 +86392,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "cancel_in_progress".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2856),
-                    },
-                    Field {
-                        label: "explicit_single".to_string(),
-                        ty: DeclarationId(2857),
-=======
                         ty: DeclarationId(2860),
                     },
                     Field {
                         label: "explicit_single".to_string(),
                         ty: DeclarationId(2861),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -100725,20 +86411,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8458, 8845),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2859),
-=======
             id: DeclarationId(2863),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "label".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1756),
-=======
                     ty: DeclarationId(1758),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -100752,11 +86430,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10037, 10072),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2860),
-=======
             id: DeclarationId(2864),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -100776,20 +86450,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10098, 10110),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2861),
-=======
             id: DeclarationId(2865),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "labels".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2860),
-=======
                     ty: DeclarationId(2864),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -100803,11 +86469,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10077, 10112),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2862),
-=======
             id: DeclarationId(2866),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -100826,11 +86488,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10201, 10240),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2863),
-=======
             id: DeclarationId(2867),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -100844,11 +86502,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10263, 10275),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2864),
-=======
             id: DeclarationId(2868),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -100862,11 +86516,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10280, 10290),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2865),
-=======
             id: DeclarationId(2869),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -100880,11 +86530,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10295, 10305),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2866),
-=======
             id: DeclarationId(2870),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -100898,11 +86544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10310, 10321),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2867),
-=======
             id: DeclarationId(2871),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -100916,11 +86558,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10326, 10333),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2868),
-=======
             id: DeclarationId(2872),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -100934,9 +86572,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10338, 10351),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2869),
-=======
             id: DeclarationId(2873),
             name: None,
             connective: TypeConnective::Cardinality(
@@ -100957,26 +86592,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         });
         declarations.push(Declaration {
             id: DeclarationId(2874),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 10532, 10539),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2875),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -100995,7 +86610,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2871),
+            id: DeclarationId(2875),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -101021,19 +86636,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10633),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2872),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2871),
-=======
             id: DeclarationId(2876),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
                     DeclarationId(2875),
->>>>>>> origin/main
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -101048,119 +86655,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2873),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 10661, 10668),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2874),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 10690, 10697),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2875),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(93),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 10753, 10757),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2876),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(2869),
-                    },
-                    Field {
-                        label: "id".to_string(),
-                        ty: DeclarationId(2870),
-                    },
-                    Field {
-                        label: "run".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "shell".to_string(),
-                        ty: DeclarationId(1758),
-                    },
-                    Field {
-                        label: "env".to_string(),
-                        ty: DeclarationId(2872),
-                    },
-                    Field {
-                        label: "working_directory".to_string(),
-                        ty: DeclarationId(2873),
-                    },
-                    Field {
-                        label: "if_condition".to_string(),
-                        ty: DeclarationId(2874),
-                    },
-                    Field {
-                        label: "continue_on_error".to_string(),
-                        ty: DeclarationId(128),
-                    },
-                    Field {
-                        label: "timeout_minutes".to_string(),
-                        ty: DeclarationId(2875),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/actions.dag", 10510, 10763),
-        });
-        declarations.push(Declaration {
-=======
->>>>>>> origin/main
             id: DeclarationId(2877),
             name: None,
             connective: TypeConnective::Cardinality(
@@ -101177,11 +86671,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
-=======
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2878),
@@ -101200,12 +86690,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2879),
-=======
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
         });
         declarations.push(Declaration {
@@ -101320,7 +86804,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         });
         declarations.push(Declaration {
             id: DeclarationId(2883),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -101346,19 +86829,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10962),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2880),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2879),
-=======
             id: DeclarationId(2884),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
                     DeclarationId(2883),
->>>>>>> origin/main
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -101373,11 +86848,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2881),
-=======
             id: DeclarationId(2885),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -101403,19 +86874,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10995),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2882),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2881),
-=======
             id: DeclarationId(2886),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
                     DeclarationId(2885),
->>>>>>> origin/main
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -101430,11 +86893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10996),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2883),
-=======
             id: DeclarationId(2887),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -101453,11 +86912,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2884),
-=======
             id: DeclarationId(2888),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -101476,45 +86931,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2885),
-=======
             id: DeclarationId(2889),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2877),
-                    },
-                    Field {
-                        label: "id".to_string(),
-                        ty: DeclarationId(2878),
-                    },
-                    Field {
-                        label: "uses".to_string(),
-                        ty: DeclarationId(1759),
-                    },
-                    Field {
-                        label: "with".to_string(),
-                        ty: DeclarationId(2880),
-                    },
-                    Field {
-                        label: "env".to_string(),
-                        ty: DeclarationId(2882),
-                    },
-                    Field {
-                        label: "if_condition".to_string(),
-                        ty: DeclarationId(2883),
-=======
                         ty: DeclarationId(2881),
                     },
                     Field {
                         label: "id".to_string(),
                         ty: DeclarationId(2882),
->>>>>>> origin/main
                     },
                     Field {
                         label: "uses".to_string(),
@@ -101538,11 +86965,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "timeout_minutes".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2884),
-=======
                         ty: DeclarationId(2888),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -101557,11 +86980,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10768, 11091),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2886),
-=======
             id: DeclarationId(2890),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -101575,11 +86994,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11110, 11114),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2887),
-=======
             id: DeclarationId(2891),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -101593,11 +87008,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11117, 11119),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2888),
-=======
             id: DeclarationId(2892),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -101611,11 +87022,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11122, 11126),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2889),
-=======
             id: DeclarationId(2893),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -101629,11 +87036,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11129, 11135),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2890),
-=======
             id: DeclarationId(2894),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -101647,11 +87050,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11138, 11141),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2891),
-=======
             id: DeclarationId(2895),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -101670,11 +87069,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2892),
-=======
             id: DeclarationId(2896),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -101693,11 +87088,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2893),
-=======
             id: DeclarationId(2897),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -101716,11 +87107,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11530, 11534),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2894),
-=======
             id: DeclarationId(2898),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -101730,13 +87117,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "file".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2891),
-                    },
-                    Field {
-                        label: "line".to_string(),
-                        ty: DeclarationId(2892),
-=======
                         ty: DeclarationId(2895),
                     },
                     Field {
@@ -101746,11 +87126,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "col".to_string(),
                         ty: DeclarationId(2897),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "col".to_string(),
-                        ty: DeclarationId(2893),
                     },
                 ],
             },
@@ -101765,11 +87140,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11463, 11536),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2895),
-=======
             id: DeclarationId(2899),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -101788,11 +87159,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11584, 11591),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2896),
-=======
             id: DeclarationId(2900),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -101811,11 +87178,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2897),
-=======
             id: DeclarationId(2901),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -101834,11 +87197,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11610, 11614),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2898),
-=======
             id: DeclarationId(2902),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -101848,13 +87207,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "file".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2895),
-                    },
-                    Field {
-                        label: "line".to_string(),
-                        ty: DeclarationId(2896),
-=======
                         ty: DeclarationId(2899),
                     },
                     Field {
@@ -101864,11 +87216,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "col".to_string(),
                         ty: DeclarationId(2901),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "col".to_string(),
-                        ty: DeclarationId(2897),
                     },
                 ],
             },
@@ -101883,11 +87230,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11541, 11616),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2899),
-=======
             id: DeclarationId(2903),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -101906,11 +87249,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11663, 11670),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2900),
-=======
             id: DeclarationId(2904),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -101929,11 +87268,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11678, 11682),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2901),
-=======
             id: DeclarationId(2905),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -101952,11 +87287,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11689, 11693),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2902),
-=======
             id: DeclarationId(2906),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -101966,13 +87297,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "file".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2899),
-                    },
-                    Field {
-                        label: "line".to_string(),
-                        ty: DeclarationId(2900),
-=======
                         ty: DeclarationId(2903),
                     },
                     Field {
@@ -101982,11 +87306,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "col".to_string(),
                         ty: DeclarationId(2905),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "col".to_string(),
-                        ty: DeclarationId(2901),
                     },
                 ],
             },
@@ -102001,11 +87320,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11621, 11695),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2903),
-=======
             id: DeclarationId(2907),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -102024,11 +87339,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11700, 11733),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2904),
-=======
             id: DeclarationId(2908),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -102042,11 +87353,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11738, 11756),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2905),
-=======
             id: DeclarationId(2909),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -102071,11 +87378,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11761, 11802),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2906),
-=======
             id: DeclarationId(2910),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -102094,11 +87397,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11807, 11832),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2907),
-=======
             id: DeclarationId(2911),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -102117,11 +87416,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11837, 11867),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2908),
-=======
             id: DeclarationId(2912),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -102140,11 +87435,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12673, 12677),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2909),
-=======
             id: DeclarationId(2913),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -102158,19 +87449,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "retention_days".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2908),
-                    },
-                    Field {
-                        label: "if_no_files_found".to_string(),
-                        ty: DeclarationId(1770),
-=======
                         ty: DeclarationId(2912),
                     },
                     Field {
                         label: "if_no_files_found".to_string(),
                         ty: DeclarationId(1772),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -102185,11 +87468,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12620, 12720),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2910),
-=======
             id: DeclarationId(2914),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -102208,11 +87487,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12756, 12763),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2911),
-=======
             id: DeclarationId(2915),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -102222,11 +87497,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "path".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2910),
-=======
                         ty: DeclarationId(2914),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -102241,11 +87512,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12725, 12765),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2912),
-=======
             id: DeclarationId(2916),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -102259,11 +87526,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12795, 12799),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2913),
-=======
             id: DeclarationId(2917),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -102277,11 +87540,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12802, 12810),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2914),
-=======
             id: DeclarationId(2918),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -102295,11 +87554,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12813, 12819),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2915),
-=======
             id: DeclarationId(2919),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -102319,11 +87574,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13281, 13293),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2916),
-=======
             id: DeclarationId(2920),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -102334,11 +87585,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(139),
-<<<<<<< HEAD
-                        value: DeclarationId(2915),
-=======
                         value: DeclarationId(2919),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -102353,11 +87600,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13269, 13294),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2917),
-=======
             id: DeclarationId(2921),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -102383,21 +87626,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13311, 13330),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2918),
-=======
             id: DeclarationId(2922),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-<<<<<<< HEAD
-                    value: DeclarationId(2917),
-=======
                     value: DeclarationId(2921),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -102411,11 +87646,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13306, 13331),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2919),
-=======
             id: DeclarationId(2923),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -102441,21 +87672,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13348, 13367),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2920),
-=======
             id: DeclarationId(2924),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-<<<<<<< HEAD
-                    value: DeclarationId(2919),
-=======
                     value: DeclarationId(2923),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -102469,11 +87692,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13343, 13368),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2921),
-=======
             id: DeclarationId(2925),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -102492,11 +87711,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13403, 13407),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2922),
-=======
             id: DeclarationId(2926),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -102510,11 +87725,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13563, 13570),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2923),
-=======
             id: DeclarationId(2927),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -102528,11 +87739,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13575, 13582),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2924),
-=======
             id: DeclarationId(2928),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -102546,11 +87753,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13587, 13596),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2925),
-=======
             id: DeclarationId(2929),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -102564,11 +87767,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13601, 13608),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2926),
-=======
             id: DeclarationId(2930),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -102582,11 +87781,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13613, 13621),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2927),
-=======
             id: DeclarationId(2931),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -102600,11 +87795,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13626, 13640),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2928),
-=======
             id: DeclarationId(2932),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -102618,11 +87809,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1935, 1959),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2929),
-=======
             id: DeclarationId(2933),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -102636,11 +87823,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1964, 1989),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2930),
-=======
             id: DeclarationId(2934),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(151)],
@@ -102658,88 +87841,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2673, 2714),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2931),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(48),
-                }],
-            },
-            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("dsl/std/algebra.dag", 17832, 17834),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2932),
-            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("dsl/std/algebra.dag", 17832, 17834),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2933),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2931),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2932),
-                    },
-                ],
-            },
-            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("dsl/std/algebra.dag", 17832, 17834),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2934),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(48),
-                }],
-            },
-            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("dsl/std/algebra.dag", 17851, 17853),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2935),
-            name: None,
-            connective: TypeConnective::Conj { children: vec![] },
-=======
             id: DeclarationId(2935),
             name: None,
             connective: TypeConnective::Conj {
@@ -102748,7 +87849,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ty: DeclarationId(48),
                 }],
             },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -102762,22 +87862,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         declarations.push(Declaration {
             id: DeclarationId(2936),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2934),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2935),
-                    },
-                ],
-            },
-=======
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -102786,17 +87871,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853),
-=======
             span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2937),
             name: None,
-<<<<<<< HEAD
-=======
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
@@ -102880,15 +87959,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         declarations.push(Declaration {
             id: DeclarationId(2941),
             name: None,
->>>>>>> origin/main
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
                     ty: DeclarationId(51),
                 }],
             },
-<<<<<<< HEAD
-=======
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -102903,7 +87979,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2942),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -102917,37 +87992,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         declarations.push(Declaration {
             id: DeclarationId(2943),
             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("dsl/std/algebra.dag", 18997, 18999),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2939),
-            name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2937),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2938),
-=======
                         ty: DeclarationId(2941),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2942),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -102962,11 +88015,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2940),
-=======
             id: DeclarationId(2944),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -102985,11 +88034,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2941),
-=======
             id: DeclarationId(2945),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -103003,29 +88048,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2942),
-=======
             id: DeclarationId(2946),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2940),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2941),
-=======
                         ty: DeclarationId(2944),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2945),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -103040,11 +88073,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2943),
-=======
             id: DeclarationId(2947),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -103063,11 +88092,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2944),
-=======
             id: DeclarationId(2948),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -103081,29 +88106,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2945),
-=======
             id: DeclarationId(2949),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2943),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2944),
-=======
                         ty: DeclarationId(2947),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2948),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -103118,11 +88131,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2946),
-=======
             id: DeclarationId(2950),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -103141,108 +88150,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2947),
-            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("dsl/std/algebra.dag", 23580, 23590),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2948),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2946),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2947),
-                    },
-                ],
-            },
-            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("dsl/std/algebra.dag", 23580, 23590),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2949),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(93),
-                }],
-            },
-            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("dsl/std/algebra.dag", 23835, 23839),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2950),
-            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("dsl/std/algebra.dag", 23835, 23839),
-        });
-        declarations.push(Declaration {
             id: DeclarationId(2951),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2949),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2950),
-                    },
-                ],
-            },
-            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("dsl/std/algebra.dag", 23835, 23839),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2952),
-=======
-            id: DeclarationId(2951),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -103256,11 +88164,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2953),
-            name: None,
-            connective: TypeConnective::Conj { children: vec![] },
-=======
             id: DeclarationId(2952),
             name: None,
             connective: TypeConnective::Disj {
@@ -103391,7 +88294,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                 ],
             },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -103403,137 +88305,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 3781, 3785),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2954),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2952),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2953),
-                    },
-                ],
-            },
-            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("dsl/std/types.dag", 3781, 3785),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2955),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-            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("dsl/std/types.dag", 4264, 4271),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2956),
-            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("dsl/std/types.dag", 4264, 4271),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2957),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2955),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2956),
-                    },
-                ],
-            },
-            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("dsl/std/types.dag", 4264, 4271),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2958),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-            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("dsl/std/types.dag", 6172, 6179),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2959),
-            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("dsl/std/types.dag", 6172, 6179),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2960),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2958),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2959),
-                    },
-                ],
-=======
             id: DeclarationId(2959),
             name: None,
             connective: TypeConnective::Conj {
@@ -103541,7 +88312,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     label: "_0".to_string(),
                     ty: DeclarationId(230),
                 }],
->>>>>>> origin/main
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -103554,7 +88324,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 4264, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2961),
+            id: DeclarationId(2960),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -103670,11 +88440,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16964, 16984),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2962),
-=======
             id: DeclarationId(2966),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -103688,29 +88454,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16964, 16984),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2963),
-=======
             id: DeclarationId(2967),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2961),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2962),
-=======
                         ty: DeclarationId(2965),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2966),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -103725,11 +88479,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16964, 16984),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2964),
-=======
             id: DeclarationId(2968),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -103748,11 +88498,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17620, 17627),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2965),
-=======
             id: DeclarationId(2969),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -103766,29 +88512,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17620, 17627),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2966),
-=======
             id: DeclarationId(2970),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2964),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2965),
-=======
                         ty: DeclarationId(2968),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2969),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -103803,11 +88537,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17620, 17627),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2967),
-=======
             id: DeclarationId(2971),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -103826,11 +88556,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21380, 21390),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2968),
-=======
             id: DeclarationId(2972),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -103844,29 +88570,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21380, 21390),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2969),
-=======
             id: DeclarationId(2973),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2967),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2968),
-=======
                         ty: DeclarationId(2971),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2972),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -103881,11 +88595,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21380, 21390),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2970),
-=======
             id: DeclarationId(2974),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -103904,11 +88614,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21515, 21522),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2971),
-=======
             id: DeclarationId(2975),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -103922,29 +88628,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21515, 21522),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2972),
-=======
             id: DeclarationId(2976),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2970),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2971),
-=======
                         ty: DeclarationId(2974),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2975),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -103959,11 +88653,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21515, 21522),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2973),
-=======
             id: DeclarationId(2977),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -103982,108 +88672,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21589, 21593),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2974),
-            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("dsl/std/types.dag", 21589, 21593),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2975),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2973),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2974),
-                    },
-                ],
-            },
-            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("dsl/std/types.dag", 21589, 21593),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2976),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-            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("dsl/std/types.dag", 23360, 23367),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2977),
-            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("dsl/std/types.dag", 23360, 23367),
-        });
-        declarations.push(Declaration {
             id: DeclarationId(2978),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2976),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2977),
-                    },
-                ],
-            },
-            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("dsl/std/types.dag", 23360, 23367),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2979),
-=======
-            id: DeclarationId(2978),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -104097,9 +88686,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21589, 21593),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2980),
-=======
             id: DeclarationId(2979),
             name: None,
             connective: TypeConnective::Disj {
@@ -104217,39 +88803,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         });
         declarations.push(Declaration {
             id: DeclarationId(2985),
->>>>>>> origin/main
-            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("dsl/std/types.dag", 23872, 23879),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2981),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2979),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2980),
-=======
                         ty: DeclarationId(2983),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2984),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -104264,11 +88827,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23872, 23879),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2982),
-=======
             id: DeclarationId(2986),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -104287,11 +88846,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23966, 23973),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2983),
-=======
             id: DeclarationId(2987),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -104305,29 +88860,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23966, 23973),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2984),
-=======
             id: DeclarationId(2988),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2982),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2983),
-=======
                         ty: DeclarationId(2986),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2987),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -104342,11 +88885,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23966, 23973),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2985),
-=======
             id: DeclarationId(2989),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -104365,11 +88904,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24196, 24211),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2986),
-=======
             id: DeclarationId(2990),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -104383,29 +88918,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24196, 24211),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2987),
-=======
             id: DeclarationId(2991),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2985),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2986),
-=======
                         ty: DeclarationId(2989),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2990),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -104420,11 +88943,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24196, 24211),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2988),
-=======
             id: DeclarationId(2992),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -104443,11 +88962,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24222, 24235),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2989),
-=======
             id: DeclarationId(2993),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -104461,29 +88976,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24222, 24235),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2990),
-=======
             id: DeclarationId(2994),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2988),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2989),
-=======
                         ty: DeclarationId(2992),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2993),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -104498,11 +89001,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24222, 24235),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2991),
-=======
             id: DeclarationId(2995),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -104521,108 +89020,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24251, 24264),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2992),
-            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("dsl/std/types.dag", 24251, 24264),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2993),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2991),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2992),
-                    },
-                ],
-            },
-            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("dsl/std/types.dag", 24251, 24264),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2994),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-            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("dsl/std/types.dag", 24374, 24381),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2995),
-            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("dsl/std/types.dag", 24374, 24381),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2996),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2994),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2995),
-                    },
-                ],
-            },
-            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("dsl/std/types.dag", 24374, 24381),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2997),
-=======
             id: DeclarationId(2996),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -104636,11 +89034,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24251, 24264),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2998),
-            name: None,
-            connective: TypeConnective::Conj { children: vec![] },
-=======
             id: DeclarationId(2997),
             name: None,
             connective: TypeConnective::Disj {
@@ -104655,7 +89048,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                 ],
             },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -104669,25 +89061,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         declarations.push(Declaration {
             id: DeclarationId(2998),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2997),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2998),
-                    },
-                ],
-=======
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
                     ty: DeclarationId(230),
                 }],
->>>>>>> origin/main
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -104697,17 +89075,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760),
-=======
             span: SourceSpan::new("dsl/std/types.dag", 24374, 24381),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2999),
             name: None,
-<<<<<<< HEAD
-=======
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -104805,11 +89177,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         declarations.push(Declaration {
             id: DeclarationId(3004),
             name: None,
->>>>>>> origin/main
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1824),
+                    ty: DeclarationId(1826),
                 }],
             },
             type_params: vec![],
@@ -104820,12 +89191,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3001),
-=======
             span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059),
         });
         declarations.push(Declaration {
@@ -104888,7 +89253,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         });
         declarations.push(Declaration {
             id: DeclarationId(3008),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -104899,32 +89263,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3002),
-=======
             id: DeclarationId(3009),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3000),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3001),
-=======
                         ty: DeclarationId(3007),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(3008),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -104936,15 +89288,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3003),
+            id: DeclarationId(3010),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1827),
+                    ty: DeclarationId(198),
                 }],
             },
             type_params: vec![],
@@ -104955,10 +89307,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21237),
+            span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3004),
+            id: DeclarationId(3011),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -104969,20 +89321,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21237),
+            span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3010),
+            id: DeclarationId(3012),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3003),
+                        ty: DeclarationId(3010),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3004),
+                        ty: DeclarationId(3011),
                     },
                 ],
             },
@@ -104994,15 +89346,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21237),
+            span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3006),
+            id: DeclarationId(3013),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(198),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -105013,11 +89365,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3007),
+            id: DeclarationId(3014),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -105028,20 +89379,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3008),
+            id: DeclarationId(3015),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3006),
+                        ty: DeclarationId(3013),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3007),
+                        ty: DeclarationId(3014),
                     },
                 ],
             },
@@ -105053,10 +89404,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3009),
+            id: DeclarationId(3016),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -105072,10 +89423,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3010),
+            id: DeclarationId(3017),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -105086,20 +89437,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3011),
+            id: DeclarationId(3018),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3009),
+                        ty: DeclarationId(3016),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3010),
+                        ty: DeclarationId(3017),
                     },
                 ],
             },
@@ -105111,16 +89462,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3012),
-=======
-            span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706),
+            id: DeclarationId(3019),
+            name: None,
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(781),
+                }],
+            },
+            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/substrate.dag", 22288, 22296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3011),
->>>>>>> origin/main
+            id: DeclarationId(3020),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -105131,24 +89495,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/effects.dag", 30660, 30667),
-=======
-            span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706),
->>>>>>> origin/main
+            span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3013),
+            id: DeclarationId(3021),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3010),
+                        ty: DeclarationId(3019),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3011),
+                        ty: DeclarationId(3020),
                     },
                 ],
             },
@@ -105160,15 +89520,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3013),
+            id: DeclarationId(3022),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(827),
                 }],
             },
             type_params: vec![],
@@ -105179,10 +89539,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3014),
+            id: DeclarationId(3023),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -105193,20 +89553,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3015),
+            id: DeclarationId(3024),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3013),
+                        ty: DeclarationId(3022),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3014),
+                        ty: DeclarationId(3023),
                     },
                 ],
             },
@@ -105218,15 +89578,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3016),
+            id: DeclarationId(3025),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(827),
                 }],
             },
             type_params: vec![],
@@ -105237,10 +89597,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3017),
+            id: DeclarationId(3026),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -105251,32 +89611,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30660, 30667),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3014),
-=======
-            id: DeclarationId(3018),
->>>>>>> origin/main
+            id: DeclarationId(3027),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3012),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3013),
-=======
-                        ty: DeclarationId(3016),
+                        ty: DeclarationId(3025),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3017),
->>>>>>> origin/main
+                        ty: DeclarationId(3026),
                     },
                 ],
             },
@@ -105288,19 +89636,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30660, 30667),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3015),
-=======
-            id: DeclarationId(3019),
->>>>>>> origin/main
+            id: DeclarationId(3028),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(781),
+                    ty: DeclarationId(799),
                 }],
             },
             type_params: vec![],
@@ -105311,11 +89655,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3016),
+            id: DeclarationId(3029),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -105326,20 +89669,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3017),
+            id: DeclarationId(3030),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3015),
+                        ty: DeclarationId(3028),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3016),
+                        ty: DeclarationId(3029),
                     },
                 ],
             },
@@ -105351,15 +89694,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3018),
+            id: DeclarationId(3031),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(827),
+                    ty: DeclarationId(799),
                 }],
             },
             type_params: vec![],
@@ -105370,10 +89713,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3019),
+            id: DeclarationId(3032),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -105384,20 +89727,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3020),
+            id: DeclarationId(3033),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3018),
+                        ty: DeclarationId(3031),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3019),
+                        ty: DeclarationId(3032),
                     },
                 ],
             },
@@ -105409,15 +89752,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3021),
-=======
-            id: DeclarationId(3020),
->>>>>>> origin/main
+            id: DeclarationId(3034),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(754),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -105426,25 +89771,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3022),
+            id: DeclarationId(3035),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
-=======
-            id: DeclarationId(3021),
+            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/substrate.dag", 24004, 24019),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(3036),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3019),
+                        ty: DeclarationId(3034),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3020),
+                        ty: DeclarationId(3035),
                     },
                 ],
             },
@@ -105456,15 +89810,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3022),
+            id: DeclarationId(3037),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(827),
+                    ty: DeclarationId(721),
                 }],
             },
             type_params: vec![],
@@ -105475,10 +89829,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3023),
+            id: DeclarationId(3038),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -105489,20 +89843,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3024),
+            id: DeclarationId(3039),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3022),
+                        ty: DeclarationId(3037),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3023),
+                        ty: DeclarationId(3038),
                     },
                 ],
             },
@@ -105514,15 +89868,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3025),
+            id: DeclarationId(3040),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(827),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -105533,10 +89887,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3026),
+            id: DeclarationId(3041),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -105547,47 +89901,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3027),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3025),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3026),
-                    },
-                ],
-            },
->>>>>>> origin/main
-            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/substrate.dag", 22420, 22429),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3023),
+            id: DeclarationId(3042),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3021),
+                        ty: DeclarationId(3040),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3022),
+                        ty: DeclarationId(3041),
                     },
                 ],
             },
@@ -105599,15 +89926,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3024),
+            id: DeclarationId(3043),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(799),
+                    ty: DeclarationId(723),
                 }],
             },
             type_params: vec![],
@@ -105618,10 +89945,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3025),
+            id: DeclarationId(3044),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -105632,20 +89959,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3026),
+            id: DeclarationId(3045),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3024),
+                        ty: DeclarationId(3043),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3025),
+                        ty: DeclarationId(3044),
                     },
                 ],
             },
@@ -105657,15 +89984,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3027),
+            id: DeclarationId(3046),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(799),
+                    ty: DeclarationId(723),
                 }],
             },
             type_params: vec![],
@@ -105676,10 +90003,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3028),
+            id: DeclarationId(3047),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -105690,31 +90017,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3029),
+            id: DeclarationId(3048),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3027),
+                        ty: DeclarationId(3046),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3028),
+                        ty: DeclarationId(3047),
                     },
                 ],
-=======
-            id: DeclarationId(3028),
+            },
+            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/substrate.dag", 11952, 11966),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(3049),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(799),
+                    ty: DeclarationId(795),
                 }],
->>>>>>> origin/main
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -105724,10 +90061,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3030),
+            id: DeclarationId(3050),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -105738,20 +90075,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3030),
+            id: DeclarationId(3051),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3028),
+                        ty: DeclarationId(3049),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3029),
+                        ty: DeclarationId(3050),
                     },
                 ],
             },
@@ -105763,15 +90100,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3031),
+            id: DeclarationId(3052),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(799),
+                    ty: DeclarationId(801),
                 }],
             },
             type_params: vec![],
@@ -105782,10 +90119,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3032),
+            id: DeclarationId(3053),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -105796,20 +90133,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3033),
+            id: DeclarationId(3054),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3031),
+                        ty: DeclarationId(3052),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3032),
+                        ty: DeclarationId(3053),
                     },
                 ],
             },
@@ -105821,15 +90158,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3034),
+            id: DeclarationId(3055),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(754),
+                    ty: DeclarationId(809),
                 }],
             },
             type_params: vec![],
@@ -105840,14 +90177,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3031),
-=======
-            id: DeclarationId(3035),
->>>>>>> origin/main
+            id: DeclarationId(3056),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -105858,32 +90191,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3032),
-=======
-            id: DeclarationId(3036),
->>>>>>> origin/main
+            id: DeclarationId(3057),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3030),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3031),
-=======
-                        ty: DeclarationId(3034),
+                        ty: DeclarationId(3055),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3035),
->>>>>>> origin/main
+                        ty: DeclarationId(3056),
                     },
                 ],
             },
@@ -105895,19 +90216,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3033),
-=======
-            id: DeclarationId(3037),
->>>>>>> origin/main
+            id: DeclarationId(3058),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(721),
+                    ty: DeclarationId(754),
                 }],
             },
             type_params: vec![],
@@ -105918,14 +90235,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3034),
-=======
-            id: DeclarationId(3038),
->>>>>>> origin/main
+            id: DeclarationId(3059),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -105936,32 +90249,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3035),
-=======
-            id: DeclarationId(3039),
->>>>>>> origin/main
+            id: DeclarationId(3060),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3033),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3034),
-=======
-                        ty: DeclarationId(3037),
+                        ty: DeclarationId(3058),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3038),
->>>>>>> origin/main
+                        ty: DeclarationId(3059),
                     },
                 ],
             },
@@ -105973,19 +90274,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3036),
-=======
-            id: DeclarationId(3040),
->>>>>>> origin/main
+            id: DeclarationId(3061),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(822),
                 }],
             },
             type_params: vec![],
@@ -105996,11 +90293,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3037),
+            id: DeclarationId(3062),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -106011,20 +90307,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3038),
+            id: DeclarationId(3063),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3036),
+                        ty: DeclarationId(3061),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3037),
+                        ty: DeclarationId(3062),
                     },
                 ],
             },
@@ -106036,15 +90332,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3039),
+            id: DeclarationId(3064),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(723),
+                    ty: DeclarationId(754),
                 }],
             },
             type_params: vec![],
@@ -106055,10 +90351,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3040),
+            id: DeclarationId(3065),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -106069,20 +90365,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3041),
+            id: DeclarationId(3066),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3039),
+                        ty: DeclarationId(3064),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3040),
+                        ty: DeclarationId(3065),
                     },
                 ],
             },
@@ -106094,13 +90390,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3042),
-=======
-            id: DeclarationId(3041),
->>>>>>> origin/main
+            id: DeclarationId(3067),
+            name: None,
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(825),
+                }],
+            },
+            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/substrate.dag", 19623, 19645),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(3068),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -106111,20 +90423,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3043),
+            id: DeclarationId(3069),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3040),
+                        ty: DeclarationId(3067),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3041),
+                        ty: DeclarationId(3068),
                     },
                 ],
             },
@@ -106136,15 +90448,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
+            span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3043),
+            id: DeclarationId(3070),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(723),
+                    ty: DeclarationId(842),
                 }],
             },
             type_params: vec![],
@@ -106155,10 +90467,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3044),
+            id: DeclarationId(3071),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -106169,20 +90481,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3045),
+            id: DeclarationId(3072),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3043),
+                        ty: DeclarationId(3070),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3044),
+                        ty: DeclarationId(3071),
                     },
                 ],
             },
@@ -106194,15 +90506,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3046),
+            id: DeclarationId(3073),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(723),
+                    ty: DeclarationId(843),
                 }],
             },
             type_params: vec![],
@@ -106213,10 +90525,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3047),
+            id: DeclarationId(3074),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -106227,32 +90539,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3044),
-=======
-            id: DeclarationId(3048),
->>>>>>> origin/main
+            id: DeclarationId(3075),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3042),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3043),
-=======
-                        ty: DeclarationId(3046),
+                        ty: DeclarationId(3073),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3047),
->>>>>>> origin/main
+                        ty: DeclarationId(3074),
                     },
                 ],
             },
@@ -106264,19 +90564,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3045),
-=======
-            id: DeclarationId(3049),
->>>>>>> origin/main
+            id: DeclarationId(3076),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(795),
+                    ty: DeclarationId(93),
                 }],
             },
             type_params: vec![],
@@ -106287,14 +90583,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3046),
-=======
-            id: DeclarationId(3050),
->>>>>>> origin/main
+            id: DeclarationId(3077),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -106305,32 +90597,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3047),
-=======
-            id: DeclarationId(3051),
->>>>>>> origin/main
+            id: DeclarationId(3078),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3045),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3046),
-=======
-                        ty: DeclarationId(3049),
+                        ty: DeclarationId(3076),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3050),
->>>>>>> origin/main
+                        ty: DeclarationId(3077),
                     },
                 ],
             },
@@ -106342,19 +90622,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3048),
-=======
-            id: DeclarationId(3052),
->>>>>>> origin/main
+            id: DeclarationId(3079),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(801),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -106365,14 +90641,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3049),
-=======
-            id: DeclarationId(3053),
->>>>>>> origin/main
+            id: DeclarationId(3080),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -106383,32 +90655,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3050),
-=======
-            id: DeclarationId(3054),
->>>>>>> origin/main
+            id: DeclarationId(3081),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3048),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3049),
-=======
-                        ty: DeclarationId(3052),
+                        ty: DeclarationId(3079),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3053),
->>>>>>> origin/main
+                        ty: DeclarationId(3080),
                     },
                 ],
             },
@@ -106420,19 +90680,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
+            span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3051),
-=======
-            id: DeclarationId(3055),
->>>>>>> origin/main
+            id: DeclarationId(3082),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(809),
+                    ty: DeclarationId(115),
                 }],
             },
             type_params: vec![],
@@ -106443,14 +90699,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
+            span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3052),
-=======
-            id: DeclarationId(3056),
->>>>>>> origin/main
+            id: DeclarationId(3083),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -106461,32 +90713,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
+            span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3053),
-=======
-            id: DeclarationId(3057),
->>>>>>> origin/main
+            id: DeclarationId(3084),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3051),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3052),
-=======
-                        ty: DeclarationId(3055),
+                        ty: DeclarationId(3082),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3056),
->>>>>>> origin/main
+                        ty: DeclarationId(3083),
                     },
                 ],
             },
@@ -106498,19 +90738,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
+            span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3054),
-=======
-            id: DeclarationId(3058),
->>>>>>> origin/main
+            id: DeclarationId(3085),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(754),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -106521,14 +90757,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
+            span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3055),
-=======
-            id: DeclarationId(3059),
->>>>>>> origin/main
+            id: DeclarationId(3086),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -106539,32 +90771,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
+            span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3056),
-=======
-            id: DeclarationId(3060),
->>>>>>> origin/main
+            id: DeclarationId(3087),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3054),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3055),
-=======
-                        ty: DeclarationId(3058),
+                        ty: DeclarationId(3085),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3059),
->>>>>>> origin/main
+                        ty: DeclarationId(3086),
                     },
                 ],
             },
@@ -106576,19 +90796,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
+            span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3057),
-=======
-            id: DeclarationId(3061),
->>>>>>> origin/main
+            id: DeclarationId(3088),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(822),
+                    ty: DeclarationId(897),
                 }],
             },
             type_params: vec![],
@@ -106599,14 +90815,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3058),
-=======
-            id: DeclarationId(3062),
->>>>>>> origin/main
+            id: DeclarationId(3089),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -106617,32 +90829,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3059),
-=======
-            id: DeclarationId(3063),
->>>>>>> origin/main
+            id: DeclarationId(3090),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3057),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3058),
-=======
-                        ty: DeclarationId(3061),
+                        ty: DeclarationId(3088),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3062),
->>>>>>> origin/main
+                        ty: DeclarationId(3089),
                     },
                 ],
             },
@@ -106654,19 +90854,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3060),
-=======
-            id: DeclarationId(3064),
->>>>>>> origin/main
+            id: DeclarationId(3091),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(754),
+                    ty: DeclarationId(896),
                 }],
             },
             type_params: vec![],
@@ -106677,14 +90873,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3061),
-=======
-            id: DeclarationId(3065),
->>>>>>> origin/main
+            id: DeclarationId(3092),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -106695,32 +90887,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3062),
-=======
-            id: DeclarationId(3066),
->>>>>>> origin/main
+            id: DeclarationId(3093),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3060),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3061),
-=======
-                        ty: DeclarationId(3064),
+                        ty: DeclarationId(3091),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3065),
->>>>>>> origin/main
+                        ty: DeclarationId(3092),
                     },
                 ],
             },
@@ -106732,19 +90912,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3063),
-=======
-            id: DeclarationId(3067),
->>>>>>> origin/main
+            id: DeclarationId(3094),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(825),
+                    ty: DeclarationId(898),
                 }],
             },
             type_params: vec![],
@@ -106755,14 +90931,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3064),
-=======
-            id: DeclarationId(3068),
->>>>>>> origin/main
+            id: DeclarationId(3095),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -106773,32 +90945,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3065),
-=======
-            id: DeclarationId(3069),
->>>>>>> origin/main
+            id: DeclarationId(3096),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3063),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3064),
-=======
-                        ty: DeclarationId(3067),
+                        ty: DeclarationId(3094),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3068),
->>>>>>> origin/main
+                        ty: DeclarationId(3095),
                     },
                 ],
             },
@@ -106810,19 +90970,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3066),
-=======
-            id: DeclarationId(3070),
->>>>>>> origin/main
+            id: DeclarationId(3097),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(842),
+                    ty: DeclarationId(128),
                 }],
             },
             type_params: vec![],
@@ -106833,14 +90989,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3067),
-=======
-            id: DeclarationId(3071),
->>>>>>> origin/main
+            id: DeclarationId(3098),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -106851,32 +91003,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3068),
-=======
-            id: DeclarationId(3072),
->>>>>>> origin/main
+            id: DeclarationId(3099),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3066),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3067),
-=======
-                        ty: DeclarationId(3070),
+                        ty: DeclarationId(3097),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3071),
->>>>>>> origin/main
+                        ty: DeclarationId(3098),
                     },
                 ],
             },
@@ -106888,19 +91028,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3069),
-=======
-            id: DeclarationId(3073),
->>>>>>> origin/main
+            id: DeclarationId(3100),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(843),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -106911,14 +91047,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3070),
-=======
-            id: DeclarationId(3074),
->>>>>>> origin/main
+            id: DeclarationId(3101),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -106929,32 +91061,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3071),
-=======
-            id: DeclarationId(3075),
->>>>>>> origin/main
+            id: DeclarationId(3102),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3069),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3070),
-=======
-                        ty: DeclarationId(3073),
+                        ty: DeclarationId(3100),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3074),
->>>>>>> origin/main
+                        ty: DeclarationId(3101),
                     },
                 ],
             },
@@ -106966,19 +91086,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3072),
-=======
-            id: DeclarationId(3076),
->>>>>>> origin/main
+            id: DeclarationId(3103),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(93),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -106989,14 +91105,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3073),
-=======
-            id: DeclarationId(3077),
->>>>>>> origin/main
+            id: DeclarationId(3104),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -107007,32 +91119,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3074),
-=======
-            id: DeclarationId(3078),
->>>>>>> origin/main
+            id: DeclarationId(3105),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3072),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3073),
-=======
-                        ty: DeclarationId(3076),
+                        ty: DeclarationId(3103),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3077),
->>>>>>> origin/main
+                        ty: DeclarationId(3104),
                     },
                 ],
             },
@@ -107044,14 +91144,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3075),
-=======
-            id: DeclarationId(3079),
->>>>>>> origin/main
+            id: DeclarationId(3106),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -107067,14 +91163,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3076),
-=======
-            id: DeclarationId(3080),
->>>>>>> origin/main
+            id: DeclarationId(3107),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -107085,32 +91177,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3077),
-=======
-            id: DeclarationId(3081),
->>>>>>> origin/main
+            id: DeclarationId(3108),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3075),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3076),
-=======
-                        ty: DeclarationId(3079),
+                        ty: DeclarationId(3106),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3080),
->>>>>>> origin/main
+                        ty: DeclarationId(3107),
                     },
                 ],
             },
@@ -107122,19 +91202,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3078),
-=======
-            id: DeclarationId(3082),
->>>>>>> origin/main
+            id: DeclarationId(3109),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(115),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -107145,14 +91221,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3079),
-=======
-            id: DeclarationId(3083),
->>>>>>> origin/main
+            id: DeclarationId(3110),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -107163,32 +91235,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3080),
-=======
-            id: DeclarationId(3084),
->>>>>>> origin/main
+            id: DeclarationId(3111),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3078),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3079),
-=======
-                        ty: DeclarationId(3082),
+                        ty: DeclarationId(3109),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3083),
->>>>>>> origin/main
+                        ty: DeclarationId(3110),
                     },
                 ],
             },
@@ -107200,14 +91260,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3081),
-=======
-            id: DeclarationId(3085),
->>>>>>> origin/main
+            id: DeclarationId(3112),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -107223,14 +91279,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3082),
-=======
-            id: DeclarationId(3086),
->>>>>>> origin/main
+            id: DeclarationId(3113),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -107241,32 +91293,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3083),
-=======
-            id: DeclarationId(3087),
->>>>>>> origin/main
+            id: DeclarationId(3114),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3081),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3082),
-=======
-                        ty: DeclarationId(3085),
+                        ty: DeclarationId(3112),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3086),
->>>>>>> origin/main
+                        ty: DeclarationId(3113),
                     },
                 ],
             },
@@ -107278,19 +91318,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3084),
-=======
-            id: DeclarationId(3088),
->>>>>>> origin/main
+            id: DeclarationId(3115),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(897),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -107301,14 +91337,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3085),
-=======
-            id: DeclarationId(3089),
->>>>>>> origin/main
+            id: DeclarationId(3116),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -107319,32 +91351,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3086),
-=======
-            id: DeclarationId(3090),
->>>>>>> origin/main
+            id: DeclarationId(3117),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3084),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3085),
-=======
-                        ty: DeclarationId(3088),
+                        ty: DeclarationId(3115),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3089),
->>>>>>> origin/main
+                        ty: DeclarationId(3116),
                     },
                 ],
             },
@@ -107356,19 +91376,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3087),
-=======
-            id: DeclarationId(3091),
->>>>>>> origin/main
+            id: DeclarationId(3118),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(896),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -107379,14 +91395,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3088),
-=======
-            id: DeclarationId(3092),
->>>>>>> origin/main
+            id: DeclarationId(3119),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -107397,32 +91409,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3089),
-=======
-            id: DeclarationId(3093),
->>>>>>> origin/main
+            id: DeclarationId(3120),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3087),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3088),
-=======
-                        ty: DeclarationId(3091),
+                        ty: DeclarationId(3118),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3092),
->>>>>>> origin/main
+                        ty: DeclarationId(3119),
                     },
                 ],
             },
@@ -107434,19 +91434,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3090),
-=======
-            id: DeclarationId(3094),
->>>>>>> origin/main
+            id: DeclarationId(3121),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(898),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -107457,14 +91453,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3091),
-=======
-            id: DeclarationId(3095),
->>>>>>> origin/main
+            id: DeclarationId(3122),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -107475,32 +91467,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3092),
-=======
-            id: DeclarationId(3096),
->>>>>>> origin/main
+            id: DeclarationId(3123),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3090),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3091),
-=======
-                        ty: DeclarationId(3094),
+                        ty: DeclarationId(3121),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3095),
->>>>>>> origin/main
+                        ty: DeclarationId(3122),
                     },
                 ],
             },
@@ -107512,19 +91492,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3093),
-=======
-            id: DeclarationId(3097),
->>>>>>> origin/main
+            id: DeclarationId(3124),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(128),
+                    ty: DeclarationId(2144),
                 }],
             },
             type_params: vec![],
@@ -107535,11 +91511,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3094),
+            id: DeclarationId(3125),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -107550,20 +91525,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3095),
+            id: DeclarationId(3126),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3093),
+                        ty: DeclarationId(3124),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3094),
+                        ty: DeclarationId(3125),
                     },
                 ],
             },
@@ -107575,15 +91550,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3096),
+            id: DeclarationId(3127),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(130),
                 }],
             },
             type_params: vec![],
@@ -107594,10 +91569,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3097),
+            id: DeclarationId(3128),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -107608,20 +91583,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3098),
+            id: DeclarationId(3129),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3096),
+                        ty: DeclarationId(3127),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3097),
+                        ty: DeclarationId(3128),
                     },
                 ],
             },
@@ -107633,15 +91608,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3099),
-=======
-            id: DeclarationId(3098),
->>>>>>> origin/main
+            id: DeclarationId(3130),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(130),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -107650,24 +91627,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3100),
+            id: DeclarationId(3131),
             name: None,
-=======
-            id: DeclarationId(3099),
+            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/anthropic_schema.dag", 10038, 10043),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(3132),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3097),
+                        ty: DeclarationId(3130),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3098),
+                        ty: DeclarationId(3131),
                     },
                 ],
             },
@@ -107679,15 +91666,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3100),
+            id: DeclarationId(3133),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(130),
                 }],
             },
             type_params: vec![],
@@ -107698,12 +91685,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3101),
+            id: DeclarationId(3134),
             name: None,
->>>>>>> origin/main
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -107713,34 +91699,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3101),
-=======
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3102),
->>>>>>> origin/main
+            id: DeclarationId(3135),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3099),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3100),
-=======
-                        ty: DeclarationId(3100),
+                        ty: DeclarationId(3133),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3101),
+                        ty: DeclarationId(3134),
                     },
                 ],
             },
@@ -107752,15 +91724,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3103),
+            id: DeclarationId(3136),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(93),
                 }],
             },
             type_params: vec![],
@@ -107771,10 +91743,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3104),
+            id: DeclarationId(3137),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -107785,21 +91757,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3105),
+            id: DeclarationId(3138),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3103),
+                        ty: DeclarationId(3136),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3104),
->>>>>>> origin/main
+                        ty: DeclarationId(3137),
                     },
                 ],
             },
@@ -107811,16 +91782,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3102),
+            id: DeclarationId(3139),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(93),
                 }],
             },
             type_params: vec![],
@@ -107831,10 +91801,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3103),
+            id: DeclarationId(3140),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -107845,20 +91815,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3104),
+            id: DeclarationId(3141),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3102),
+                        ty: DeclarationId(3139),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3103),
+                        ty: DeclarationId(3140),
                     },
                 ],
             },
@@ -107870,10 +91840,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3105),
+            id: DeclarationId(3142),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -107889,10 +91859,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3106),
+            id: DeclarationId(3143),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -107903,31 +91873,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3107),
+            id: DeclarationId(3144),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3105),
+                        ty: DeclarationId(3142),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3106),
+                        ty: DeclarationId(3143),
                     },
                 ],
-=======
-            id: DeclarationId(3106),
+            },
+            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/anthropic_schema.dag", 10828, 10835),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(3145),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
                     ty: DeclarationId(230),
                 }],
->>>>>>> origin/main
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -107937,10 +91917,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3108),
+            id: DeclarationId(3146),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -107951,24 +91931,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3109),
-            name: None,
-=======
-            id: DeclarationId(3108),
+            id: DeclarationId(3147),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3106),
+                        ty: DeclarationId(3145),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3107),
+                        ty: DeclarationId(3146),
                     },
                 ],
             },
@@ -107980,15 +91956,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3109),
+            id: DeclarationId(3148),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(130),
                 }],
             },
             type_params: vec![],
@@ -107999,12 +91975,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3110),
+            id: DeclarationId(3149),
             name: None,
->>>>>>> origin/main
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -108014,34 +91989,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3110),
-=======
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3111),
->>>>>>> origin/main
+            id: DeclarationId(3150),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3108),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3109),
-=======
-                        ty: DeclarationId(3109),
+                        ty: DeclarationId(3148),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3110),
+                        ty: DeclarationId(3149),
                     },
                 ],
             },
@@ -108053,15 +92014,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
+            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3112),
+            id: DeclarationId(3151),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(935),
                 }],
             },
             type_params: vec![],
@@ -108072,10 +92033,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
+            span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3113),
+            id: DeclarationId(3152),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -108086,21 +92047,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
+            span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3114),
+            id: DeclarationId(3153),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3112),
+                        ty: DeclarationId(3151),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3113),
->>>>>>> origin/main
+                        ty: DeclarationId(3152),
                     },
                 ],
             },
@@ -108112,16 +92072,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
+            span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3111),
+            id: DeclarationId(3154),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(722),
                 }],
             },
             type_params: vec![],
@@ -108132,10 +92091,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
+            span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3112),
+            id: DeclarationId(3155),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -108146,20 +92105,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
+            span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3113),
+            id: DeclarationId(3156),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3111),
+                        ty: DeclarationId(3154),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3112),
+                        ty: DeclarationId(3155),
                     },
                 ],
             },
@@ -108171,10 +92130,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
+            span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3114),
+            id: DeclarationId(3157),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -108190,10 +92149,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
+            span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3115),
+            id: DeclarationId(3158),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -108204,31 +92163,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
+            span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3116),
+            id: DeclarationId(3159),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3114),
+                        ty: DeclarationId(3157),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3115),
+                        ty: DeclarationId(3158),
                     },
                 ],
-=======
-            id: DeclarationId(3115),
+            },
+            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/computation.dag", 5779, 5786),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(3160),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(93),
                 }],
->>>>>>> origin/main
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -108238,10 +92207,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
+            span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3117),
+            id: DeclarationId(3161),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -108252,24 +92221,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
+            span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3118),
-            name: None,
-=======
-            id: DeclarationId(3117),
+            id: DeclarationId(3162),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3115),
+                        ty: DeclarationId(3160),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3116),
+                        ty: DeclarationId(3161),
                     },
                 ],
             },
@@ -108281,15 +92246,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
+            span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3118),
+            id: DeclarationId(3163),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(946),
                 }],
             },
             type_params: vec![],
@@ -108300,12 +92265,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
+            span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3119),
+            id: DeclarationId(3164),
             name: None,
->>>>>>> origin/main
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -108315,34 +92279,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3119),
-=======
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
+            span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3120),
->>>>>>> origin/main
+            id: DeclarationId(3165),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3117),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3118),
-=======
-                        ty: DeclarationId(3118),
+                        ty: DeclarationId(3163),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3119),
+                        ty: DeclarationId(3164),
                     },
                 ],
             },
@@ -108354,15 +92304,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
+            span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3121),
+            id: DeclarationId(3166),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(946),
                 }],
             },
             type_params: vec![],
@@ -108373,10 +92323,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
+            span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3122),
+            id: DeclarationId(3167),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -108387,21 +92337,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
+            span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3123),
+            id: DeclarationId(3168),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3121),
+                        ty: DeclarationId(3166),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3122),
->>>>>>> origin/main
+                        ty: DeclarationId(3167),
                     },
                 ],
             },
@@ -108413,16 +92362,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
+            span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3120),
+            id: DeclarationId(3169),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2142),
+                    ty: DeclarationId(938),
                 }],
             },
             type_params: vec![],
@@ -108433,10 +92381,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
+            span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3121),
+            id: DeclarationId(3170),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -108447,20 +92395,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
+            span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3122),
+            id: DeclarationId(3171),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3120),
+                        ty: DeclarationId(3169),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3121),
+                        ty: DeclarationId(3170),
                     },
                 ],
             },
@@ -108472,15 +92420,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
+            span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3123),
+            id: DeclarationId(3172),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(130),
+                    ty: DeclarationId(935),
                 }],
             },
             type_params: vec![],
@@ -108491,10 +92439,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
+            span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3124),
+            id: DeclarationId(3173),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -108505,31 +92453,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
+            span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3125),
+            id: DeclarationId(3174),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3123),
+                        ty: DeclarationId(3172),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3124),
+                        ty: DeclarationId(3173),
                     },
                 ],
-=======
-            id: DeclarationId(3124),
+            },
+            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/induction.dag", 20558, 20570),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(3175),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2144),
+                    ty: DeclarationId(940),
                 }],
->>>>>>> origin/main
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -108539,10 +92497,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
+            span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3126),
+            id: DeclarationId(3176),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -108553,24 +92511,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
+            span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3127),
-            name: None,
-=======
-            id: DeclarationId(3126),
+            id: DeclarationId(3177),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3124),
+                        ty: DeclarationId(3175),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3125),
+                        ty: DeclarationId(3176),
                     },
                 ],
             },
@@ -108582,15 +92536,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
+            span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3127),
+            id: DeclarationId(3178),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(130),
+                    ty: DeclarationId(93),
                 }],
             },
             type_params: vec![],
@@ -108601,12 +92555,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
+            span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3128),
+            id: DeclarationId(3179),
             name: None,
->>>>>>> origin/main
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -108616,34 +92569,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3128),
-=======
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
+            span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3129),
->>>>>>> origin/main
+            id: DeclarationId(3180),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3126),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3127),
-=======
-                        ty: DeclarationId(3127),
+                        ty: DeclarationId(3178),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3128),
+                        ty: DeclarationId(3179),
                     },
                 ],
             },
@@ -108655,15 +92594,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
+            span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3130),
+            id: DeclarationId(3181),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(130),
+                    ty: DeclarationId(93),
                 }],
             },
             type_params: vec![],
@@ -108674,10 +92613,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
+            span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3131),
+            id: DeclarationId(3182),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -108688,21 +92627,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
+            span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3132),
+            id: DeclarationId(3183),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3130),
+                        ty: DeclarationId(3181),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3131),
->>>>>>> origin/main
+                        ty: DeclarationId(3182),
                     },
                 ],
             },
@@ -108714,19 +92652,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
+            span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3129),
-=======
-            id: DeclarationId(3133),
->>>>>>> origin/main
+            id: DeclarationId(3184),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(130),
+                    ty: DeclarationId(93),
                 }],
             },
             type_params: vec![],
@@ -108737,11 +92671,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
+            span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3130),
+            id: DeclarationId(3185),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -108752,20 +92685,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
+            span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3131),
+            id: DeclarationId(3186),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3129),
+                        ty: DeclarationId(3184),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3130),
+                        ty: DeclarationId(3185),
                     },
                 ],
             },
@@ -108777,10 +92710,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
+            span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3132),
+            id: DeclarationId(3187),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -108796,10 +92729,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
+            span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3133),
+            id: DeclarationId(3188),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -108810,20 +92743,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
+            span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3134),
+            id: DeclarationId(3189),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3132),
+                        ty: DeclarationId(3187),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3133),
+                        ty: DeclarationId(3188),
                     },
                 ],
             },
@@ -108835,13 +92768,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
+            span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3135),
-=======
-            id: DeclarationId(3134),
->>>>>>> origin/main
+            id: DeclarationId(3190),
+            name: None,
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(93),
+                }],
+            },
+            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/induction.dag", 36895, 36899),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(3191),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -108852,20 +92801,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
+            span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3135),
+            id: DeclarationId(3192),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3133),
+                        ty: DeclarationId(3190),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3134),
+                        ty: DeclarationId(3191),
                     },
                 ],
             },
@@ -108877,10 +92826,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
+            span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3136),
+            id: DeclarationId(3193),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -108896,10 +92845,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
+            span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3137),
+            id: DeclarationId(3194),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -108910,20 +92859,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
+            span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3138),
+            id: DeclarationId(3195),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3136),
+                        ty: DeclarationId(3193),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3137),
+                        ty: DeclarationId(3194),
                     },
                 ],
             },
@@ -108935,15 +92884,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
+            span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3139),
+            id: DeclarationId(3196),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(93),
+                    ty: DeclarationId(1161),
                 }],
             },
             type_params: vec![],
@@ -108954,11 +92903,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3136),
+            id: DeclarationId(3197),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -108969,20 +92917,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3137),
+            id: DeclarationId(3198),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3135),
+                        ty: DeclarationId(3196),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3136),
+                        ty: DeclarationId(3197),
                     },
                 ],
             },
@@ -108994,15 +92942,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3138),
+            id: DeclarationId(3199),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(1154),
                 }],
             },
             type_params: vec![],
@@ -109013,10 +92961,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9931, 9943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3139),
+            id: DeclarationId(3200),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -109027,20 +92975,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9931, 9943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3140),
+            id: DeclarationId(3201),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3138),
+                        ty: DeclarationId(3199),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3139),
+                        ty: DeclarationId(3200),
                     },
                 ],
             },
@@ -109052,13 +93000,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 9931, 9943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3141),
-=======
-            id: DeclarationId(3140),
->>>>>>> origin/main
+            id: DeclarationId(3202),
+            name: None,
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(1161),
+                }],
+            },
+            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", 10408, 10420),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(3203),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -109069,20 +93033,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10408, 10420),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3142),
+            id: DeclarationId(3204),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3139),
+                        ty: DeclarationId(3202),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3140),
+                        ty: DeclarationId(3203),
                     },
                 ],
             },
@@ -109094,15 +93058,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10408, 10420),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3142),
+            id: DeclarationId(3205),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(1154),
                 }],
             },
             type_params: vec![],
@@ -109113,10 +93077,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10966, 10978),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3143),
+            id: DeclarationId(3206),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -109127,20 +93091,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10966, 10978),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3144),
+            id: DeclarationId(3207),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3142),
+                        ty: DeclarationId(3205),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3143),
+                        ty: DeclarationId(3206),
                     },
                 ],
             },
@@ -109152,15 +93116,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10966, 10978),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3145),
+            id: DeclarationId(3208),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(1161),
                 }],
             },
             type_params: vec![],
@@ -109171,10 +93135,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 11146, 11158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3146),
+            id: DeclarationId(3209),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -109185,32 +93149,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 11146, 11158),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3143),
-=======
-            id: DeclarationId(3147),
->>>>>>> origin/main
+            id: DeclarationId(3210),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3141),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3142),
-=======
-                        ty: DeclarationId(3145),
+                        ty: DeclarationId(3208),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3146),
->>>>>>> origin/main
+                        ty: DeclarationId(3209),
                     },
                 ],
             },
@@ -109222,19 +93174,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
+            span: SourceSpan::new("src/v3/std/parse_surface.dag", 11146, 11158),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3144),
-=======
-            id: DeclarationId(3148),
->>>>>>> origin/main
+            id: DeclarationId(3211),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(130),
+                    ty: DeclarationId(1213),
                 }],
             },
             type_params: vec![],
@@ -109245,14 +93193,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3145),
-=======
-            id: DeclarationId(3149),
->>>>>>> origin/main
+            id: DeclarationId(3212),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -109263,32 +93207,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3146),
-=======
-            id: DeclarationId(3150),
->>>>>>> origin/main
+            id: DeclarationId(3213),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3144),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3145),
-=======
-                        ty: DeclarationId(3148),
+                        ty: DeclarationId(3211),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3149),
->>>>>>> origin/main
+                        ty: DeclarationId(3212),
                     },
                 ],
             },
@@ -109300,19 +93232,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3147),
-=======
-            id: DeclarationId(3151),
->>>>>>> origin/main
+            id: DeclarationId(3214),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(935),
+                    ty: DeclarationId(1213),
                 }],
             },
             type_params: vec![],
@@ -109323,14 +93251,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3148),
-=======
-            id: DeclarationId(3152),
->>>>>>> origin/main
+            id: DeclarationId(3215),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -109341,3233 +93265,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3149),
-=======
-            id: DeclarationId(3153),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3147),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3148),
-=======
-                        ty: DeclarationId(3151),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3152),
->>>>>>> origin/main
-                    },
-                ],
-            },
-            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/computation.dag", 2751, 2763),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3150),
-=======
-            id: DeclarationId(3154),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(722),
-                }],
-            },
-            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/computation.dag", 2961, 2968),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3151),
-=======
-            id: DeclarationId(3155),
->>>>>>> origin/main
-            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/computation.dag", 2961, 2968),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3152),
-=======
-            id: DeclarationId(3156),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3150),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3151),
-=======
-                        ty: DeclarationId(3154),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3155),
->>>>>>> origin/main
-                    },
-                ],
-            },
-            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/computation.dag", 2961, 2968),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3153),
-=======
-            id: DeclarationId(3157),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-            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/computation.dag", 5779, 5786),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3154),
-=======
-            id: DeclarationId(3158),
->>>>>>> origin/main
-            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/computation.dag", 5779, 5786),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3155),
-=======
-            id: DeclarationId(3159),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3153),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3154),
-=======
-                        ty: DeclarationId(3157),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3158),
->>>>>>> origin/main
-                    },
-                ],
-            },
-            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/computation.dag", 5779, 5786),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3156),
-=======
-            id: DeclarationId(3160),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(93),
-                }],
-            },
-            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/computation.dag", 6710, 6714),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3157),
-            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/computation.dag", 6710, 6714),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3158),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3156),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3157),
-                    },
-                ],
-            },
-            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/computation.dag", 6710, 6714),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3159),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(946),
-                }],
-            },
-            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/computation.dag", 7761, 7780),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3160),
-            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/computation.dag", 7761, 7780),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3161),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3159),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3160),
-                    },
-                ],
-            },
-            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/computation.dag", 7761, 7780),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3162),
-=======
-            id: DeclarationId(3161),
->>>>>>> origin/main
-            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/computation.dag", 6710, 6714),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3163),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3160),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3161),
-                    },
-                ],
-            },
-            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/computation.dag", 6710, 6714),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3163),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(946),
-                }],
-            },
-            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/computation.dag", 7761, 7780),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3164),
-            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/computation.dag", 7761, 7780),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3165),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3163),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3164),
-                    },
-                ],
-            },
-            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/computation.dag", 7761, 7780),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3166),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(946),
-                }],
-            },
-            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/computation.dag", 8326, 8345),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3167),
-            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/computation.dag", 8326, 8345),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3164),
-=======
-            id: DeclarationId(3168),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3162),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3163),
-=======
-                        ty: DeclarationId(3166),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3167),
->>>>>>> origin/main
-                    },
-                ],
-            },
-            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/computation.dag", 8326, 8345),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3165),
-=======
-            id: DeclarationId(3169),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(938),
-                }],
-            },
-            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/computation.dag", 3859, 3872),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3166),
-=======
-            id: DeclarationId(3170),
->>>>>>> origin/main
-            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/computation.dag", 3859, 3872),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3167),
-=======
-            id: DeclarationId(3171),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3165),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3166),
-=======
-                        ty: DeclarationId(3169),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3170),
->>>>>>> origin/main
-                    },
-                ],
-            },
-            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/computation.dag", 3859, 3872),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3168),
-=======
-            id: DeclarationId(3172),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(935),
-                }],
-            },
-            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/induction.dag", 20558, 20570),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3169),
-=======
-            id: DeclarationId(3173),
->>>>>>> origin/main
-            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/induction.dag", 20558, 20570),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3170),
-=======
-            id: DeclarationId(3174),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3168),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3169),
-=======
-                        ty: DeclarationId(3172),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3173),
->>>>>>> origin/main
-                    },
-                ],
-            },
-            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/induction.dag", 20558, 20570),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3171),
-=======
-            id: DeclarationId(3175),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(940),
-                }],
-            },
-            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/induction.dag", 21943, 21958),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3172),
-            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/induction.dag", 21943, 21958),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3173),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3171),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3172),
-                    },
-                ],
-            },
-            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/induction.dag", 21943, 21958),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3174),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(93),
-                }],
-            },
-            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/induction.dag", 33612, 33616),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3175),
-            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/induction.dag", 33612, 33616),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3176),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3174),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3175),
-                    },
-                ],
-            },
-            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/induction.dag", 33612, 33616),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3177),
-=======
-            id: DeclarationId(3176),
->>>>>>> origin/main
-            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/induction.dag", 21943, 21958),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3178),
-            name: None,
-=======
-            id: DeclarationId(3177),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3175),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3176),
-                    },
-                ],
-            },
-            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/induction.dag", 21943, 21958),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3178),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(93),
-                }],
-            },
-            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/induction.dag", 33612, 33616),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3179),
-            name: None,
->>>>>>> origin/main
-            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,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3179),
-=======
-            span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3180),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3177),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3178),
-=======
-                        ty: DeclarationId(3178),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3179),
-                    },
-                ],
-            },
-            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/induction.dag", 33612, 33616),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3181),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(93),
-                }],
-            },
-            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/induction.dag", 33908, 33912),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3182),
-            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/induction.dag", 33908, 33912),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3183),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3181),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3182),
->>>>>>> origin/main
-                    },
-                ],
-            },
-            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/induction.dag", 33908, 33912),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3180),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(93),
-                }],
-            },
-            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/induction.dag", 35157, 35161),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3181),
-            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/induction.dag", 35157, 35161),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3182),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3180),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3181),
-                    },
-                ],
-            },
-            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/induction.dag", 35157, 35161),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3183),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(93),
-                }],
-            },
-            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/induction.dag", 35632, 35636),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3184),
-            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/induction.dag", 35632, 35636),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3185),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3183),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3184),
-                    },
-                ],
-=======
-            id: DeclarationId(3184),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(93),
-                }],
->>>>>>> origin/main
-            },
-            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/induction.dag", 35157, 35161),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3186),
-            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/induction.dag", 35157, 35161),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3187),
-=======
-            id: DeclarationId(3186),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3184),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3185),
-                    },
-                ],
-            },
-            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/induction.dag", 35157, 35161),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3187),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(93),
-                }],
-            },
-            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/induction.dag", 35632, 35636),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3188),
-            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/induction.dag", 35632, 35636),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3189),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3187),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3188),
-                    },
-                ],
-            },
-            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/induction.dag", 35632, 35636),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3190),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(93),
-                }],
-            },
-            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/induction.dag", 36895, 36899),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3191),
-            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/induction.dag", 36895, 36899),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3192),
->>>>>>> origin/main
-            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/induction.dag", 36895, 36899),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3188),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3186),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3187),
-=======
-                        ty: DeclarationId(3190),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3191),
->>>>>>> origin/main
-                    },
-                ],
-            },
-            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/induction.dag", 36895, 36899),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3189),
-=======
-            id: DeclarationId(3193),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(93),
-                }],
-            },
-            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/induction.dag", 37167, 37171),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3190),
-            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/induction.dag", 37167, 37171),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3191),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3189),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3190),
-                    },
-                ],
-            },
-            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/induction.dag", 37167, 37171),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3192),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1160),
-                }],
-            },
-            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", 1267, 1279),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3193),
-            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/parse_surface.dag", 1267, 1279),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3194),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3192),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3193),
-                    },
-                ],
-            },
-            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", 1267, 1279),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3195),
-=======
-            id: DeclarationId(3194),
->>>>>>> origin/main
-            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/induction.dag", 37167, 37171),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3196),
-            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/parse_surface.dag", 9551, 9563),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3197),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3195),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3196),
-                    },
-                ],
-=======
-            id: DeclarationId(3195),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3193),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3194),
-                    },
-                ],
-            },
-            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/induction.dag", 37167, 37171),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3196),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1161),
-                }],
->>>>>>> origin/main
-            },
-            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", 1267, 1279),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3198),
-            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/parse_surface.dag", 1267, 1279),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3199),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3196),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3197),
-                    },
-                ],
-            },
-            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", 1267, 1279),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3200),
-            name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3198),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3199),
-                    },
-                ],
-=======
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1154),
-                }],
->>>>>>> origin/main
-            },
-            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", 9931, 9943),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3201),
-            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/parse_surface.dag", 9931, 9943),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3202),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3199),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3200),
-                    },
-                ],
-            },
-            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", 9931, 9943),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3203),
-            name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3201),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3202),
-                    },
-                ],
-=======
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1161),
-                }],
->>>>>>> origin/main
-            },
-            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", 10408, 10420),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3204),
-            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/parse_surface.dag", 10408, 10420),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3205),
-            name: None,
-            connective: TypeConnective::Conj { children: vec![] },
-=======
-            id: DeclarationId(3204),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3202),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3203),
-                    },
-                ],
-            },
-            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", 10408, 10420),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3205),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1154),
-                }],
-            },
->>>>>>> origin/main
-            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", 10966, 10978),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3206),
-            name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3204),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3205),
-                    },
-                ],
-            },
-=======
-            connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778),
-=======
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 10966, 10978),
->>>>>>> origin/main
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3207),
-            name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1212),
-                }],
-=======
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3205),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3206),
-                    },
-                ],
->>>>>>> origin/main
-            },
-            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", 10966, 10978),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3208),
-            name: None,
-<<<<<<< HEAD
-=======
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1161),
-                }],
-            },
-            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", 11146, 11158),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3209),
-            name: None,
->>>>>>> origin/main
-            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,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3209),
-=======
-            span: SourceSpan::new("src/v3/std/parse_surface.dag", 11146, 11158),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3210),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3207),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3208),
-=======
-                        ty: DeclarationId(3208),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3209),
-                    },
-                ],
-            },
-            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", 11146, 11158),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3211),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1213),
-                }],
-            },
-            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/termination.dag", 2429, 2445),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3212),
-            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/termination.dag", 2429, 2445),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3213),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3211),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3212),
->>>>>>> origin/main
-                    },
-                ],
-            },
-            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/termination.dag", 2429, 2445),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3210),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1212),
-                }],
-            },
-            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/termination.dag", 2450, 2466),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3211),
-            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/termination.dag", 2450, 2466),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3212),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3210),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3211),
-                    },
-                ],
-            },
-            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/termination.dag", 2450, 2466),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3213),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1212),
-                }],
-            },
-            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/termination.dag", 2471, 2487),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3214),
-            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/termination.dag", 2471, 2487),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3215),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3213),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3214),
-                    },
-                ],
-=======
-            id: DeclarationId(3214),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1213),
-                }],
->>>>>>> origin/main
-            },
-            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/termination.dag", 2450, 2466),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3216),
-            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/termination.dag", 2450, 2466),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3217),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3214),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3215),
-                    },
-                ],
-            },
-            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/termination.dag", 2450, 2466),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3217),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1213),
-                }],
-            },
-            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/termination.dag", 2471, 2487),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3218),
-            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/termination.dag", 2471, 2487),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3219),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3217),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3218),
-                    },
-                ],
-            },
-            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/termination.dag", 2471, 2487),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3220),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1221),
-                }],
-            },
-            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/termination.dag", 6397, 6419),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3221),
-            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/termination.dag", 6397, 6419),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3218),
-=======
-            id: DeclarationId(3222),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3216),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3217),
-=======
-                        ty: DeclarationId(3220),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3221),
->>>>>>> origin/main
-                    },
-                ],
-            },
-            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/termination.dag", 6397, 6419),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3219),
-=======
-            id: DeclarationId(3223),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1223),
-                }],
-            },
-            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/termination.dag", 6839, 6859),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3220),
-=======
-            id: DeclarationId(3224),
->>>>>>> origin/main
-            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/termination.dag", 6839, 6859),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3221),
-=======
-            id: DeclarationId(3225),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3219),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3220),
-=======
-                        ty: DeclarationId(3223),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3224),
->>>>>>> origin/main
-                    },
-                ],
-            },
-            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/termination.dag", 6839, 6859),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3222),
-=======
-            id: DeclarationId(3226),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(806),
-                }],
-            },
-            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/compiler/operators.dag", 142, 155),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3223),
-=======
-            id: DeclarationId(3227),
->>>>>>> origin/main
-            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/compiler/operators.dag", 142, 155),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3224),
-=======
-            id: DeclarationId(3228),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3222),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3223),
-=======
-                        ty: DeclarationId(3226),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3227),
->>>>>>> origin/main
-                    },
-                ],
-            },
-            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/compiler/operators.dag", 142, 155),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3225),
-=======
-            id: DeclarationId(3229),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(160),
-                }],
-            },
-            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("dsl/extdeps/github/github.dag", 1274, 1284),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3226),
-            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("dsl/extdeps/github/github.dag", 1274, 1284),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3227),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3225),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3226),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/github.dag", 1274, 1284),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3228),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-            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("dsl/extdeps/github/github.dag", 1554, 1561),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3229),
-            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("dsl/extdeps/github/github.dag", 1554, 1561),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3230),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3228),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3229),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/github.dag", 1554, 1561),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3231),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1754),
-                }],
-            },
-=======
-            id: DeclarationId(3230),
-            name: None,
-            connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
-            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("dsl/extdeps/github/github.dag", 1274, 1284),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3232),
-            name: None,
-=======
-            id: DeclarationId(3231),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3229),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3230),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/github.dag", 1274, 1284),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3232),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-            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("dsl/extdeps/github/github.dag", 1554, 1561),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3233),
-            name: None,
->>>>>>> origin/main
-            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,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3233),
-=======
-            span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3234),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3231),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3232),
-=======
-                        ty: DeclarationId(3232),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3233),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/github.dag", 1554, 1561),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3235),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1756),
-                }],
-            },
-            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("dsl/extdeps/github/actions.dag", 1558, 1574),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3236),
-            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("dsl/extdeps/github/actions.dag", 1558, 1574),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3237),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3235),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3236),
->>>>>>> origin/main
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/actions.dag", 1558, 1574),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3234),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(2807),
-                }],
-            },
-            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("dsl/extdeps/github/actions.dag", 1690, 1710),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3235),
-            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("dsl/extdeps/github/actions.dag", 1690, 1710),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3236),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3234),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3235),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/actions.dag", 1690, 1710),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3237),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1743),
-                }],
-            },
-            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("dsl/extdeps/github/actions.dag", 1726, 1746),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3238),
-            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("dsl/extdeps/github/actions.dag", 1726, 1746),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3239),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3237),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3238),
-                    },
-                ],
-=======
-            id: DeclarationId(3238),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(2811),
-                }],
->>>>>>> origin/main
-            },
-            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("dsl/extdeps/github/actions.dag", 1690, 1710),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3240),
-            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("dsl/extdeps/github/actions.dag", 1690, 1710),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3241),
-            name: None,
-=======
-            id: DeclarationId(3240),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3238),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3239),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/actions.dag", 1690, 1710),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3241),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1745),
-                }],
-            },
-            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("dsl/extdeps/github/actions.dag", 1726, 1746),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3242),
-            name: None,
->>>>>>> origin/main
-            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,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3242),
-=======
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3243),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3240),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3241),
-=======
-                        ty: DeclarationId(3241),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3242),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/actions.dag", 1726, 1746),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3244),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-            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("dsl/extdeps/github/actions.dag", 2505, 2512),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3245),
-            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("dsl/extdeps/github/actions.dag", 2505, 2512),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3246),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3244),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3245),
->>>>>>> origin/main
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/actions.dag", 2505, 2512),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3243),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-            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("dsl/extdeps/github/actions.dag", 2541, 2548),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3244),
-            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("dsl/extdeps/github/actions.dag", 2541, 2548),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3245),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3243),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3244),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/actions.dag", 2541, 2548),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3246),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-            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("dsl/extdeps/github/actions.dag", 5334, 5341),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3247),
-            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("dsl/extdeps/github/actions.dag", 5334, 5341),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3248),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3246),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3247),
-                    },
-                ],
-=======
-            id: DeclarationId(3247),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
->>>>>>> origin/main
-            },
-            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("dsl/extdeps/github/actions.dag", 2541, 2548),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3249),
-            name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(2841),
-                }],
-            },
-=======
-            connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
-            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("dsl/extdeps/github/actions.dag", 2541, 2548),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3250),
-=======
-            id: DeclarationId(3249),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3247),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3248),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/actions.dag", 2541, 2548),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3250),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-            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("dsl/extdeps/github/actions.dag", 5334, 5341),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3251),
-            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("dsl/extdeps/github/actions.dag", 5334, 5341),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3252),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3250),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3251),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/actions.dag", 5334, 5341),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3253),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(2845),
-                }],
-            },
-            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("dsl/extdeps/github/actions.dag", 5492, 5512),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3254),
-            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("dsl/extdeps/github/actions.dag", 5492, 5512),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3255),
->>>>>>> origin/main
-            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("dsl/extdeps/github/actions.dag", 5492, 5512),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3251),
+            id: DeclarationId(3216),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3249),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3250),
-=======
-                        ty: DeclarationId(3253),
+                        ty: DeclarationId(3214),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3254),
->>>>>>> origin/main
+                        ty: DeclarationId(3215),
                     },
                 ],
             },
@@ -112579,23 +93290,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3252),
-=======
-            id: DeclarationId(3256),
->>>>>>> origin/main
+            id: DeclarationId(3217),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2843),
-=======
-                    ty: DeclarationId(2847),
->>>>>>> origin/main
+                    ty: DeclarationId(1213),
                 }],
             },
             type_params: vec![],
@@ -112606,14 +93309,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3253),
-=======
-            id: DeclarationId(3257),
->>>>>>> origin/main
+            id: DeclarationId(3218),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -112624,32 +93323,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3254),
-=======
-            id: DeclarationId(3258),
->>>>>>> origin/main
+            id: DeclarationId(3219),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3252),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3253),
-=======
-                        ty: DeclarationId(3256),
+                        ty: DeclarationId(3217),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3257),
->>>>>>> origin/main
+                        ty: DeclarationId(3218),
                     },
                 ],
             },
@@ -112661,19 +93348,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3255),
-=======
-            id: DeclarationId(3259),
->>>>>>> origin/main
+            id: DeclarationId(3220),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(1221),
                 }],
             },
             type_params: vec![],
@@ -112684,15 +93367,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
+            span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3256),
-            name: None,
-            connective: TypeConnective::Conj { children: vec![] },
-=======
-            id: DeclarationId(3260),
+            id: DeclarationId(3221),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -112703,46 +93381,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3261),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3259),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3260),
-                    },
-                ],
-            },
->>>>>>> origin/main
-            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("dsl/extdeps/github/actions.dag", 5652, 5659),
+            span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3262),
+            id: DeclarationId(3222),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3255),
+                        ty: DeclarationId(3220),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3256),
+                        ty: DeclarationId(3221),
                     },
                 ],
             },
@@ -112754,19 +93406,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
+            span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3258),
+            id: DeclarationId(3223),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1773),
-=======
-                    ty: DeclarationId(1775),
->>>>>>> origin/main
+                    ty: DeclarationId(1223),
                 }],
             },
             type_params: vec![],
@@ -112777,14 +93425,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
+            span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3259),
-=======
-            id: DeclarationId(3263),
->>>>>>> origin/main
+            id: DeclarationId(3224),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -112795,32 +93439,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
+            span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3260),
-=======
-            id: DeclarationId(3264),
->>>>>>> origin/main
+            id: DeclarationId(3225),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3258),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3259),
-=======
-                        ty: DeclarationId(3262),
+                        ty: DeclarationId(3223),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3263),
->>>>>>> origin/main
+                        ty: DeclarationId(3224),
                     },
                 ],
             },
@@ -112832,19 +93464,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
+            span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3261),
-=======
-            id: DeclarationId(3265),
->>>>>>> origin/main
+            id: DeclarationId(3226),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(93),
+                    ty: DeclarationId(806),
                 }],
             },
             type_params: vec![],
@@ -112855,11 +93483,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
+            span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3262),
+            id: DeclarationId(3227),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -112870,20 +93497,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
+            span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3263),
+            id: DeclarationId(3228),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3261),
+                        ty: DeclarationId(3226),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3262),
+                        ty: DeclarationId(3227),
                     },
                 ],
             },
@@ -112895,15 +93522,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
+            span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3264),
+            id: DeclarationId(3229),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1754),
+                    ty: DeclarationId(160),
                 }],
             },
             type_params: vec![],
@@ -112914,10 +93541,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
+            span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3265),
+            id: DeclarationId(3230),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -112928,20 +93555,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
+            span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3266),
+            id: DeclarationId(3231),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3264),
+                        ty: DeclarationId(3229),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3265),
+                        ty: DeclarationId(3230),
                     },
                 ],
             },
@@ -112953,15 +93580,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
+            span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3267),
+            id: DeclarationId(3232),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1753),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -112972,52 +93599,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3268),
-            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("dsl/extdeps/github/actions.dag", 8418, 8447),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3269),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3267),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3268),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/actions.dag", 8418, 8447),
+            span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3270),
-=======
-            id: DeclarationId(3266),
->>>>>>> origin/main
+            id: DeclarationId(3233),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -113028,22 +93613,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-=======
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
+            span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3267),
+            id: DeclarationId(3234),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3265),
+                        ty: DeclarationId(3232),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3266),
+                        ty: DeclarationId(3233),
                     },
                 ],
             },
@@ -113055,10 +93638,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
+            span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3268),
+            id: DeclarationId(3235),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -113074,10 +93657,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3269),
+            id: DeclarationId(3236),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -113088,20 +93671,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3270),
+            id: DeclarationId(3237),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3268),
+                        ty: DeclarationId(3235),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3269),
+                        ty: DeclarationId(3236),
                     },
                 ],
             },
@@ -113113,15 +93696,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3271),
+            id: DeclarationId(3238),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1755),
+                    ty: DeclarationId(2811),
                 }],
             },
             type_params: vec![],
@@ -113132,10 +93715,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3272),
+            id: DeclarationId(3239),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -113146,20 +93729,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3273),
+            id: DeclarationId(3240),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3271),
+                        ty: DeclarationId(3238),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3272),
+                        ty: DeclarationId(3239),
                     },
                 ],
             },
@@ -113171,15 +93754,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3274),
+            id: DeclarationId(3241),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1754),
+                    ty: DeclarationId(1745),
                 }],
             },
             type_params: vec![],
@@ -113190,42 +93773,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3275),
-            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,
->>>>>>> origin/main
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3276),
+            id: DeclarationId(3242),
             name: None,
-<<<<<<< HEAD
             connective: TypeConnective::Conj { children: vec![] },
-=======
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3274),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3275),
-                    },
-                ],
-            },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -113234,20 +93787,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3277),
+            id: DeclarationId(3243),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3270),
+                        ty: DeclarationId(3241),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3271),
+                        ty: DeclarationId(3242),
                     },
                 ],
             },
@@ -113259,15 +93812,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3273),
+            id: DeclarationId(3244),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(129),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -113278,11 +93831,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3274),
+            id: DeclarationId(3245),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -113293,20 +93845,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3275),
+            id: DeclarationId(3246),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3273),
+                        ty: DeclarationId(3244),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3274),
+                        ty: DeclarationId(3245),
                     },
                 ],
             },
@@ -113318,10 +93870,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3276),
+            id: DeclarationId(3247),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -113337,52 +93889,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3277),
-            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("dsl/extdeps/github/actions.dag", 10532, 10539),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3278),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3276),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3277),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/actions.dag", 10532, 10539),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3279),
-=======
-            id: DeclarationId(3278),
->>>>>>> origin/main
+            id: DeclarationId(3248),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -113393,24 +93903,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3280),
-            name: None,
-=======
-            id: DeclarationId(3279),
+            id: DeclarationId(3249),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3277),
+                        ty: DeclarationId(3247),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3278),
+                        ty: DeclarationId(3248),
                     },
                 ],
             },
@@ -113422,10 +93928,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3280),
+            id: DeclarationId(3250),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -113441,12 +93947,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3281),
+            id: DeclarationId(3251),
             name: None,
->>>>>>> origin/main
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -113456,34 +93961,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3281),
-=======
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3282),
->>>>>>> origin/main
+            id: DeclarationId(3252),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3279),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3280),
-=======
-                        ty: DeclarationId(3280),
+                        ty: DeclarationId(3250),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3281),
+                        ty: DeclarationId(3251),
                     },
                 ],
             },
@@ -113495,15 +93986,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3283),
+            id: DeclarationId(3253),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(2845),
                 }],
             },
             type_params: vec![],
@@ -113514,10 +94005,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3284),
+            id: DeclarationId(3254),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -113528,21 +94019,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3285),
+            id: DeclarationId(3255),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3283),
+                        ty: DeclarationId(3253),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3284),
->>>>>>> origin/main
+                        ty: DeclarationId(3254),
                     },
                 ],
             },
@@ -113554,16 +94044,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3282),
+            id: DeclarationId(3256),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2871),
+                    ty: DeclarationId(2847),
                 }],
             },
             type_params: vec![],
@@ -113574,10 +94063,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3283),
+            id: DeclarationId(3257),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -113588,20 +94077,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3284),
+            id: DeclarationId(3258),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3282),
+                        ty: DeclarationId(3256),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3283),
+                        ty: DeclarationId(3257),
                     },
                 ],
             },
@@ -113613,10 +94102,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3285),
+            id: DeclarationId(3259),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -113632,10 +94121,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3286),
+            id: DeclarationId(3260),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -113646,31 +94135,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3287),
+            id: DeclarationId(3261),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3285),
+                        ty: DeclarationId(3259),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3286),
+                        ty: DeclarationId(3260),
                     },
                 ],
-=======
-            id: DeclarationId(3286),
+            },
+            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("dsl/extdeps/github/actions.dag", 5652, 5659),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(3262),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2875),
+                    ty: DeclarationId(1775),
                 }],
->>>>>>> origin/main
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -113680,10 +94179,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3288),
+            id: DeclarationId(3263),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -113694,24 +94193,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3289),
-            name: None,
-=======
-            id: DeclarationId(3288),
+            id: DeclarationId(3264),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3286),
+                        ty: DeclarationId(3262),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3287),
+                        ty: DeclarationId(3263),
                     },
                 ],
             },
@@ -113723,15 +94218,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3289),
+            id: DeclarationId(3265),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(93),
                 }],
             },
             type_params: vec![],
@@ -113742,12 +94237,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3290),
+            id: DeclarationId(3266),
             name: None,
->>>>>>> origin/main
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -113757,34 +94251,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3290),
-=======
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3291),
->>>>>>> origin/main
+            id: DeclarationId(3267),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3288),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3289),
-=======
-                        ty: DeclarationId(3289),
+                        ty: DeclarationId(3265),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3290),
+                        ty: DeclarationId(3266),
                     },
                 ],
             },
@@ -113796,15 +94276,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3292),
+            id: DeclarationId(3268),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(1756),
                 }],
             },
             type_params: vec![],
@@ -113815,10 +94295,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3293),
+            id: DeclarationId(3269),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -113829,21 +94309,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3294),
+            id: DeclarationId(3270),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3292),
+                        ty: DeclarationId(3268),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3293),
->>>>>>> origin/main
+                        ty: DeclarationId(3269),
                     },
                 ],
             },
@@ -113855,19 +94334,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3291),
-=======
-            id: DeclarationId(3295),
->>>>>>> origin/main
+            id: DeclarationId(3271),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(93),
+                    ty: DeclarationId(1755),
                 }],
             },
             type_params: vec![],
@@ -113878,11 +94353,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3292),
+            id: DeclarationId(3272),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -113893,20 +94367,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3293),
+            id: DeclarationId(3273),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3291),
+                        ty: DeclarationId(3271),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3292),
+                        ty: DeclarationId(3272),
                     },
                 ],
             },
@@ -113918,15 +94392,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3294),
+            id: DeclarationId(3274),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(1754),
                 }],
             },
             type_params: vec![],
@@ -113937,10 +94411,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3295),
+            id: DeclarationId(3275),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -113951,20 +94425,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3296),
+            id: DeclarationId(3276),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3294),
+                        ty: DeclarationId(3274),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3295),
+                        ty: DeclarationId(3275),
                     },
                 ],
             },
@@ -113976,15 +94450,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3297),
-=======
-            id: DeclarationId(3296),
->>>>>>> origin/main
+            id: DeclarationId(3277),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(129),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -113993,24 +94469,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3298),
+            id: DeclarationId(3278),
             name: None,
-=======
-            id: DeclarationId(3297),
+            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("dsl/extdeps/github/actions.dag", 8834, 8839),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(3279),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3295),
+                        ty: DeclarationId(3277),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3296),
+                        ty: DeclarationId(3278),
                     },
                 ],
             },
@@ -114022,10 +94508,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3298),
+            id: DeclarationId(3280),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -114041,12 +94527,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3299),
+            id: DeclarationId(3281),
             name: None,
->>>>>>> origin/main
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -114056,34 +94541,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3299),
-=======
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3300),
->>>>>>> origin/main
+            id: DeclarationId(3282),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3297),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3298),
-=======
-                        ty: DeclarationId(3298),
+                        ty: DeclarationId(3280),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3299),
+                        ty: DeclarationId(3281),
                     },
                 ],
             },
@@ -114095,10 +94566,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3301),
+            id: DeclarationId(3283),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -114114,10 +94585,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3302),
+            id: DeclarationId(3284),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -114128,21 +94599,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3303),
+            id: DeclarationId(3285),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3301),
+                        ty: DeclarationId(3283),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3302),
->>>>>>> origin/main
+                        ty: DeclarationId(3284),
                     },
                 ],
             },
@@ -114154,16 +94624,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3300),
+            id: DeclarationId(3286),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2879),
+                    ty: DeclarationId(2875),
                 }],
             },
             type_params: vec![],
@@ -114174,10 +94643,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3301),
+            id: DeclarationId(3287),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -114188,20 +94657,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3302),
+            id: DeclarationId(3288),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3300),
+                        ty: DeclarationId(3286),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3301),
+                        ty: DeclarationId(3287),
                     },
                 ],
             },
@@ -114213,15 +94682,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3303),
+            id: DeclarationId(3289),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2881),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -114232,10 +94701,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10996),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3304),
+            id: DeclarationId(3290),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -114246,31 +94715,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10996),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3305),
+            id: DeclarationId(3291),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3303),
+                        ty: DeclarationId(3289),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3304),
+                        ty: DeclarationId(3290),
                     },
                 ],
-=======
-            id: DeclarationId(3304),
+            },
+            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("dsl/extdeps/github/actions.dag", 10661, 10668),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(3292),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2883),
+                    ty: DeclarationId(230),
                 }],
->>>>>>> origin/main
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -114280,10 +94759,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3306),
+            id: DeclarationId(3293),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -114294,24 +94773,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3307),
-            name: None,
-=======
-            id: DeclarationId(3306),
+            id: DeclarationId(3294),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3304),
+                        ty: DeclarationId(3292),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3305),
+                        ty: DeclarationId(3293),
                     },
                 ],
             },
@@ -114323,15 +94798,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3307),
+            id: DeclarationId(3295),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2885),
+                    ty: DeclarationId(93),
                 }],
             },
             type_params: vec![],
@@ -114342,12 +94817,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10996),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3308),
+            id: DeclarationId(3296),
             name: None,
->>>>>>> origin/main
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -114357,34 +94831,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3308),
-=======
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10996),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3309),
->>>>>>> origin/main
+            id: DeclarationId(3297),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3306),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3307),
-=======
-                        ty: DeclarationId(3307),
+                        ty: DeclarationId(3295),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3308),
+                        ty: DeclarationId(3296),
                     },
                 ],
             },
@@ -114396,10 +94856,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10996),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3310),
+            id: DeclarationId(3298),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -114415,10 +94875,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3311),
+            id: DeclarationId(3299),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -114429,21 +94889,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3312),
+            id: DeclarationId(3300),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3310),
+                        ty: DeclarationId(3298),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3311),
->>>>>>> origin/main
+                        ty: DeclarationId(3299),
                     },
                 ],
             },
@@ -114455,19 +94914,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3309),
-=======
-            id: DeclarationId(3313),
->>>>>>> origin/main
+            id: DeclarationId(3301),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(93),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -114478,11 +94933,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3310),
+            id: DeclarationId(3302),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -114493,20 +94947,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3311),
+            id: DeclarationId(3303),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3309),
+                        ty: DeclarationId(3301),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3310),
+                        ty: DeclarationId(3302),
                     },
                 ],
             },
@@ -114518,15 +94972,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3312),
+            id: DeclarationId(3304),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(2883),
                 }],
             },
             type_params: vec![],
@@ -114537,10 +94991,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3313),
+            id: DeclarationId(3305),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -114551,20 +95005,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3314),
+            id: DeclarationId(3306),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3312),
+                        ty: DeclarationId(3304),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3313),
+                        ty: DeclarationId(3305),
                     },
                 ],
             },
@@ -114576,15 +95030,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3315),
-=======
-            id: DeclarationId(3314),
->>>>>>> origin/main
+            id: DeclarationId(3307),
             name: None,
-            connective: TypeConnective::Conj { children: vec![] },
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(2885),
+                }],
+            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -114593,24 +95049,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10996),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3316),
+            id: DeclarationId(3308),
             name: None,
-=======
-            id: DeclarationId(3315),
+            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("dsl/extdeps/github/actions.dag", 10976, 10996),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(3309),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3313),
+                        ty: DeclarationId(3307),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3314),
+                        ty: DeclarationId(3308),
                     },
                 ],
             },
@@ -114622,10 +95088,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10996),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3316),
+            id: DeclarationId(3310),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -114641,12 +95107,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3317),
+            id: DeclarationId(3311),
             name: None,
->>>>>>> origin/main
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -114656,34 +95121,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3317),
-=======
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3318),
->>>>>>> origin/main
+            id: DeclarationId(3312),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3315),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3316),
-=======
-                        ty: DeclarationId(3316),
+                        ty: DeclarationId(3310),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3317),
+                        ty: DeclarationId(3311),
                     },
                 ],
             },
@@ -114695,10 +95146,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3319),
+            id: DeclarationId(3313),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -114714,10 +95165,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3320),
+            id: DeclarationId(3314),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -114728,21 +95179,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3321),
+            id: DeclarationId(3315),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3319),
+                        ty: DeclarationId(3313),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3320),
->>>>>>> origin/main
+                        ty: DeclarationId(3314),
                     },
                 ],
             },
@@ -114754,19 +95204,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3318),
-=======
-            id: DeclarationId(3322),
->>>>>>> origin/main
+            id: DeclarationId(3316),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(93),
+                    ty: DeclarationId(230),
                 }],
             },
             type_params: vec![],
@@ -114777,11 +95223,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11530, 11534),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3319),
+            id: DeclarationId(3317),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -114792,20 +95237,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11530, 11534),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3320),
+            id: DeclarationId(3318),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3318),
+                        ty: DeclarationId(3316),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3319),
+                        ty: DeclarationId(3317),
                     },
                 ],
             },
@@ -114817,15 +95262,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11530, 11534),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3321),
+            id: DeclarationId(3319),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(230),
+                    ty: DeclarationId(93),
                 }],
             },
             type_params: vec![],
@@ -114836,10 +95281,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11584, 11591),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3322),
+            id: DeclarationId(3320),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -114850,20 +95295,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11584, 11591),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3323),
+            id: DeclarationId(3321),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3321),
+                        ty: DeclarationId(3319),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3322),
+                        ty: DeclarationId(3320),
                     },
                 ],
             },
@@ -114875,13 +95320,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11584, 11591),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(3322),
+            name: None,
+            connective: TypeConnective::Conj {
+                children: vec![Field {
+                    label: "_0".to_string(),
+                    ty: DeclarationId(93),
+                }],
+            },
+            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("dsl/extdeps/github/actions.dag", 11530, 11534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3324),
-=======
             id: DeclarationId(3323),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -114895,10 +95356,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11530, 11534),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3325),
-            name: None,
-=======
             id: DeclarationId(3324),
             name: None,
             connective: TypeConnective::Disj {
@@ -114945,7 +95402,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         declarations.push(Declaration {
             id: DeclarationId(3326),
             name: None,
->>>>>>> origin/main
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -114955,29 +95411,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3326),
-=======
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11584, 11591),
         });
         declarations.push(Declaration {
             id: DeclarationId(3327),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3324),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3325),
-=======
                         ty: DeclarationId(3325),
                     },
                     Field {
@@ -115041,7 +95483,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(3329),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -115056,11 +95497,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3327),
-=======
             id: DeclarationId(3331),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -115079,108 +95516,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11610, 11614),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3328),
-            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("dsl/extdeps/github/actions.dag", 11610, 11614),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3329),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3327),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3328),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/actions.dag", 11610, 11614),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3330),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-            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("dsl/extdeps/github/actions.dag", 11663, 11670),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3331),
-            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("dsl/extdeps/github/actions.dag", 11663, 11670),
-        });
-        declarations.push(Declaration {
             id: DeclarationId(3332),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3330),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3331),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/actions.dag", 11663, 11670),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3333),
-=======
-            id: DeclarationId(3332),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -115194,10 +95530,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11610, 11614),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3334),
-            name: None,
-=======
             id: DeclarationId(3333),
             name: None,
             connective: TypeConnective::Disj {
@@ -115244,7 +95576,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         declarations.push(Declaration {
             id: DeclarationId(3335),
             name: None,
->>>>>>> origin/main
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -115254,29 +95585,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11678, 11682),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3335),
-=======
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11663, 11670),
         });
         declarations.push(Declaration {
             id: DeclarationId(3336),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3333),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3334),
-=======
                         ty: DeclarationId(3334),
                     },
                     Field {
@@ -115340,7 +95657,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(3338),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -115355,112 +95671,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11678, 11682),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3336),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(93),
-                }],
-            },
-            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("dsl/extdeps/github/actions.dag", 11689, 11693),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3337),
-            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("dsl/extdeps/github/actions.dag", 11689, 11693),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3338),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3336),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3337),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/actions.dag", 11689, 11693),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3339),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(93),
-                }],
-            },
-            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("dsl/extdeps/github/actions.dag", 12673, 12677),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3340),
-            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("dsl/extdeps/github/actions.dag", 12673, 12677),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(3341),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(3339),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3340),
-                    },
-                ],
-=======
             id: DeclarationId(3340),
             name: None,
             connective: TypeConnective::Conj {
@@ -115468,7 +95678,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     label: "_0".to_string(),
                     ty: DeclarationId(93),
                 }],
->>>>>>> origin/main
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -115481,7 +95690,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11689, 11693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3342),
+            id: DeclarationId(3341),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -115597,11 +95806,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12756, 12763),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3343),
-=======
             id: DeclarationId(3347),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -115615,29 +95820,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12756, 12763),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3344),
-=======
             id: DeclarationId(3348),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3342),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3343),
-=======
                         ty: DeclarationId(3346),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(3347),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -115652,11 +95845,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12756, 12763),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3345),
-=======
             id: DeclarationId(3349),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -115675,11 +95864,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13403, 13407),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3346),
-=======
             id: DeclarationId(3350),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -115693,29 +95878,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13403, 13407),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(3347),
-=======
             id: DeclarationId(3351),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(3345),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(3346),
-=======
                         ty: DeclarationId(3349),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(3350),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -117252,11 +97425,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(189),
             Port {
                 id: PortId(189),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2010))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2012))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(184)),
             },
         );
@@ -117280,11 +97449,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(192),
             Port {
                 id: PortId(192),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2011))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2013))),
->>>>>>> origin/main
                 produced_by: None,
             },
         );
@@ -117292,11 +97457,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(193),
             Port {
                 id: PortId(193),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2012))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2014))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(186)),
             },
         );
@@ -117584,11 +97745,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(229),
             Port {
                 id: PortId(229),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2013))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2015))),
->>>>>>> origin/main
                 produced_by: None,
             },
         );
@@ -119140,11 +99297,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(423),
             Port {
                 id: PortId(423),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2014))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2016))),
->>>>>>> origin/main
                 produced_by: None,
             },
         );
@@ -119168,11 +99321,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(426),
             Port {
                 id: PortId(426),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2011))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2013))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(363)),
             },
         );
@@ -119188,11 +99337,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(428),
             Port {
                 id: PortId(428),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2015))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2017))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(365)),
             },
         );
@@ -119200,11 +99345,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(429),
             Port {
                 id: PortId(429),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2016))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2018))),
->>>>>>> origin/main
                 produced_by: None,
             },
         );
@@ -119308,11 +99449,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(442),
             Port {
                 id: PortId(442),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2017))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2019))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(378)),
             },
         );
@@ -119320,11 +99457,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(443),
             Port {
                 id: PortId(443),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2018))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2020))),
->>>>>>> origin/main
                 produced_by: None,
             },
         );
@@ -119372,11 +99505,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(449),
             Port {
                 id: PortId(449),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2019))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2021))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(385)),
             },
         );
@@ -119384,11 +99513,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(450),
             Port {
                 id: PortId(450),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2020))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2022))),
->>>>>>> origin/main
                 produced_by: None,
             },
         );
@@ -119468,11 +99593,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(460),
             Port {
                 id: PortId(460),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2021))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2023))),
->>>>>>> origin/main
                 produced_by: None,
             },
         );
@@ -119576,11 +99697,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(473),
             Port {
                 id: PortId(473),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2022))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2024))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(407)),
             },
         );
@@ -119860,11 +99977,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(508),
             Port {
                 id: PortId(508),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2023))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2025))),
->>>>>>> origin/main
                 produced_by: None,
             },
         );
@@ -119976,11 +100089,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(522),
             Port {
                 id: PortId(522),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2024))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2026))),
->>>>>>> origin/main
                 produced_by: None,
             },
         );
@@ -120092,11 +100201,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(536),
             Port {
                 id: PortId(536),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2025))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2027))),
->>>>>>> origin/main
                 produced_by: None,
             },
         );
@@ -120712,11 +100817,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(613),
             Port {
                 id: PortId(613),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2026))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2028))),
->>>>>>> origin/main
                 produced_by: None,
             },
         );
@@ -120828,11 +100929,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(627),
             Port {
                 id: PortId(627),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2027))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2029))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(516)),
             },
         );
@@ -120840,11 +100937,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(628),
             Port {
                 id: PortId(628),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2028))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2030))),
->>>>>>> origin/main
                 produced_by: None,
             },
         );
@@ -120900,11 +100993,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(635),
             Port {
                 id: PortId(635),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2029))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2031))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(523)),
             },
         );
@@ -120912,11 +101001,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(636),
             Port {
                 id: PortId(636),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2030))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2032))),
->>>>>>> origin/main
                 produced_by: None,
             },
         );
@@ -120932,11 +101017,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(638),
             Port {
                 id: PortId(638),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2031))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2033))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(526)),
             },
         );
@@ -121200,11 +101281,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(671),
             Port {
                 id: PortId(671),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2364))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2366))),
->>>>>>> origin/main
                 produced_by: None,
             },
         );
@@ -121636,11 +101713,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(725),
             Port {
                 id: PortId(725),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2508))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2512))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(596)),
             },
         );
@@ -121664,11 +101737,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(728),
             Port {
                 id: PortId(728),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2509))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2513))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(598)),
             },
         );
@@ -121676,11 +101745,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(729),
             Port {
                 id: PortId(729),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2510))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2514))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(600)),
             },
         );
@@ -121688,11 +101753,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(730),
             Port {
                 id: PortId(730),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2511))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2515))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(602)),
             },
         );
@@ -121700,11 +101761,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(731),
             Port {
                 id: PortId(731),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2512))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2516))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(604)),
             },
         );
@@ -121712,11 +101769,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(732),
             Port {
                 id: PortId(732),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2513))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2517))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(606)),
             },
         );
@@ -121724,11 +101777,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(733),
             Port {
                 id: PortId(733),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2514))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2518))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(608)),
             },
         );
@@ -121736,11 +101785,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(734),
             Port {
                 id: PortId(734),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2516))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2520))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(610)),
             },
         );
@@ -121772,11 +101817,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(738),
             Port {
                 id: PortId(738),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2518))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2522))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(614)),
             },
         );
@@ -121800,11 +101841,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(741),
             Port {
                 id: PortId(741),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2519))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2523))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(617)),
             },
         );
@@ -121836,11 +101873,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(745),
             Port {
                 id: PortId(745),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2520))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2524))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(621)),
             },
         );
@@ -121888,11 +101921,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(751),
             Port {
                 id: PortId(751),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2521))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2525))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(626)),
             },
         );
@@ -121964,11 +101993,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(760),
             Port {
                 id: PortId(760),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2522))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2526))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(633)),
             },
         );
@@ -122048,11 +102073,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(770),
             Port {
                 id: PortId(770),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2523))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2527))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(640)),
             },
         );
@@ -122116,11 +102137,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(778),
             Port {
                 id: PortId(778),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2524))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2528))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(645)),
             },
         );
@@ -122136,11 +102153,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(780),
             Port {
                 id: PortId(780),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2525))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2529))),
->>>>>>> origin/main
                 produced_by: None,
             },
         );
@@ -122228,11 +102241,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(791),
             Port {
                 id: PortId(791),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2526))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2530))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(655)),
             },
         );
@@ -122304,11 +102313,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(800),
             Port {
                 id: PortId(800),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2527))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2531))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(663)),
             },
         );
@@ -122732,13 +102737,8 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(853),
             Port {
                 id: PortId(853),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2584))),
-                produced_by: Some(NodeId(713)),
-=======
                 state: PortState::Uninferred,
                 produced_by: Some(NodeId(709)),
->>>>>>> origin/main
             },
         );
         ports.insert(
@@ -122945,13 +102945,8 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(879),
             Port {
                 id: PortId(879),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2000))),
-                produced_by: Some(NodeId(733)),
-=======
                 state: PortState::Uninferred,
                 produced_by: Some(NodeId(730)),
->>>>>>> origin/main
             },
         );
         ports.insert(
@@ -123518,13 +103513,8 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(950),
             Port {
                 id: PortId(950),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2585))),
-                produced_by: Some(NodeId(792)),
-=======
                 state: PortState::Uninferred,
                 produced_by: Some(NodeId(788)),
->>>>>>> origin/main
             },
         );
         ports.insert(
@@ -123715,13 +103705,8 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(974),
             Port {
                 id: PortId(974),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2761))),
-                produced_by: Some(NodeId(812)),
-=======
                 state: PortState::Uninferred,
                 produced_by: None,
->>>>>>> origin/main
             },
         );
         ports.insert(
@@ -124155,147 +104140,6 @@ fn bootstrapped_fixture_dag_clusters() -> Vec<Cluster> {
 fn bootstrapped_fixture_dag_optional_match_disjs() -> HashMap<DeclarationId, DeclarationId> {
     {
         let mut map = HashMap::new();
-<<<<<<< HEAD
-        map.insert(DeclarationId(389), DeclarationId(2933));
-        map.insert(DeclarationId(391), DeclarationId(2936));
-        map.insert(DeclarationId(423), DeclarationId(2939));
-        map.insert(DeclarationId(426), DeclarationId(2942));
-        map.insert(DeclarationId(471), DeclarationId(2945));
-        map.insert(DeclarationId(472), DeclarationId(2948));
-        map.insert(DeclarationId(473), DeclarationId(2951));
-        map.insert(DeclarationId(513), DeclarationId(2954));
-        map.insert(DeclarationId(515), DeclarationId(2957));
-        map.insert(DeclarationId(516), DeclarationId(2960));
-        map.insert(DeclarationId(539), DeclarationId(2963));
-        map.insert(DeclarationId(582), DeclarationId(2966));
-        map.insert(DeclarationId(602), DeclarationId(2969));
-        map.insert(DeclarationId(603), DeclarationId(2972));
-        map.insert(DeclarationId(605), DeclarationId(2975));
-        map.insert(DeclarationId(608), DeclarationId(2978));
-        map.insert(DeclarationId(613), DeclarationId(2981));
-        map.insert(DeclarationId(614), DeclarationId(2984));
-        map.insert(DeclarationId(618), DeclarationId(2987));
-        map.insert(DeclarationId(619), DeclarationId(2990));
-        map.insert(DeclarationId(620), DeclarationId(2993));
-        map.insert(DeclarationId(625), DeclarationId(2996));
-        map.insert(DeclarationId(1821), DeclarationId(2999));
-        map.insert(DeclarationId(1825), DeclarationId(3002));
-        map.insert(DeclarationId(1828), DeclarationId(3005));
-        map.insert(DeclarationId(1830), DeclarationId(3008));
-        map.insert(DeclarationId(1831), DeclarationId(3011));
-        map.insert(DeclarationId(1832), DeclarationId(3014));
-        map.insert(DeclarationId(1886), DeclarationId(3017));
-        map.insert(DeclarationId(1887), DeclarationId(3020));
-        map.insert(DeclarationId(1888), DeclarationId(3023));
-        map.insert(DeclarationId(1889), DeclarationId(3026));
-        map.insert(DeclarationId(1890), DeclarationId(3029));
-        map.insert(DeclarationId(1891), DeclarationId(3032));
-        map.insert(DeclarationId(1897), DeclarationId(3035));
-        map.insert(DeclarationId(1952), DeclarationId(3038));
-        map.insert(DeclarationId(1955), DeclarationId(3041));
-        map.insert(DeclarationId(1956), DeclarationId(3044));
-        map.insert(DeclarationId(1957), DeclarationId(3047));
-        map.insert(DeclarationId(1958), DeclarationId(3050));
-        map.insert(DeclarationId(1981), DeclarationId(3053));
-        map.insert(DeclarationId(1986), DeclarationId(3056));
-        map.insert(DeclarationId(1990), DeclarationId(3059));
-        map.insert(DeclarationId(1993), DeclarationId(3062));
-        map.insert(DeclarationId(1994), DeclarationId(3065));
-        map.insert(DeclarationId(2039), DeclarationId(3068));
-        map.insert(DeclarationId(2040), DeclarationId(3071));
-        map.insert(DeclarationId(2041), DeclarationId(3074));
-        map.insert(DeclarationId(2042), DeclarationId(3077));
-        map.insert(DeclarationId(2092), DeclarationId(3080));
-        map.insert(DeclarationId(2093), DeclarationId(3083));
-        map.insert(DeclarationId(2112), DeclarationId(3086));
-        map.insert(DeclarationId(2113), DeclarationId(3089));
-        map.insert(DeclarationId(2117), DeclarationId(3092));
-        map.insert(DeclarationId(2118), DeclarationId(3095));
-        map.insert(DeclarationId(2129), DeclarationId(3098));
-        map.insert(DeclarationId(2130), DeclarationId(3101));
-        map.insert(DeclarationId(2132), DeclarationId(3104));
-        map.insert(DeclarationId(2133), DeclarationId(3107));
-        map.insert(DeclarationId(2135), DeclarationId(3110));
-        map.insert(DeclarationId(2136), DeclarationId(3113));
-        map.insert(DeclarationId(2138), DeclarationId(3116));
-        map.insert(DeclarationId(2140), DeclarationId(3119));
-        map.insert(DeclarationId(2143), DeclarationId(3122));
-        map.insert(DeclarationId(2147), DeclarationId(3125));
-        map.insert(DeclarationId(2149), DeclarationId(3128));
-        map.insert(DeclarationId(2151), DeclarationId(3131));
-        map.insert(DeclarationId(2161), DeclarationId(3134));
-        map.insert(DeclarationId(2162), DeclarationId(3137));
-        map.insert(DeclarationId(2163), DeclarationId(3140));
-        map.insert(DeclarationId(2166), DeclarationId(3143));
-        map.insert(DeclarationId(2167), DeclarationId(3146));
-        map.insert(DeclarationId(2202), DeclarationId(3149));
-        map.insert(DeclarationId(2203), DeclarationId(3152));
-        map.insert(DeclarationId(2204), DeclarationId(3155));
-        map.insert(DeclarationId(2205), DeclarationId(3158));
-        map.insert(DeclarationId(2206), DeclarationId(3161));
-        map.insert(DeclarationId(2207), DeclarationId(3164));
-        map.insert(DeclarationId(2230), DeclarationId(3167));
-        map.insert(DeclarationId(2360), DeclarationId(3170));
-        map.insert(DeclarationId(2361), DeclarationId(3173));
-        map.insert(DeclarationId(2367), DeclarationId(3176));
-        map.insert(DeclarationId(2368), DeclarationId(3179));
-        map.insert(DeclarationId(2369), DeclarationId(3182));
-        map.insert(DeclarationId(2370), DeclarationId(3185));
-        map.insert(DeclarationId(2371), DeclarationId(3188));
-        map.insert(DeclarationId(2372), DeclarationId(3191));
-        map.insert(DeclarationId(2422), DeclarationId(3194));
-        map.insert(DeclarationId(2466), DeclarationId(3197));
-        map.insert(DeclarationId(2474), DeclarationId(3200));
-        map.insert(DeclarationId(2488), DeclarationId(3203));
-        map.insert(DeclarationId(2491), DeclarationId(3206));
-        map.insert(DeclarationId(2549), DeclarationId(3209));
-        map.insert(DeclarationId(2550), DeclarationId(3212));
-        map.insert(DeclarationId(2551), DeclarationId(3215));
-        map.insert(DeclarationId(2554), DeclarationId(3218));
-        map.insert(DeclarationId(2555), DeclarationId(3221));
-        map.insert(DeclarationId(2765), DeclarationId(3224));
-        map.insert(DeclarationId(2794), DeclarationId(3227));
-        map.insert(DeclarationId(2800), DeclarationId(3230));
-        map.insert(DeclarationId(2805), DeclarationId(3233));
-        map.insert(DeclarationId(2808), DeclarationId(3236));
-        map.insert(DeclarationId(2809), DeclarationId(3239));
-        map.insert(DeclarationId(2829), DeclarationId(3242));
-        map.insert(DeclarationId(2830), DeclarationId(3245));
-        map.insert(DeclarationId(2838), DeclarationId(3248));
-        map.insert(DeclarationId(2842), DeclarationId(3251));
-        map.insert(DeclarationId(2844), DeclarationId(3254));
-        map.insert(DeclarationId(2845), DeclarationId(3257));
-        map.insert(DeclarationId(2846), DeclarationId(3260));
-        map.insert(DeclarationId(2847), DeclarationId(3263));
-        map.insert(DeclarationId(2848), DeclarationId(3266));
-        map.insert(DeclarationId(2854), DeclarationId(3269));
-        map.insert(DeclarationId(2856), DeclarationId(3272));
-        map.insert(DeclarationId(2857), DeclarationId(3275));
-        map.insert(DeclarationId(2869), DeclarationId(3278));
-        map.insert(DeclarationId(2870), DeclarationId(3281));
-        map.insert(DeclarationId(2872), DeclarationId(3284));
-        map.insert(DeclarationId(2873), DeclarationId(3287));
-        map.insert(DeclarationId(2874), DeclarationId(3290));
-        map.insert(DeclarationId(2875), DeclarationId(3293));
-        map.insert(DeclarationId(2877), DeclarationId(3296));
-        map.insert(DeclarationId(2878), DeclarationId(3299));
-        map.insert(DeclarationId(2880), DeclarationId(3302));
-        map.insert(DeclarationId(2882), DeclarationId(3305));
-        map.insert(DeclarationId(2883), DeclarationId(3308));
-        map.insert(DeclarationId(2884), DeclarationId(3311));
-        map.insert(DeclarationId(2891), DeclarationId(3314));
-        map.insert(DeclarationId(2892), DeclarationId(3317));
-        map.insert(DeclarationId(2893), DeclarationId(3320));
-        map.insert(DeclarationId(2895), DeclarationId(3323));
-        map.insert(DeclarationId(2896), DeclarationId(3326));
-        map.insert(DeclarationId(2897), DeclarationId(3329));
-        map.insert(DeclarationId(2899), DeclarationId(3332));
-        map.insert(DeclarationId(2900), DeclarationId(3335));
-        map.insert(DeclarationId(2901), DeclarationId(3338));
-        map.insert(DeclarationId(2908), DeclarationId(3341));
-        map.insert(DeclarationId(2910), DeclarationId(3344));
-        map.insert(DeclarationId(2921), DeclarationId(3347));
-=======
         map.insert(DeclarationId(389), DeclarationId(2937));
         map.insert(DeclarationId(391), DeclarationId(2940));
         map.insert(DeclarationId(423), DeclarationId(2943));
@@ -124435,7 +104279,6 @@ fn bootstrapped_fixture_dag_optional_match_disjs() -> HashMap<DeclarationId, Dec
         map.insert(DeclarationId(2912), DeclarationId(3345));
         map.insert(DeclarationId(2914), DeclarationId(3348));
         map.insert(DeclarationId(2925), DeclarationId(3351));
->>>>>>> origin/main
         map
     }
 }
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 178a64f7c59..c57f7ec3396 100644
--- a/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs
+++ b/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs
@@ -7,15 +7,9 @@ pub(crate) fn bootstrapped_fixture_without_parse_surface_dag() -> Dag {
         declarations: bootstrapped_fixture_without_parse_surface_dag_declarations(),
         ports: bootstrapped_fixture_without_parse_surface_dag_ports(),
         diagnostics: bootstrapped_fixture_without_parse_surface_dag_diagnostics(),
-<<<<<<< HEAD
-        next_node_id: 854,
-        next_declaration_id: 2877,
-        next_port_id: 1021,
-=======
         next_node_id: 856,
         next_declaration_id: 2878,
         next_port_id: 1027,
->>>>>>> origin/main
         primitives: PrimitiveCache::default(),
         substrate_markers: SubstrateMarkers::default(),
         realization_metas: RealizationMetaCache::default(),
@@ -30,11 +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(),
-<<<<<<< HEAD
-        declaration_append_begin_after_bootstrap: 2877,
-=======
         declaration_append_begin_after_bootstrap: 2878,
->>>>>>> origin/main
     }
 }
 
@@ -1412,33 +1402,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(182),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1680)),
-=======
             target: TransformTarget::Callable(DeclarationId(1681)),
->>>>>>> origin/main
             inputs: vec![PortId(185)],
             output: PortId(187),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11495, 11507),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(183),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1682)),
-=======
             target: TransformTarget::Callable(DeclarationId(1683)),
->>>>>>> origin/main
             inputs: vec![PortId(187)],
             output: PortId(188),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11488, 11535),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(184),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1626)),
-=======
             target: TransformTarget::Callable(DeclarationId(1627)),
->>>>>>> origin/main
             inputs: vec![PortId(185), PortId(186), PortId(188)],
             output: PortId(189),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11149, 11539),
@@ -1454,11 +1432,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(186),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1628)),
-=======
             target: TransformTarget::Callable(DeclarationId(1629)),
->>>>>>> origin/main
             inputs: vec![PortId(190), PortId(191), PortId(192)],
             output: PortId(193),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11670, 11726),
@@ -1474,11 +1448,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(188),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1683)),
-=======
             target: TransformTarget::Callable(DeclarationId(1684)),
->>>>>>> origin/main
             inputs: vec![PortId(194)],
             output: PortId(195),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11795, 11810),
@@ -1630,11 +1600,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(202),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1667)),
-=======
             target: TransformTarget::Callable(DeclarationId(1668)),
->>>>>>> origin/main
             inputs: vec![PortId(211)],
             output: PortId(212),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12325, 12349),
@@ -1664,11 +1630,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(206),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1665)),
-=======
             target: TransformTarget::Callable(DeclarationId(1666)),
->>>>>>> origin/main
             inputs: vec![PortId(216)],
             output: PortId(217),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12618, 12653),
@@ -1798,22 +1760,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(218),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1661)),
-=======
             target: TransformTarget::Callable(DeclarationId(1662)),
->>>>>>> origin/main
             inputs: vec![PortId(230)],
             output: PortId(231),
             span: SourceSpan::new("src/v3/std/algebra.dag", 14214, 14229),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(219),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1685)),
-=======
             target: TransformTarget::Callable(DeclarationId(1686)),
->>>>>>> origin/main
             inputs: vec![PortId(229), PortId(231)],
             output: PortId(232),
             span: SourceSpan::new("src/v3/std/algebra.dag", 14202, 14245),
@@ -2518,11 +2472,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(266),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1687)),
-=======
             target: TransformTarget::Callable(DeclarationId(1688)),
->>>>>>> origin/main
             inputs: vec![PortId(312), PortId(313)],
             output: PortId(314),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16911, 17021),
@@ -2550,11 +2500,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(270),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1689)),
-=======
             target: TransformTarget::Callable(DeclarationId(1690)),
->>>>>>> origin/main
             inputs: vec![PortId(317), PortId(318)],
             output: PortId(319),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17076, 17186),
@@ -4047,22 +3993,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(364),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1690)),
-=======
             target: TransformTarget::Callable(DeclarationId(1691)),
->>>>>>> origin/main
             inputs: vec![PortId(425), PortId(426)],
             output: PortId(427),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22293, 22323),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(365),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1691)),
-=======
             target: TransformTarget::Callable(DeclarationId(1692)),
->>>>>>> origin/main
             inputs: vec![PortId(424), PortId(427)],
             output: PortId(428),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22275, 22324),
@@ -4078,11 +4016,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(367),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1692)),
-=======
             target: TransformTarget::Callable(DeclarationId(1693)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(430),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22603, 22610),
@@ -4146,11 +4080,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(375),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1693)),
-=======
             target: TransformTarget::Callable(DeclarationId(1694)),
->>>>>>> origin/main
             inputs: vec![PortId(436), PortId(438)],
             output: PortId(439),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22737, 22789),
@@ -4246,33 +4176,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(382),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1661)),
-=======
             target: TransformTarget::Callable(DeclarationId(1662)),
->>>>>>> origin/main
             inputs: vec![PortId(445)],
             output: PortId(446),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23123, 23138),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(383),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1694)),
-=======
             target: TransformTarget::Callable(DeclarationId(1695)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(447),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23140, 23147),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(384),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1695)),
-=======
             target: TransformTarget::Callable(DeclarationId(1696)),
->>>>>>> origin/main
             inputs: vec![PortId(446), PortId(447)],
             output: PortId(448),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23118, 23148),
@@ -4409,11 +4327,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(396),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1696)),
-=======
             target: TransformTarget::Callable(DeclarationId(1697)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(461),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23597, 23604),
@@ -4477,11 +4391,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(404),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1697)),
-=======
             target: TransformTarget::Callable(DeclarationId(1698)),
->>>>>>> origin/main
             inputs: vec![PortId(467), PortId(469)],
             output: PortId(470),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23735, 23792),
@@ -4886,11 +4796,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(430),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1661)),
-=======
             target: TransformTarget::Callable(DeclarationId(1662)),
->>>>>>> origin/main
             inputs: vec![PortId(509)],
             output: PortId(510),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25180, 25195),
@@ -4933,11 +4839,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(435),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1698)),
-=======
             target: TransformTarget::Callable(DeclarationId(1699)),
->>>>>>> origin/main
             inputs: vec![PortId(515), PortId(516)],
             output: PortId(517),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25317, 25349),
@@ -5034,11 +4936,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(442),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1661)),
-=======
             target: TransformTarget::Callable(DeclarationId(1662)),
->>>>>>> origin/main
             inputs: vec![PortId(523)],
             output: PortId(524),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25451, 25466),
@@ -5097,11 +4995,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(449),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1667)),
-=======
             target: TransformTarget::Callable(DeclarationId(1668)),
->>>>>>> origin/main
             inputs: vec![PortId(532)],
             output: PortId(533),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25569, 25628),
@@ -5184,11 +5078,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(454),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1661)),
-=======
             target: TransformTarget::Callable(DeclarationId(1662)),
->>>>>>> origin/main
             inputs: vec![PortId(537)],
             output: PortId(538),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25917, 25932),
@@ -5281,11 +5171,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(465),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1665)),
-=======
             target: TransformTarget::Callable(DeclarationId(1666)),
->>>>>>> origin/main
             inputs: vec![PortId(551)],
             output: PortId(552),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26159, 26222),
@@ -5757,11 +5643,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(494),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1665)),
-=======
             target: TransformTarget::Callable(DeclarationId(1666)),
->>>>>>> origin/main
             inputs: vec![PortId(601)],
             output: PortId(602),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27605, 27633),
@@ -5852,11 +5734,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(505),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1699)),
-=======
             target: TransformTarget::Callable(DeclarationId(1700)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(615),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27988, 27995),
@@ -5920,11 +5798,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(513),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1700)),
-=======
             target: TransformTarget::Callable(DeclarationId(1701)),
->>>>>>> origin/main
             inputs: vec![PortId(621), PortId(623)],
             output: PortId(624),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28136, 28201),
@@ -6013,11 +5887,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(519),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1702)),
-=======
             target: TransformTarget::Callable(DeclarationId(1703)),
->>>>>>> origin/main
             inputs: vec![PortId(628), PortId(630)],
             output: PortId(631),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28319, 28377),
@@ -6038,11 +5908,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(522),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1703)),
-=======
             target: TransformTarget::Callable(DeclarationId(1704)),
->>>>>>> origin/main
             inputs: vec![PortId(629), PortId(633)],
             output: PortId(634),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28403, 28449),
@@ -6085,22 +5951,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(525),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1704)),
-=======
             target: TransformTarget::Callable(DeclarationId(1705)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(637),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28720, 28727),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(526),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1706)),
-=======
             target: TransformTarget::Callable(DeclarationId(1707)),
->>>>>>> origin/main
             inputs: vec![PortId(636), PortId(637)],
             output: PortId(638),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28708, 28749),
@@ -6123,11 +5981,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(529),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1661)),
-=======
             target: TransformTarget::Callable(DeclarationId(1662)),
->>>>>>> origin/main
             inputs: vec![PortId(640)],
             output: PortId(641),
             span: SourceSpan::new("src/v3/std/induction.dag", 29099, 29114),
@@ -6200,11 +6054,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(538),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1669)),
-=======
             target: TransformTarget::Callable(DeclarationId(1670)),
->>>>>>> origin/main
             inputs: vec![PortId(653)],
             output: PortId(654),
             span: SourceSpan::new("src/v3/std/induction.dag", 29338, 29412),
@@ -6218,11 +6068,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(540),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1669)),
-=======
             target: TransformTarget::Callable(DeclarationId(1670)),
->>>>>>> origin/main
             inputs: vec![PortId(655)],
             output: PortId(656),
             span: SourceSpan::new("src/v3/std/induction.dag", 29433, 29461),
@@ -6236,11 +6082,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(542),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1669)),
-=======
             target: TransformTarget::Callable(DeclarationId(1670)),
->>>>>>> origin/main
             inputs: vec![PortId(657)],
             output: PortId(658),
             span: SourceSpan::new("src/v3/std/induction.dag", 29480, 29513),
@@ -6367,11 +6209,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(548),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1669)),
-=======
             target: TransformTarget::Callable(DeclarationId(1670)),
->>>>>>> origin/main
             inputs: vec![PortId(664)],
             output: PortId(665),
             span: SourceSpan::new("src/v3/std/induction.dag", 29645, 29726),
@@ -6396,11 +6234,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(551),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1669)),
-=======
             target: TransformTarget::Callable(DeclarationId(1670)),
->>>>>>> origin/main
             inputs: vec![PortId(668)],
             output: PortId(669),
             span: SourceSpan::new("src/v3/std/induction.dag", 29761, 29835),
@@ -6486,11 +6320,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(559),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2072)),
-=======
             target: TransformTarget::Callable(DeclarationId(2073)),
->>>>>>> origin/main
             inputs: vec![PortId(678)],
             output: PortId(679),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3203, 3241),
@@ -6513,11 +6343,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(562),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2073)),
-=======
             target: TransformTarget::Callable(DeclarationId(2074)),
->>>>>>> origin/main
             inputs: vec![PortId(682)],
             output: PortId(683),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3281, 3319),
@@ -6583,11 +6409,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(567),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2074)),
-=======
             target: TransformTarget::Callable(DeclarationId(2075)),
->>>>>>> origin/main
             inputs: vec![PortId(688)],
             output: PortId(689),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3440, 3478),
@@ -6610,11 +6432,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(570),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2075)),
-=======
             target: TransformTarget::Callable(DeclarationId(2076)),
->>>>>>> origin/main
             inputs: vec![PortId(692)],
             output: PortId(693),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3518, 3556),
@@ -6680,11 +6498,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(575),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2076)),
-=======
             target: TransformTarget::Callable(DeclarationId(2077)),
->>>>>>> origin/main
             inputs: vec![PortId(698)],
             output: PortId(699),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3674, 3712),
@@ -6707,11 +6521,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(578),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2077)),
-=======
             target: TransformTarget::Callable(DeclarationId(2078)),
->>>>>>> origin/main
             inputs: vec![PortId(702)],
             output: PortId(703),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3752, 3790),
@@ -6777,11 +6587,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(583),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2078)),
-=======
             target: TransformTarget::Callable(DeclarationId(2079)),
->>>>>>> origin/main
             inputs: vec![PortId(708)],
             output: PortId(709),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3906, 3944),
@@ -6804,11 +6610,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(586),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2079)),
-=======
             target: TransformTarget::Callable(DeclarationId(2080)),
->>>>>>> origin/main
             inputs: vec![PortId(712)],
             output: PortId(713),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3984, 4022),
@@ -6874,11 +6676,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(591),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2080)),
-=======
             target: TransformTarget::Callable(DeclarationId(2081)),
->>>>>>> origin/main
             inputs: vec![PortId(718)],
             output: PortId(719),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4138, 4176),
@@ -6901,11 +6699,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(594),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2081)),
-=======
             target: TransformTarget::Callable(DeclarationId(2082)),
->>>>>>> origin/main
             inputs: vec![PortId(722)],
             output: PortId(723),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4216, 4254),
@@ -7064,11 +6858,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(600),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2082)),
-=======
             target: TransformTarget::Callable(DeclarationId(2083)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(729),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4940, 4945),
@@ -7084,11 +6874,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(602),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2083)),
-=======
             target: TransformTarget::Callable(DeclarationId(2084)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(730),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5005, 5010),
@@ -7104,11 +6890,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(604),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2084)),
-=======
             target: TransformTarget::Callable(DeclarationId(2085)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(731),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5068, 5073),
@@ -7124,11 +6906,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(606),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2085)),
-=======
             target: TransformTarget::Callable(DeclarationId(2086)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(732),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5131, 5136),
@@ -7144,11 +6922,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(608),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2086)),
-=======
             target: TransformTarget::Callable(DeclarationId(2087)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(733),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5195, 5200),
@@ -7164,11 +6938,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(610),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2087)),
-=======
             target: TransformTarget::Callable(DeclarationId(2088)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(734),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5275, 5280),
@@ -7184,11 +6954,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(612),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2089)),
-=======
             target: TransformTarget::Callable(DeclarationId(2090)),
->>>>>>> origin/main
             inputs: vec![PortId(735)],
             output: PortId(736),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5391, 5402),
@@ -7202,11 +6968,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(614),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2088)),
-=======
             target: TransformTarget::Callable(DeclarationId(2089)),
->>>>>>> origin/main
             inputs: vec![PortId(736), PortId(737)],
             output: PortId(738),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5378, 5443),
@@ -7229,11 +6991,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(617),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2090)),
-=======
             target: TransformTarget::Callable(DeclarationId(2091)),
->>>>>>> origin/main
             inputs: vec![PortId(739), PortId(740)],
             output: PortId(741),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5519, 5577),
@@ -7263,11 +7021,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(621),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2091)),
-=======
             target: TransformTarget::Callable(DeclarationId(2092)),
->>>>>>> origin/main
             inputs: vec![PortId(743), PortId(742), PortId(744)],
             output: PortId(745),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5678, 5803),
@@ -7304,11 +7058,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(626),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2092)),
-=======
             target: TransformTarget::Callable(DeclarationId(2093)),
->>>>>>> origin/main
             inputs: vec![PortId(748), PortId(749), PortId(750)],
             output: PortId(751),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5924, 6086),
@@ -7778,12 +7528,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(667),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2131)),
-            inputs: vec![],
-            output: PortId(802),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 6612, 6622),
-=======
             target: TransformTarget::Callable(DeclarationId(1224)),
             inputs: vec![
                 PortId(802),
@@ -7794,7 +7538,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
             ],
             output: PortId(807),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7332, 7475),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Bind(BindNode {
             id: NodeId(668),
@@ -7813,41 +7556,30 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(669),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2131)),
-=======
             target: TransformTarget::Callable(DeclarationId(2132)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(808),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8272, 8282),
         }));
         nodes.push(Behavior::Bind(BindNode {
             id: NodeId(670),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2131)),
-            inputs: vec![],
-            output: PortId(807),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 6992, 7002),
-=======
             name: "timing_measurement_unobserved".to_string(),
             value: PortId(808),
             params: vec![],
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8272, 8282),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(671),
-            target: TransformTarget::Callable(DeclarationId(2133)),
+            target: TransformTarget::Callable(DeclarationId(2132)),
             inputs: vec![],
             output: PortId(812),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8590, 8600),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(672),
-            target: TransformTarget::Callable(DeclarationId(2133)),
+            target: TransformTarget::Callable(DeclarationId(2132)),
             inputs: vec![],
             output: PortId(813),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8652, 8662),
@@ -7861,11 +7593,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(674),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2133)),
-=======
             target: TransformTarget::Callable(DeclarationId(2134)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(815),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8707, 8712),
@@ -7935,33 +7663,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-<<<<<<< HEAD
-            id: NodeId(676),
-            target: TransformTarget::Callable(DeclarationId(2131)),
-            inputs: vec![],
-            output: PortId(814),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7158, 7168),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(677),
-            target: TransformTarget::Callable(DeclarationId(2133)),
-            inputs: vec![],
-            output: PortId(815),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7186, 7191),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(678),
-            target: TransformTarget::Callable(DeclarationId(2132)),
-            inputs: vec![],
-            output: PortId(816),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7213, 7222),
-=======
             id: NodeId(678),
             target: TransformTarget::Callable(DeclarationId(2132)),
             inputs: vec![],
             output: PortId(820),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8818, 8828),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(679),
@@ -7972,11 +7678,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(680),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2132)),
-=======
             target: TransformTarget::Callable(DeclarationId(2133)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(822),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8873, 8882),
@@ -8050,29 +7752,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
             target: TransformTarget::UnresolvedFieldProject {
                 field_label: "duration".to_string(),
             },
-<<<<<<< HEAD
-            inputs: vec![PortId(821)],
-            output: PortId(822),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7292, 7304),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(683),
-            target: TransformTarget::Callable(DeclarationId(2131)),
-            inputs: vec![],
-            output: PortId(823),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7348, 7358),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(684),
-            target: TransformTarget::Callable(DeclarationId(2133)),
-            inputs: vec![],
-            output: PortId(824),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7376, 7381),
-=======
             inputs: vec![PortId(827)],
             output: PortId(828),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8952, 8964),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(685),
@@ -8124,17 +7806,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(691),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2130)),
-            inputs: vec![PortId(831)],
-            output: PortId(832),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7491, 7544),
-=======
             target: TransformTarget::Operator(OperatorKind::Arithmetic(ArithmeticOp::Add)),
             inputs: vec![PortId(834), PortId(835)],
             output: PortId(836),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9181, 9200),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(692),
@@ -8170,17 +7845,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(696),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2130)),
-            inputs: vec![PortId(836)],
-            output: PortId(837),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7572, 7660),
-=======
             target: TransformTarget::Operator(OperatorKind::Comparison(ComparisonOp::Gt)),
             inputs: vec![PortId(839), PortId(840)],
             output: PortId(841),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9270, 9289),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Branch(BranchNode {
             id: NodeId(697),
@@ -8380,24 +8048,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(707),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1231)),
-            inputs: vec![],
-            output: PortId(847),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8018, 8036),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(708),
-            target: TransformTarget::Callable(DeclarationId(2130)),
-            inputs: vec![PortId(847)],
-            output: PortId(848),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 7997, 8038),
-=======
             target: TransformTarget::Callable(DeclarationId(1221)),
             inputs: vec![PortId(851)],
             output: PortId(852),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9586, 9598),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Bind(BindNode {
             id: NodeId(708),
@@ -8440,17 +8094,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(713),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2135)),
-            inputs: vec![],
-            output: PortId(853),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8292, 8297),
-=======
             target: TransformTarget::Callable(DeclarationId(1231)),
             inputs: vec![PortId(855), PortId(856), PortId(857)],
             output: PortId(858),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9847, 9891),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Bind(BindNode {
             id: NodeId(714),
@@ -8601,23 +8248,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-<<<<<<< HEAD
-            id: NodeId(722),
-            target: TransformTarget::Callable(DeclarationId(1889)),
-            inputs: vec![],
-            output: PortId(868),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9047, 9059),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(723),
-            target: TransformTarget::Callable(DeclarationId(1895)),
-            inputs: vec![PortId(868)],
-            output: PortId(869),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 9034, 9060),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-=======
->>>>>>> origin/main
             id: NodeId(724),
             target: TransformTarget::Callable(DeclarationId(1890)),
             inputs: vec![],
@@ -8680,145 +8310,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
             target: TransformTarget::Callable(DeclarationId(159)),
             inputs: vec![PortId(878), PortId(879), PortId(880)],
             output: PortId(881),
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10241, 10245),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(735),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "span".to_string(),
-            },
-            inputs: vec![PortId(881)],
-            output: PortId(882),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10246, 10250),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(736),
-            target: TransformTarget::Callable(DeclarationId(1236)),
-            inputs: vec![PortId(877), PortId(882)],
-            output: PortId(883),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10187, 10251),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(737),
-            target: TransformTarget::Callable(DeclarationId(1923)),
-            inputs: vec![PortId(883)],
-            output: PortId(884),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10151, 10263),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(738),
-            target: TransformTarget::Callable(DeclarationId(1237)),
-            inputs: vec![],
-            output: PortId(885),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10407, 10446),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(739),
-            target: TransformTarget::Callable(DeclarationId(1236)),
-            inputs: vec![PortId(877), PortId(885)],
-            output: PortId(886),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10327, 10460),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(740),
-            target: TransformTarget::Callable(DeclarationId(1923)),
-            inputs: vec![PortId(886)],
-            output: PortId(887),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10291, 10472),
-        }));
-        nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(741),
-            input: PortId(879),
-            paths: vec![
-                Path {
-                    body: NodeId(737),
-                    output: PortId(884),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Cons".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10129, 10137),
-                    },
-                    binding: Some(PayloadBinding {
-                        binding_name: "dd".to_string(),
-                        payload_port: PortId(880),
-                    }),
-                },
-                Path {
-                    body: NodeId(740),
-                    output: PortId(887),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Empty".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10272, 10277),
-                    },
-                    binding: None,
-                },
-            ],
-            output: PortId(888),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10098, 10480),
-            emit_participation: Some(BranchEmitParticipation::UserMatch),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(742),
-            target: TransformTarget::UnresolvedFieldProject {
-                field_label: "head".to_string(),
-            },
-            inputs: vec![PortId(889)],
-            output: PortId(890),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10646, 10650),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(743),
-            target: TransformTarget::Callable(DeclarationId(1235)),
-            inputs: vec![PortId(890)],
-            output: PortId(891),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10612, 10651),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(744),
-            target: TransformTarget::Callable(DeclarationId(1236)),
-            inputs: vec![PortId(877), PortId(891)],
-            output: PortId(892),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10540, 10661),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(745),
-            target: TransformTarget::Callable(DeclarationId(1923)),
-            inputs: vec![PortId(892)],
-            output: PortId(893),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10508, 10669),
-        }));
-        nodes.push(Behavior::Branch(BranchNode {
-            id: NodeId(746),
-            input: PortId(878),
-            paths: vec![
-                Path {
-                    body: NodeId(741),
-                    output: PortId(888),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Empty".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10083, 10088),
-                    },
-                    binding: None,
-                },
-                Path {
-                    body: NodeId(745),
-                    output: PortId(893),
-                    pattern: BranchPattern::UnresolvedVariant {
-                        name: "Cons".to_string(),
-                        span: SourceSpan::new("src/v3/std/timing_lens.dag", 10485, 10498),
-                    },
-                    binding: Some(PayloadBinding {
-                        binding_name: "payload".to_string(),
-                        payload_port: PortId(889),
-                    }),
-                },
-            ],
-            output: PortId(894),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 10053, 10673),
-            emit_participation: Some(BranchEmitParticipation::UserMatch),
-=======
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11093, 11166),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Bind(BindNode {
             id: NodeId(733),
@@ -8929,17 +8421,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-<<<<<<< HEAD
-            id: NodeId(752),
-            target: TransformTarget::Callable(DeclarationId(2131)),
-            inputs: vec![],
-            output: PortId(904),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 11299, 11309),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(753),
-            target: TransformTarget::Callable(DeclarationId(2132)),
-=======
             id: NodeId(744),
             target: TransformTarget::UnresolvedFieldProject {
                 field_label: "head".to_string(),
@@ -9020,7 +8501,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(751),
             target: TransformTarget::Callable(DeclarationId(1230)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(906),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12847, 12878),
@@ -9067,7 +8547,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(754),
-            target: TransformTarget::Callable(DeclarationId(2133)),
+            target: TransformTarget::Callable(DeclarationId(2132)),
             inputs: vec![],
             output: PortId(910),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12959, 12969),
@@ -9152,17 +8632,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(760),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2136)),
-            inputs: vec![PortId(913)],
-            output: PortId(914),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12279, 12320),
-=======
             target: TransformTarget::Callable(DeclarationId(711)),
             inputs: vec![PortId(917)],
             output: PortId(918),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13906, 13933),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(761),
@@ -9174,15 +8647,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(762),
             target: TransformTarget::Callable(DeclarationId(2137)),
-<<<<<<< HEAD
-            inputs: vec![PortId(915)],
-            output: PortId(916),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12326, 12367),
-=======
             inputs: vec![PortId(919)],
             output: PortId(920),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13939, 13980),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(763),
@@ -9234,17 +8701,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(767),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2138)),
-            inputs: vec![PortId(921)],
-            output: PortId(922),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12430, 12471),
-=======
             target: TransformTarget::Callable(DeclarationId(711)),
             inputs: vec![PortId(925)],
             output: PortId(926),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14057, 14084),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(768),
@@ -9256,15 +8716,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(769),
             target: TransformTarget::Callable(DeclarationId(2139)),
-<<<<<<< HEAD
-            inputs: vec![PortId(923)],
-            output: PortId(924),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12477, 12518),
-=======
             inputs: vec![PortId(927)],
             output: PortId(928),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14090, 14131),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(770),
@@ -9316,17 +8770,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(774),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2140)),
-            inputs: vec![PortId(929)],
-            output: PortId(930),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12578, 12619),
-=======
             target: TransformTarget::Callable(DeclarationId(711)),
             inputs: vec![PortId(933)],
             output: PortId(934),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14205, 14232),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(775),
@@ -9338,15 +8785,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(776),
             target: TransformTarget::Callable(DeclarationId(2141)),
-<<<<<<< HEAD
-            inputs: vec![PortId(931)],
-            output: PortId(932),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12625, 12666),
-=======
             inputs: vec![PortId(935)],
             output: PortId(936),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14238, 14279),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(777),
@@ -9398,17 +8839,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(781),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2142)),
-            inputs: vec![PortId(937)],
-            output: PortId(938),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12724, 12765),
-=======
             target: TransformTarget::Callable(DeclarationId(711)),
             inputs: vec![PortId(941)],
             output: PortId(942),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14351, 14378),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(782),
@@ -9420,15 +8854,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(783),
             target: TransformTarget::Callable(DeclarationId(2143)),
-<<<<<<< HEAD
-            inputs: vec![PortId(939)],
-            output: PortId(940),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12771, 12812),
-=======
             inputs: vec![PortId(943)],
             output: PortId(944),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14384, 14425),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(784),
@@ -9480,17 +8908,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(788),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(2144)),
-            inputs: vec![PortId(945)],
-            output: PortId(946),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12870, 12911),
-=======
             target: TransformTarget::Callable(DeclarationId(711)),
             inputs: vec![PortId(949)],
             output: PortId(950),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14497, 14524),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(789),
@@ -9502,11 +8923,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(790),
             target: TransformTarget::Callable(DeclarationId(2145)),
-<<<<<<< HEAD
-            inputs: vec![PortId(947)],
-            output: PortId(948),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12917, 12958),
-=======
             inputs: vec![PortId(951)],
             output: PortId(952),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14530, 14571),
@@ -9524,7 +8940,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
             inputs: vec![PortId(953)],
             output: PortId(954),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14577, 14618),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Branch(BranchNode {
             id: NodeId(793),
@@ -9642,16 +9057,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(797),
-<<<<<<< HEAD
-            target: TransformTarget::Callable(DeclarationId(1922)),
-            inputs: vec![],
-            output: PortId(957),
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 13142, 13154),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(798),
-            target: TransformTarget::Callable(DeclarationId(1922)),
-=======
             target: TransformTarget::Callable(DeclarationId(1293)),
             inputs: vec![PortId(957)],
             output: PortId(961),
@@ -9667,7 +9072,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(799),
             target: TransformTarget::Callable(DeclarationId(1923)),
->>>>>>> origin/main
             inputs: vec![],
             output: PortId(963),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14802, 14814),
@@ -9788,20 +9192,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
         nodes.push(Behavior::Transform(TransformNode {
-<<<<<<< HEAD
-            id: NodeId(808),
-            target: TransformTarget::Callable(DeclarationId(1287)),
-            inputs: vec![PortId(968)],
-            output: PortId(969),
-            span: SourceSpan::new("src/v3/std/verification.dag", 28552, 28575),
-        }));
-        nodes.push(Behavior::Transform(TransformNode {
-            id: NodeId(809),
-            target: TransformTarget::Callable(DeclarationId(1288)),
-            inputs: vec![PortId(970)],
-            output: PortId(971),
-            span: SourceSpan::new("src/v3/std/verification.dag", 28597, 28631),
-=======
             id: NodeId(810),
             target: TransformTarget::Callable(DeclarationId(1289)),
             inputs: vec![PortId(974)],
@@ -9814,7 +9204,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
             inputs: vec![PortId(976)],
             output: PortId(977),
             span: SourceSpan::new("src/v3/std/verification.dag", 28593, 28627),
->>>>>>> origin/main
         }));
         nodes.push(Behavior::Branch(BranchNode {
             id: NodeId(812),
@@ -9825,7 +9214,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     output: PortId(975),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Enumerated".to_string(),
-                        span: SourceSpan::new("src/v3/std/verification.dag", 28535, 28548),
+                        span: SourceSpan::new("src/v3/std/verification.dag", 28531, 28544),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "c".to_string(),
@@ -9837,7 +9226,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     output: PortId(977),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Quantified".to_string(),
-                        span: SourceSpan::new("src/v3/std/verification.dag", 28580, 28593),
+                        span: SourceSpan::new("src/v3/std/verification.dag", 28576, 28589),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "q".to_string(),
@@ -9845,27 +9234,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     }),
                 },
             ],
-<<<<<<< HEAD
-            output: PortId(972),
-            span: SourceSpan::new("src/v3/std/verification.dag", 28517, 28635),
-=======
             output: PortId(978),
             span: SourceSpan::new("src/v3/std/verification.dag", 28513, 28631),
->>>>>>> origin/main
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Bind(BindNode {
             id: NodeId(813),
             name: "obligation_for_suite_claim".to_string(),
-<<<<<<< HEAD
-            value: PortId(972),
-            params: vec![PortId(967)],
-            span: SourceSpan::new("src/v3/std/verification.dag", 28517, 28635),
-=======
             value: PortId(978),
             params: vec![PortId(973)],
             span: SourceSpan::new("src/v3/std/verification.dag", 28513, 28631),
->>>>>>> origin/main
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
@@ -10484,11 +9862,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> {
     {
-<<<<<<< HEAD
-        let mut declarations = Vec::with_capacity(2877);
-=======
         let mut declarations = Vec::with_capacity(2878);
->>>>>>> origin/main
         declarations.push(Declaration {
             id: DeclarationId(0),
             name: Some("Classical".to_string()),
@@ -24696,19 +24070,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Empty".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1432),
-                    },
-                    Field {
-                        label: "Cons".to_string(),
-                        ty: DeclarationId(1434),
-=======
                         ty: DeclarationId(1433),
                     },
                     Field {
                         label: "Cons".to_string(),
                         ty: DeclarationId(1435),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -24741,11 +24107,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-<<<<<<< HEAD
-                output: DeclarationId(1402),
-=======
                 output: DeclarationId(1403),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3273, 3284)),
             },
             type_params: vec![DeclarationId(688)],
@@ -24776,13 +24138,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(689),
             name: Some("cons".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(690), DeclarationId(1403)],
-                output: DeclarationId(1404),
-=======
                 inputs: vec![DeclarationId(690), DeclarationId(1404)],
                 output: DeclarationId(1405),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3453, 3475)),
             },
             type_params: vec![DeclarationId(690)],
@@ -24814,11 +24171,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("singleton".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(692)],
-<<<<<<< HEAD
-                output: DeclarationId(1405),
-=======
                 output: DeclarationId(1406),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3570, 3590)),
             },
             type_params: vec![DeclarationId(692)],
@@ -24849,11 +24202,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(693),
             name: Some("fold".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1406), DeclarationId(695), DeclarationId(1407)],
-=======
                 inputs: vec![DeclarationId(1407), DeclarationId(695), DeclarationId(1408)],
->>>>>>> origin/main
                 output: DeclarationId(695),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4203, 4307)),
             },
@@ -24899,11 +24248,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(696),
             name: Some("fold_right".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1408), DeclarationId(698), DeclarationId(1409)],
-=======
                 inputs: vec![DeclarationId(1409), DeclarationId(698), DeclarationId(1410)],
->>>>>>> origin/main
                 output: DeclarationId(698),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4658, 4768)),
             },
@@ -24949,13 +24294,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(699),
             name: Some("concat".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1410), DeclarationId(1411)],
-                output: DeclarationId(1412),
-=======
                 inputs: vec![DeclarationId(1411), DeclarationId(1412)],
                 output: DeclarationId(1413),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5386, 5414)),
             },
             type_params: vec![DeclarationId(700)],
@@ -24986,13 +24326,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(701),
             name: Some("map".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1413), DeclarationId(1414)],
-                output: DeclarationId(1415),
-=======
                 inputs: vec![DeclarationId(1414), DeclarationId(1415)],
                 output: DeclarationId(1416),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5721, 5778)),
             },
             type_params: vec![DeclarationId(702), DeclarationId(703)],
@@ -25037,13 +24372,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(704),
             name: Some("filter".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1416), DeclarationId(1417)],
-                output: DeclarationId(1418),
-=======
                 inputs: vec![DeclarationId(1417), DeclarationId(1418)],
                 output: DeclarationId(1419),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5905, 5988)),
             },
             type_params: vec![DeclarationId(705)],
@@ -25074,13 +24404,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(706),
             name: Some("flat_map".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1419), DeclarationId(1421)],
-                output: DeclarationId(1422),
-=======
                 inputs: vec![DeclarationId(1420), DeclarationId(1422)],
                 output: DeclarationId(1423),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6171, 6230)),
             },
             type_params: vec![DeclarationId(707), DeclarationId(708)],
@@ -25125,11 +24450,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(709),
             name: Some("length".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1423)],
-=======
                 inputs: vec![DeclarationId(1424)],
->>>>>>> origin/main
                 output: DeclarationId(93),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6372, 6409)),
             },
@@ -25161,11 +24482,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(711),
             name: Some("is_empty".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1424)],
-=======
                 inputs: vec![DeclarationId(1425)],
->>>>>>> origin/main
                 output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6605, 6671)),
             },
@@ -25236,13 +24553,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(715),
             name: Some("enumerate".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1425)],
-                output: DeclarationId(1427),
-=======
                 inputs: vec![DeclarationId(1426)],
                 output: DeclarationId(1428),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7238, 7269)),
             },
             type_params: vec![DeclarationId(716)],
@@ -25273,13 +24585,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(717),
             name: Some("enumerate_helper".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1428), DeclarationId(93)],
-                output: DeclarationId(1430),
-=======
                 inputs: vec![DeclarationId(1429), DeclarationId(93)],
                 output: DeclarationId(1431),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7463, 7644)),
             },
             type_params: vec![DeclarationId(718)],
@@ -25310,11 +24617,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(719),
             name: Some("contains".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1431), DeclarationId(720)],
-=======
                 inputs: vec![DeclarationId(1432), DeclarationId(720)],
->>>>>>> origin/main
                 output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 8205, 8332)),
             },
@@ -25409,11 +24712,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "rest".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1435),
-=======
                         ty: DeclarationId(1436),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -25456,11 +24755,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "rest".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1436),
-=======
                         ty: DeclarationId(1437),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -25495,19 +24790,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LiteralToken".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1451),
-                    },
-                    Field {
-                        label: "ParamToken".to_string(),
-                        ty: DeclarationId(1452),
-=======
                         ty: DeclarationId(1452),
                     },
                     Field {
                         label: "ParamToken".to_string(),
                         ty: DeclarationId(1453),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -25527,11 +24814,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tokens".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1453),
-=======
                     ty: DeclarationId(1454),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -25551,19 +24834,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ParsedSegmentTokens".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1455),
-                    },
-                    Field {
-                        label: "MalformedPathSegment".to_string(),
-                        ty: DeclarationId(1456),
-=======
                         ty: DeclarationId(1456),
                     },
                     Field {
                         label: "MalformedPathSegment".to_string(),
                         ty: DeclarationId(1457),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -25584,19 +24859,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ParsedPathTemplate".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1457),
-                    },
-                    Field {
-                        label: "MalformedPathTemplate".to_string(),
-                        ty: DeclarationId(1458),
-=======
                         ty: DeclarationId(1458),
                     },
                     Field {
                         label: "MalformedPathTemplate".to_string(),
                         ty: DeclarationId(1459),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -25651,11 +24918,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("last_path_param".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(730)],
-<<<<<<< HEAD
-                output: DeclarationId(1437),
-=======
                 output: DeclarationId(1438),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 11761, 12044)),
             },
             type_params: vec![],
@@ -25675,13 +24938,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ReadEffect".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1459),
-                    },
-                    Field {
-                        label: "UpsertEffect".to_string(),
-                        ty: DeclarationId(1460),
-=======
                         ty: DeclarationId(1460),
                     },
                     Field {
@@ -25691,11 +24947,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "DeleteEffect".to_string(),
                         ty: DeclarationId(1462),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "DeleteEffect".to_string(),
-                        ty: DeclarationId(1461),
                     },
                 ],
             },
@@ -25707,7 +24958,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/effects.dag", 14328, 14449),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14330, 14451),
         });
         declarations.push(Declaration {
             id: DeclarationId(737),
@@ -25716,19 +24967,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "CreateEffect".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1462),
-                    },
-                    Field {
-                        label: "AppendEffect".to_string(),
-                        ty: DeclarationId(1463),
-=======
                         ty: DeclarationId(1463),
                     },
                     Field {
                         label: "AppendEffect".to_string(),
                         ty: DeclarationId(1464),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -25740,7 +24983,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/effects.dag", 14672, 14747),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14674, 14749),
         });
         declarations.push(Declaration {
             id: DeclarationId(738),
@@ -25749,19 +24992,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IsIdempotent".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1464),
-                    },
-                    Field {
-                        label: "IsBreaking".to_string(),
-                        ty: DeclarationId(1465),
-=======
                         ty: DeclarationId(1465),
                     },
                     Field {
                         label: "IsBreaking".to_string(),
                         ty: DeclarationId(1466),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -25773,7 +25008,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/effects.dag", 15148, 15228),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15150, 15230),
         });
         declarations.push(Declaration {
             id: DeclarationId(739),
@@ -25782,19 +25017,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "PostAlways".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1466),
-                    },
-                    Field {
-                        label: "KeylessFallback".to_string(),
-                        ty: DeclarationId(1467),
-=======
                         ty: DeclarationId(1467),
                     },
                     Field {
                         label: "KeylessFallback".to_string(),
                         ty: DeclarationId(1468),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -25806,7 +25033,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/effects.dag", 15720, 15794),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15722, 15796),
         });
         declarations.push(Declaration {
             id: DeclarationId(740),
@@ -25815,27 +25042,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "PathParam".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1468),
-=======
                         ty: DeclarationId(1469),
                     },
                     Field {
                         label: "InputField".to_string(),
                         ty: DeclarationId(1470),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "InputField".to_string(),
-                        ty: DeclarationId(1469),
                     },
                     Field {
                         label: "CompositeKey".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1471),
-=======
                         ty: DeclarationId(1472),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -25847,7 +25062,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/effects.dag", 16480, 16601),
+            span: SourceSpan::new("src/v3/std/effects.dag", 16482, 16603),
         });
         declarations.push(Declaration {
             id: DeclarationId(741),
@@ -25856,13 +25071,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LatticeEffect".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1472),
-                    },
-                    Field {
-                        label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(1473),
-=======
                         ty: DeclarationId(1473),
                     },
                     Field {
@@ -25872,11 +25080,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "NonIdempotent".to_string(),
                         ty: DeclarationId(1475),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "NonIdempotent".to_string(),
-                        ty: DeclarationId(1474),
                     },
                 ],
             },
@@ -25888,7 +25091,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/effects.dag", 17249, 17347),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17251, 17349),
         });
         declarations.push(Declaration {
             id: DeclarationId(742),
@@ -25896,7 +25099,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(738)],
                 output: DeclarationId(128),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 17574, 17646)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 17576, 17648)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25906,7 +25109,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/effects.dag", 17522, 17646),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17524, 17648),
         });
         declarations.push(Declaration {
             id: DeclarationId(743),
@@ -25914,7 +25117,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(738)],
                 output: DeclarationId(741),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 17859, 18379)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 17861, 18381)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25924,7 +25127,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/effects.dag", 17785, 18379),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17787, 18381),
         });
         declarations.push(Declaration {
             id: DeclarationId(744),
@@ -25949,7 +25152,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/effects.dag", 19063, 19133),
+            span: SourceSpan::new("src/v3/std/effects.dag", 19065, 19135),
         });
         declarations.push(Declaration {
             id: DeclarationId(745),
@@ -25958,13 +25161,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DerivedEffect".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1475),
-                    },
-                    Field {
-                        label: "UnknownHttpMethodInput".to_string(),
-                        ty: DeclarationId(1476),
-=======
                         ty: DeclarationId(1476),
                     },
                     Field {
@@ -25974,11 +25170,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "MalformedPathInput".to_string(),
                         ty: DeclarationId(1478),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "MalformedPathInput".to_string(),
-                        ty: DeclarationId(1477),
                     },
                 ],
             },
@@ -25990,7 +25181,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/effects.dag", 19487, 19787),
+            span: SourceSpan::new("src/v3/std/effects.dag", 19489, 19789),
         });
         declarations.push(Declaration {
             id: DeclarationId(746),
@@ -25999,19 +25190,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IdempotentComposition".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1478),
-                    },
-                    Field {
-                        label: "BrokenBy".to_string(),
-                        ty: DeclarationId(1480),
-=======
                         ty: DeclarationId(1479),
                     },
                     Field {
                         label: "BrokenBy".to_string(),
                         ty: DeclarationId(1481),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -26023,7 +25206,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/effects.dag", 20508, 20617),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20510, 20619),
         });
         declarations.push(Declaration {
             id: DeclarationId(747),
@@ -26031,7 +25214,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744)],
                 output: DeclarationId(128),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20807, 20882)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20809, 20884)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26041,20 +25224,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20753, 20882),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20755, 20884),
         });
         declarations.push(Declaration {
             id: DeclarationId(748),
             name: Some("breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-<<<<<<< HEAD
-                output: DeclarationId(1438),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20942, 20964)),
-=======
                 output: DeclarationId(1439),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20944, 20966)),
->>>>>>> origin/main
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26064,21 +25242,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20884, 20964),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20886, 20966),
         });
         declarations.push(Declaration {
             id: DeclarationId(749),
             name: Some("indexed_breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1439)],
-                output: DeclarationId(1441),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21058, 21151)),
-=======
                 inputs: vec![DeclarationId(1440)],
                 output: DeclarationId(1442),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21060, 21153)),
->>>>>>> origin/main
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26088,21 +25260,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20966, 21151),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20968, 21153),
         });
         declarations.push(Declaration {
             id: DeclarationId(750),
             name: Some("first_breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1442)],
-                output: DeclarationId(1444),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21238, 21421)),
-=======
                 inputs: vec![DeclarationId(1443)],
                 output: DeclarationId(1445),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21240, 21423)),
->>>>>>> origin/main
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26112,19 +25278,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21153, 21421),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21155, 21423),
         });
         declarations.push(Declaration {
             id: DeclarationId(751),
             name: Some("compose_effects".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1445)],
-=======
                 inputs: vec![DeclarationId(1446)],
->>>>>>> origin/main
                 output: DeclarationId(746),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22311, 22434)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22313, 22436)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26134,7 +25296,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/effects.dag", 22238, 22434),
+            span: SourceSpan::new("src/v3/std/effects.dag", 22240, 22436),
         });
         declarations.push(Declaration {
             id: DeclarationId(752),
@@ -26153,7 +25315,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/effects.dag", 23635, 23670),
+            span: SourceSpan::new("src/v3/std/effects.dag", 23637, 23672),
         });
         declarations.push(Declaration {
             id: DeclarationId(753),
@@ -26178,7 +25340,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/effects.dag", 23755, 23821),
+            span: SourceSpan::new("src/v3/std/effects.dag", 23757, 23823),
         });
         declarations.push(Declaration {
             id: DeclarationId(754),
@@ -26187,13 +25349,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LinearEffect".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1482),
-                    },
-                    Field {
-                        label: "BranchEffect".to_string(),
-                        ty: DeclarationId(1484),
-=======
                         ty: DeclarationId(1483),
                     },
                     Field {
@@ -26203,19 +25358,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "LoopEffect".to_string(),
                         ty: DeclarationId(1486),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "LoopEffect".to_string(),
-                        ty: DeclarationId(1485),
                     },
                     Field {
                         label: "ParallelEffect".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1487),
-=======
                         ty: DeclarationId(1488),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -26227,7 +25373,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/effects.dag", 24497, 24725),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24499, 24727),
         });
         declarations.push(Declaration {
             id: DeclarationId(755),
@@ -26256,7 +25402,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/effects.dag", 25084, 25188),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25086, 25190),
         });
         declarations.push(Declaration {
             id: DeclarationId(756),
@@ -26265,19 +25411,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "WorkflowCompositionVerdict".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1488),
-                    },
-                    Field {
-                        label: "IdempotencyUnsupported".to_string(),
-                        ty: DeclarationId(1489),
-=======
                         ty: DeclarationId(1489),
                     },
                     Field {
                         label: "IdempotencyUnsupported".to_string(),
                         ty: DeclarationId(1490),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -26289,7 +25427,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/effects.dag", 25327, 25465),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25329, 25467),
         });
         declarations.push(Declaration {
             id: DeclarationId(757),
@@ -26297,7 +25435,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230), DeclarationId(230), DeclarationId(230)],
                 output: DeclarationId(756),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 25607, 25763)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 25609, 25765)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26307,7 +25445,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/effects.dag", 25467, 25763),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25469, 25765),
         });
         declarations.push(Declaration {
             id: DeclarationId(758),
@@ -26316,26 +25454,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NoWorkflowProjection".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1490),
-                    },
-                    Field {
-                        label: "NotParallelEffectRoot".to_string(),
-                        ty: DeclarationId(1491),
-                    },
-                    Field {
-                        label: "NonLinearParallelBranch".to_string(),
-                        ty: DeclarationId(1492),
-                    },
-                    Field {
-                        label: "PairwiseNonCommute".to_string(),
-                        ty: DeclarationId(1493),
-                    },
-                    Field {
-                        label: "LensSurfacePending".to_string(),
-                        ty: DeclarationId(1494),
-                    },
-=======
                         ty: DeclarationId(1491),
                     },
                     Field {
@@ -26354,7 +25472,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "LensSurfacePending".to_string(),
                         ty: DeclarationId(1495),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -26365,7 +25482,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/effects.dag", 25926, 26082),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25928, 26084),
         });
         declarations.push(Declaration {
             id: DeclarationId(759),
@@ -26394,7 +25511,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/effects.dag", 26084, 26200),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26086, 26202),
         });
         declarations.push(Declaration {
             id: DeclarationId(760),
@@ -26403,19 +25520,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ParallelCompositionVerdict".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1495),
-                    },
-                    Field {
-                        label: "ParallelismUnsupported".to_string(),
-                        ty: DeclarationId(1496),
-=======
                         ty: DeclarationId(1496),
                     },
                     Field {
                         label: "ParallelismUnsupported".to_string(),
                         ty: DeclarationId(1497),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -26427,7 +25536,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/effects.dag", 26364, 26502),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26366, 26504),
         });
         declarations.push(Declaration {
             id: DeclarationId(761),
@@ -26435,7 +25544,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(758), DeclarationId(230)],
                 output: DeclarationId(760),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 26623, 26778)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 26625, 26780)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26445,7 +25554,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/effects.dag", 26504, 26778),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26506, 26780),
         });
         declarations.push(Declaration {
             id: DeclarationId(762),
@@ -26453,7 +25562,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(754)],
                 output: DeclarationId(756),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 27016, 27846)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 27018, 27848)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26463,20 +25572,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 26930, 27846),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26932, 27848),
         });
         declarations.push(Declaration {
             id: DeclarationId(763),
             name: Some("parse_http_method".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230)],
-<<<<<<< HEAD
-                output: DeclarationId(1446),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 29705, 30003)),
-=======
                 output: DeclarationId(1447),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 29707, 30005)),
->>>>>>> origin/main
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26486,7 +25590,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/effects.dag", 29656, 30003),
+            span: SourceSpan::new("src/v3/std/effects.dag", 29658, 30005),
         });
         declarations.push(Declaration {
             id: DeclarationId(764),
@@ -26494,7 +25598,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(198)],
                 output: DeclarationId(738),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30058, 30134)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30060, 30136)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26504,19 +25608,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30005, 30134),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30007, 30136),
         });
         declarations.push(Declaration {
             id: DeclarationId(765),
             name: Some("upsert_or_create".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1447), DeclarationId(198)],
-=======
                 inputs: vec![DeclarationId(1448), DeclarationId(198)],
->>>>>>> origin/main
                 output: DeclarationId(738),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30474, 30626)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30476, 30628)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26526,19 +25626,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30398, 30626),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30400, 30628),
         });
         declarations.push(Declaration {
             id: DeclarationId(766),
             name: Some("delete_or_create".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1448), DeclarationId(198)],
-=======
                 inputs: vec![DeclarationId(1449), DeclarationId(198)],
->>>>>>> origin/main
                 output: DeclarationId(738),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30704, 30856)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30706, 30858)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26548,7 +25644,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/effects.dag", 30628, 30856),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30630, 30858),
         });
         declarations.push(Declaration {
             id: DeclarationId(767),
@@ -26556,7 +25652,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(198), DeclarationId(730)],
                 output: DeclarationId(738),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30942, 31427)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30944, 31429)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26566,7 +25662,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/effects.dag", 30858, 31427),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30860, 31429),
         });
         declarations.push(Declaration {
             id: DeclarationId(768),
@@ -26574,7 +25670,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230), DeclarationId(198), DeclarationId(730)],
                 output: DeclarationId(745),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 31545, 31729)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 31547, 31731)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26584,7 +25680,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/effects.dag", 31429, 31729),
+            span: SourceSpan::new("src/v3/std/effects.dag", 31431, 31731),
         });
         declarations.push(Declaration {
             id: DeclarationId(769),
@@ -26593,13 +25689,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Agrees".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1497),
-                    },
-                    Field {
-                        label: "Disagrees".to_string(),
-                        ty: DeclarationId(1498),
-=======
                         ty: DeclarationId(1498),
                     },
                     Field {
@@ -26609,11 +25698,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "DerivationUnknown".to_string(),
                         ty: DeclarationId(1500),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "DerivationUnknown".to_string(),
-                        ty: DeclarationId(1499),
                     },
                 ],
             },
@@ -26625,7 +25709,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/effects.dag", 32429, 32546),
+            span: SourceSpan::new("src/v3/std/effects.dag", 32431, 32548),
         });
         declarations.push(Declaration {
             id: DeclarationId(770),
@@ -26634,19 +25718,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ModifierNotDeclared".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1500),
-                    },
-                    Field {
-                        label: "ModifierDeclared".to_string(),
-                        ty: DeclarationId(1501),
-=======
                         ty: DeclarationId(1501),
                     },
                     Field {
                         label: "ModifierDeclared".to_string(),
                         ty: DeclarationId(1502),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -26658,7 +25734,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/effects.dag", 32993, 33093),
+            span: SourceSpan::new("src/v3/std/effects.dag", 32995, 33095),
         });
         declarations.push(Declaration {
             id: DeclarationId(771),
@@ -26691,7 +25767,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/effects.dag", 33095, 33245),
+            span: SourceSpan::new("src/v3/std/effects.dag", 33097, 33247),
         });
         declarations.push(Declaration {
             id: DeclarationId(772),
@@ -26699,7 +25775,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(737)],
                 output: DeclarationId(769),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 33884, 34426)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 33886, 34428)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26709,7 +25785,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/effects.dag", 33805, 34426),
+            span: SourceSpan::new("src/v3/std/effects.dag", 33807, 34428),
         });
         declarations.push(Declaration {
             id: DeclarationId(773),
@@ -26717,7 +25793,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(738)],
                 output: DeclarationId(769),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 34830, 35272)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 34832, 35274)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26727,7 +25803,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/effects.dag", 34758, 35272),
+            span: SourceSpan::new("src/v3/std/effects.dag", 34760, 35274),
         });
         declarations.push(Declaration {
             id: DeclarationId(774),
@@ -26735,7 +25811,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744), DeclarationId(128), DeclarationId(128)],
                 output: DeclarationId(771),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 35404, 36053)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 35406, 36055)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26745,7 +25821,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/effects.dag", 35274, 36053),
+            span: SourceSpan::new("src/v3/std/effects.dag", 35276, 36055),
         });
         declarations.push(Declaration {
             id: DeclarationId(775),
@@ -26778,21 +25854,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 36405, 36533),
+            span: SourceSpan::new("src/v3/std/effects.dag", 36407, 36535),
         });
         declarations.push(Declaration {
             id: DeclarationId(776),
             name: Some("generate_idempotency_obligations".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1449)],
-                output: DeclarationId(1450),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 36638, 36908)),
-=======
                 inputs: vec![DeclarationId(1450)],
                 output: DeclarationId(1451),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 36640, 36910)),
->>>>>>> origin/main
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -26802,7 +25872,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/effects.dag", 36535, 36908),
+            span: SourceSpan::new("src/v3/std/effects.dag", 36537, 36910),
         });
         declarations.push(Declaration {
             id: DeclarationId(777),
@@ -26831,7 +25901,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/effects.dag", 37225, 37316),
+            span: SourceSpan::new("src/v3/std/effects.dag", 37227, 37318),
         });
         declarations.push(Declaration {
             id: DeclarationId(778),
@@ -26884,13 +25954,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Uninferred".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1510),
-                    },
-                    Field {
-                        label: "Resolved".to_string(),
-                        ty: DeclarationId(1511),
-=======
                         ty: DeclarationId(1511),
                     },
                     Field {
@@ -26900,11 +25963,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "Unresolved".to_string(),
                         ty: DeclarationId(1513),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "Unresolved".to_string(),
-                        ty: DeclarationId(1512),
                     },
                 ],
             },
@@ -26933,11 +25991,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "produced_by".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1513),
-=======
                         ty: DeclarationId(1514),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -26958,13 +26012,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LitInt".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1514),
-                    },
-                    Field {
-                        label: "LitBool".to_string(),
-                        ty: DeclarationId(1515),
-=======
                         ty: DeclarationId(1515),
                     },
                     Field {
@@ -26974,11 +26021,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "LitString".to_string(),
                         ty: DeclarationId(1517),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "LitString".to_string(),
-                        ty: DeclarationId(1516),
                     },
                 ],
             },
@@ -26999,26 +26041,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1517),
-                    },
-                    Field {
-                        label: "UnresolvedIdentifier".to_string(),
-                        ty: DeclarationId(1518),
-                    },
-                    Field {
-                        label: "ResolvedByStructure".to_string(),
-                        ty: DeclarationId(1519),
-                    },
-                    Field {
-                        label: "ResolvedByName".to_string(),
-                        ty: DeclarationId(1520),
-                    },
-                    Field {
-                        label: "TypeParam".to_string(),
-                        ty: DeclarationId(1521),
-                    },
-=======
                         ty: DeclarationId(1518),
                     },
                     Field {
@@ -27037,7 +26059,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "TypeParam".to_string(),
                         ty: DeclarationId(1522),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -27057,13 +26078,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "OneUnit".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1522),
-                    },
-                    Field {
-                        label: "AdditionalUnit".to_string(),
-                        ty: DeclarationId(1523),
-=======
                         ty: DeclarationId(1523),
                     },
                     Field {
@@ -27073,11 +26087,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "UnitCount".to_string(),
                         ty: DeclarationId(1525),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "UnitCount".to_string(),
-                        ty: DeclarationId(1524),
                     },
                 ],
             },
@@ -27098,19 +26107,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ZeroWidth".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1525),
-                    },
-                    Field {
-                        label: "PositiveWidth".to_string(),
-                        ty: DeclarationId(1526),
-=======
                         ty: DeclarationId(1526),
                     },
                     Field {
                         label: "PositiveWidth".to_string(),
                         ty: DeclarationId(1527),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -27131,19 +26132,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "BoundedInterval".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1527),
-                    },
-                    Field {
-                        label: "Unbounded".to_string(),
-                        ty: DeclarationId(1528),
-=======
                         ty: DeclarationId(1528),
                     },
                     Field {
                         label: "Unbounded".to_string(),
                         ty: DeclarationId(1529),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -27198,19 +26191,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "StaticBound".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1530),
-                    },
-                    Field {
-                        label: "PlatformDependent".to_string(),
-                        ty: DeclarationId(1531),
-=======
                         ty: DeclarationId(1531),
                     },
                     Field {
                         label: "PlatformDependent".to_string(),
                         ty: DeclarationId(1532),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -27231,13 +26216,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Exact".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1532),
-                    },
-                    Field {
-                        label: "AtMostOne".to_string(),
-                        ty: DeclarationId(1533),
-=======
                         ty: DeclarationId(1533),
                     },
                     Field {
@@ -27247,11 +26225,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "Unbounded".to_string(),
                         ty: DeclarationId(1535),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "Unbounded".to_string(),
-                        ty: DeclarationId(1534),
                     },
                 ],
             },
@@ -27347,29 +26320,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1535),
-                    },
-                    Field {
-                        label: "Reference".to_string(),
-                        ty: DeclarationId(1536),
-                    },
-                    Field {
-                        label: "Record".to_string(),
-                        ty: DeclarationId(1538),
-                    },
-                    Field {
-                        label: "List".to_string(),
-                        ty: DeclarationId(1540),
-                    },
-                    Field {
-                        label: "Map".to_string(),
-                        ty: DeclarationId(1542),
-                    },
-                    Field {
-                        label: "Variant".to_string(),
-                        ty: DeclarationId(1544),
-=======
                         ty: DeclarationId(1536),
                     },
                     Field {
@@ -27387,7 +26337,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "Map".to_string(),
                         ty: DeclarationId(1543),
->>>>>>> origin/main
                     },
                     Field {
                         label: "Variant".to_string(),
@@ -27412,25 +26361,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ValueBodyUnparsed".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1545),
-                    },
-                    Field {
-                        label: "ValueBodyStructural".to_string(),
-                        ty: DeclarationId(1547),
-                    },
-                    Field {
-                        label: "ValueBodyScalar".to_string(),
-                        ty: DeclarationId(1548),
-                    },
-                    Field {
-                        label: "ValueBodyList".to_string(),
-                        ty: DeclarationId(1550),
-                    },
-                    Field {
-                        label: "ValueBodyMap".to_string(),
-                        ty: DeclarationId(1552),
-=======
                         ty: DeclarationId(1546),
                     },
                     Field {
@@ -27444,7 +26374,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "ValueBodyList".to_string(),
                         ty: DeclarationId(1551),
->>>>>>> origin/main
                     },
                     Field {
                         label: "ValueBodyMap".to_string(),
@@ -27488,26 +26417,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UserDefined".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1553),
-                    },
-                    Field {
-                        label: "ExternalRealization".to_string(),
-                        ty: DeclarationId(1554),
-                    },
-                    Field {
-                        label: "Pending".to_string(),
-                        ty: DeclarationId(1555),
-                    },
-                    Field {
-                        label: "NoBody".to_string(),
-                        ty: DeclarationId(1556),
-                    },
-                    Field {
-                        label: "Unparsed".to_string(),
-                        ty: DeclarationId(1557),
-                    },
-=======
                         ty: DeclarationId(1554),
                     },
                     Field {
@@ -27526,7 +26435,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "Unparsed".to_string(),
                         ty: DeclarationId(1558),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -27546,21 +26454,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Atom".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1558),
-                    },
-                    Field {
-                        label: "Conj".to_string(),
-                        ty: DeclarationId(1560),
-                    },
-                    Field {
-                        label: "Disj".to_string(),
-                        ty: DeclarationId(1562),
-                    },
-                    Field {
-                        label: "Arrow".to_string(),
-                        ty: DeclarationId(1564),
-=======
                         ty: DeclarationId(1559),
                     },
                     Field {
@@ -27578,19 +26471,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "Cardinality".to_string(),
                         ty: DeclarationId(1566),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "Cardinality".to_string(),
-                        ty: DeclarationId(1565),
                     },
                     Field {
                         label: "Instantiation".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1567),
-=======
                         ty: DeclarationId(1568),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -27615,11 +26499,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "name".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1568),
-=======
                         ty: DeclarationId(1569),
->>>>>>> origin/main
                     },
                     Field {
                         label: "connective".to_string(),
@@ -27627,31 +26507,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "type_params".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1569),
-                    },
-                    Field {
-                        label: "phantom_params".to_string(),
-                        ty: DeclarationId(1570),
-                    },
-                    Field {
-                        label: "meta_tag".to_string(),
-                        ty: DeclarationId(1571),
-                    },
-                    Field {
-                        label: "inhabits".to_string(),
-                        ty: DeclarationId(1572),
-                    },
-                    Field {
-                        label: "value_body".to_string(),
-                        ty: DeclarationId(1573),
-                    },
-                    Field {
-                        label: "nominal_opacity".to_string(),
-                        ty: DeclarationId(1574),
-                    },
-                    Field {
-=======
                         ty: DeclarationId(1570),
                     },
                     Field {
@@ -27675,7 +26530,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         ty: DeclarationId(1575),
                     },
                     Field {
->>>>>>> origin/main
                         label: "span".to_string(),
                         ty: DeclarationId(159),
                     },
@@ -27722,11 +26576,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "permitted_accessors".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1575),
-=======
                     ty: DeclarationId(1576),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -27746,22 +26596,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Add".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1576),
-                    },
-                    Field {
-                        label: "Sub".to_string(),
-                        ty: DeclarationId(1577),
-                    },
-                    Field {
-                        label: "Mul".to_string(),
-                        ty: DeclarationId(1578),
-                    },
-                    Field {
-                        label: "Div".to_string(),
-                        ty: DeclarationId(1579),
-                    },
-=======
                         ty: DeclarationId(1577),
                     },
                     Field {
@@ -27776,7 +26610,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "Div".to_string(),
                         ty: DeclarationId(1580),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -27796,30 +26629,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1580),
-                    },
-                    Field {
-                        label: "Ne".to_string(),
-                        ty: DeclarationId(1581),
-                    },
-                    Field {
-                        label: "Lt".to_string(),
-                        ty: DeclarationId(1582),
-                    },
-                    Field {
-                        label: "Le".to_string(),
-                        ty: DeclarationId(1583),
-                    },
-                    Field {
-                        label: "Gt".to_string(),
-                        ty: DeclarationId(1584),
-                    },
-                    Field {
-                        label: "Ge".to_string(),
-                        ty: DeclarationId(1585),
-                    },
-=======
                         ty: DeclarationId(1581),
                     },
                     Field {
@@ -27842,7 +26651,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "Ge".to_string(),
                         ty: DeclarationId(1586),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -27887,19 +26695,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "And".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1586),
-                    },
-                    Field {
-                        label: "Or".to_string(),
-                        ty: DeclarationId(1587),
-=======
                         ty: DeclarationId(1587),
                     },
                     Field {
                         label: "Or".to_string(),
                         ty: DeclarationId(1588),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -27920,13 +26720,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Arithmetic".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1588),
-                    },
-                    Field {
-                        label: "Comparison".to_string(),
-                        ty: DeclarationId(1589),
-=======
                         ty: DeclarationId(1589),
                     },
                     Field {
@@ -27936,11 +26729,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "Logical".to_string(),
                         ty: DeclarationId(1591),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "Logical".to_string(),
-                        ty: DeclarationId(1590),
                     },
                 ],
             },
@@ -27961,22 +26749,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Callable".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1591),
-                    },
-                    Field {
-                        label: "UnresolvedFieldProject".to_string(),
-                        ty: DeclarationId(1592),
-                    },
-                    Field {
-                        label: "ResolvedFieldProject".to_string(),
-                        ty: DeclarationId(1593),
-                    },
-                    Field {
-                        label: "Operator".to_string(),
-                        ty: DeclarationId(1594),
-                    },
-=======
                         ty: DeclarationId(1592),
                     },
                     Field {
@@ -27991,7 +26763,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "Operator".to_string(),
                         ty: DeclarationId(1595),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -28011,19 +26782,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UnresolvedVariant".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1595),
-                    },
-                    Field {
-                        label: "ResolvedVariant".to_string(),
-                        ty: DeclarationId(1596),
-=======
                         ty: DeclarationId(1596),
                     },
                     Field {
                         label: "ResolvedVariant".to_string(),
                         ty: DeclarationId(1597),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -28081,11 +26844,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "binding".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1597),
-=======
                         ty: DeclarationId(1598),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -28221,19 +26980,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "members".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1598),
-                    },
-                    Field {
-                        label: "intra_cluster_calls".to_string(),
-                        ty: DeclarationId(1599),
-=======
                         ty: DeclarationId(1599),
                     },
                     Field {
                         label: "intra_cluster_calls".to_string(),
                         ty: DeclarationId(1600),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -28254,19 +27005,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Cardinality".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1600),
-                    },
-                    Field {
-                        label: "Descent".to_string(),
-                        ty: DeclarationId(1601),
-=======
                         ty: DeclarationId(1601),
                     },
                     Field {
                         label: "Descent".to_string(),
                         ty: DeclarationId(1602),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -28321,11 +27064,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "lane2_workflow".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1602),
-=======
                         ty: DeclarationId(1603),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -28354,11 +27093,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "inputs".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1603),
-=======
                         ty: DeclarationId(1604),
->>>>>>> origin/main
                     },
                     Field {
                         label: "result_port".to_string(),
@@ -28386,11 +27121,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "UserMatch".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1604),
-=======
                     ty: DeclarationId(1605),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -28418,11 +27149,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "paths".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1605),
-=======
                         ty: DeclarationId(1606),
->>>>>>> origin/main
                     },
                     Field {
                         label: "result_port".to_string(),
@@ -28434,11 +27161,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "emit_participation".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1606),
-=======
                         ty: DeclarationId(1607),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -28503,11 +27226,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "UserCallable".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1607),
-=======
                     ty: DeclarationId(1608),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -28539,11 +27258,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "params".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1608),
-=======
                         ty: DeclarationId(1609),
->>>>>>> origin/main
                     },
                     Field {
                         label: "span".to_string(),
@@ -28551,19 +27266,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "lane2_workflow".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1609),
-                    },
-                    Field {
-                        label: "emit_participation".to_string(),
-                        ty: DeclarationId(1610),
-=======
                         ty: DeclarationId(1610),
                     },
                     Field {
                         label: "emit_participation".to_string(),
                         ty: DeclarationId(1611),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -28584,26 +27291,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Value".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1611),
-                    },
-                    Field {
-                        label: "Transform".to_string(),
-                        ty: DeclarationId(1612),
-                    },
-                    Field {
-                        label: "Branch".to_string(),
-                        ty: DeclarationId(1613),
-                    },
-                    Field {
-                        label: "Loop".to_string(),
-                        ty: DeclarationId(1614),
-                    },
-                    Field {
-                        label: "Bind".to_string(),
-                        ty: DeclarationId(1615),
-                    },
-=======
                         ty: DeclarationId(1612),
                     },
                     Field {
@@ -28622,7 +27309,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "Bind".to_string(),
                         ty: DeclarationId(1616),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -28642,22 +27328,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "declarations".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1616),
-                    },
-                    Field {
-                        label: "nodes".to_string(),
-                        ty: DeclarationId(1617),
-                    },
-                    Field {
-                        label: "ports".to_string(),
-                        ty: DeclarationId(1618),
-                    },
-                    Field {
-                        label: "clusters".to_string(),
-                        ty: DeclarationId(1619),
-                    },
-=======
                         ty: DeclarationId(1617),
                     },
                     Field {
@@ -28672,7 +27342,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "clusters".to_string(),
                         ty: DeclarationId(1620),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -28738,11 +27407,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("port".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(722)],
-<<<<<<< HEAD
-                output: DeclarationId(1502),
-=======
                 output: DeclarationId(1503),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22297,
@@ -28764,11 +27429,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("node".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-<<<<<<< HEAD
-                output: DeclarationId(1503),
-=======
                 output: DeclarationId(1504),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22355,
@@ -28790,11 +27451,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("resolve_producer".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(722)],
-<<<<<<< HEAD
-                output: DeclarationId(1504),
-=======
                 output: DeclarationId(1505),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22430,
@@ -28816,11 +27473,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("declaration_by_id".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(723)],
-<<<<<<< HEAD
-                output: DeclarationId(1505),
-=======
                 output: DeclarationId(1506),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22819,
@@ -28842,11 +27495,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("declaration_by_name".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(230)],
-<<<<<<< HEAD
-                output: DeclarationId(1506),
-=======
                 output: DeclarationId(1507),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     23694,
@@ -28868,11 +27517,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("lane2_workflow_at".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-<<<<<<< HEAD
-                output: DeclarationId(1507),
-=======
                 output: DeclarationId(1508),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     24020,
@@ -28896,27 +27541,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "SingleRoot".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1620),
-=======
                         ty: DeclarationId(1621),
                     },
                     Field {
                         label: "NoRoot".to_string(),
                         ty: DeclarationId(1622),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "NoRoot".to_string(),
-                        ty: DeclarationId(1621),
                     },
                     Field {
                         label: "AmbiguousRoot".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1623),
-=======
                         ty: DeclarationId(1624),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -28957,11 +27590,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("miss_declaration_id_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-<<<<<<< HEAD
-                output: DeclarationId(1508),
-=======
                 output: DeclarationId(1509),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     28025,
@@ -28983,11 +27612,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(723)],
-<<<<<<< HEAD
-                output: DeclarationId(1509),
-=======
                 output: DeclarationId(1510),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     28110,
@@ -29030,13 +27655,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ShrinkEffect".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1648),
-                    },
-                    Field {
-                        label: "ProjectionEffect".to_string(),
-                        ty: DeclarationId(1649),
-=======
                         ty: DeclarationId(1649),
                     },
                     Field {
@@ -29046,11 +27664,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "IdentityEffect".to_string(),
                         ty: DeclarationId(1651),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(1650),
                     },
                 ],
             },
@@ -29071,22 +27684,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ShapeConstant".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1651),
-                    },
-                    Field {
-                        label: "ShapeLinearScan".to_string(),
-                        ty: DeclarationId(1652),
-                    },
-                    Field {
-                        label: "ShapeIterateBody".to_string(),
-                        ty: DeclarationId(1653),
-                    },
-                    Field {
-                        label: "ShapeSortBody".to_string(),
-                        ty: DeclarationId(1654),
-                    },
-=======
                         ty: DeclarationId(1652),
                     },
                     Field {
@@ -29101,7 +27698,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "ShapeSortBody".to_string(),
                         ty: DeclarationId(1655),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -29129,13 +27725,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "size_effect".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1655),
-                    },
-                    Field {
-                        label: "cost_shape".to_string(),
-                        ty: DeclarationId(1656),
-=======
                         ty: DeclarationId(1656),
                     },
                     Field {
@@ -29145,11 +27734,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "callback_element_position".to_string(),
                         ty: DeclarationId(1658),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "callback_element_position".to_string(),
-                        ty: DeclarationId(1657),
                     },
                 ],
             },
@@ -29174,11 +27758,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "display_name".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1658),
-=======
                         ty: DeclarationId(1659),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -29235,19 +27815,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DegreeTwo".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1659),
-                    },
-                    Field {
-                        label: "DegreeSuccessor".to_string(),
-                        ty: DeclarationId(1660),
-=======
                         ty: DeclarationId(1660),
                     },
                     Field {
                         label: "DegreeSuccessor".to_string(),
                         ty: DeclarationId(1661),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -29268,29 +27840,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ConstantCost".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1661),
-                    },
-                    Field {
-                        label: "LinearCost".to_string(),
-                        ty: DeclarationId(1662),
-                    },
-                    Field {
-                        label: "PolynomialCost".to_string(),
-                        ty: DeclarationId(1663),
-                    },
-                    Field {
-                        label: "ProductCost".to_string(),
-                        ty: DeclarationId(1665),
-                    },
-                    Field {
-                        label: "SumCost".to_string(),
-                        ty: DeclarationId(1667),
-                    },
-                    Field {
-                        label: "LogCost".to_string(),
-                        ty: DeclarationId(1668),
-=======
                         ty: DeclarationId(1662),
                     },
                     Field {
@@ -29316,11 +27865,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "UnknownCost".to_string(),
                         ty: DeclarationId(1670),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "UnknownCost".to_string(),
-                        ty: DeclarationId(1669),
                     },
                 ],
             },
@@ -29328,11 +27872,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-<<<<<<< HEAD
-            inhabits: Some(DeclarationId(1670)),
-=======
             inhabits: Some(DeclarationId(1671)),
->>>>>>> origin/main
             value_body: None,
             refinement: None,
             nominal_opacity: None,
@@ -29386,11 +27926,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("miss_symbolic_cost_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-<<<<<<< HEAD
-                output: DeclarationId(1624),
-=======
                 output: DeclarationId(1625),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 10963, 10973)),
             },
             type_params: vec![],
@@ -29408,11 +27944,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(849)],
-<<<<<<< HEAD
-                output: DeclarationId(1625),
-=======
                 output: DeclarationId(1626),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 11047, 11062)),
             },
             type_params: vec![],
@@ -29430,11 +27962,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("two_terms".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(849), DeclarationId(849)],
-<<<<<<< HEAD
-                output: DeclarationId(1626),
-=======
                 output: DeclarationId(1627),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(185))),
             },
             type_params: vec![],
@@ -29451,13 +27979,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(855),
             name: Some("many_terms".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(849), DeclarationId(849), DeclarationId(1627)],
-                output: DeclarationId(1628),
-=======
                 inputs: vec![DeclarationId(849), DeclarationId(849), DeclarationId(1628)],
                 output: DeclarationId(1629),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(187))),
             },
             type_params: vec![],
@@ -29582,11 +28105,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(862),
             name: Some("max_path".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1629)],
-=======
                 inputs: vec![DeclarationId(1630)],
->>>>>>> origin/main
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(220))),
             },
@@ -29643,38 +28162,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ClassConstant".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1671),
-                    },
-                    Field {
-                        label: "ClassLog".to_string(),
-                        ty: DeclarationId(1672),
-                    },
-                    Field {
-                        label: "ClassLinear".to_string(),
-                        ty: DeclarationId(1673),
-                    },
-                    Field {
-                        label: "ClassLinearithmic".to_string(),
-                        ty: DeclarationId(1674),
-                    },
-                    Field {
-                        label: "ClassQuadratic".to_string(),
-                        ty: DeclarationId(1675),
-                    },
-                    Field {
-                        label: "ClassPolynomial".to_string(),
-                        ty: DeclarationId(1676),
-                    },
-                    Field {
-                        label: "ClassExponential".to_string(),
-                        ty: DeclarationId(1677),
-                    },
-                    Field {
-                        label: "ClassUnknown".to_string(),
-                        ty: DeclarationId(1678),
-                    },
-=======
                         ty: DeclarationId(1672),
                     },
                     Field {
@@ -29705,18 +28192,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "ClassUnknown".to_string(),
                         ty: DeclarationId(1679),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-<<<<<<< HEAD
-            inhabits: Some(DeclarationId(1679)),
-=======
             inhabits: Some(DeclarationId(1680)),
->>>>>>> origin/main
             value_body: None,
             refinement: None,
             nominal_opacity: None,
@@ -29816,13 +28298,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(871),
             name: Some("nsl_to_list".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1630)],
-                output: DeclarationId(1631),
-=======
                 inputs: vec![DeclarationId(1631)],
                 output: DeclarationId(1632),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(366))),
             },
             type_params: vec![],
@@ -29839,13 +28316,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(872),
             name: Some("drop_additive_zero".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1632)],
-                output: DeclarationId(1633),
-=======
                 inputs: vec![DeclarationId(1633)],
                 output: DeclarationId(1634),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(379))),
             },
             type_params: vec![],
@@ -29862,13 +28334,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(873),
             name: Some("collapse_on_multiplicative_zero".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1634)],
-                output: DeclarationId(1635),
-=======
                 inputs: vec![DeclarationId(1635)],
                 output: DeclarationId(1636),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(386))),
             },
             type_params: vec![],
@@ -29885,11 +28352,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(874),
             name: Some("any_zero".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1636)],
-=======
                 inputs: vec![DeclarationId(1637)],
->>>>>>> origin/main
                 output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(395))),
             },
@@ -29907,13 +28370,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(875),
             name: Some("drop_multiplicative_one".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1637)],
-                output: DeclarationId(1638),
-=======
                 inputs: vec![DeclarationId(1638)],
                 output: DeclarationId(1639),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(408))),
             },
             type_params: vec![],
@@ -29966,11 +28424,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(878),
             name: Some("reduce_sum".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1639)],
-=======
                 inputs: vec![DeclarationId(1640)],
->>>>>>> origin/main
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(440))),
             },
@@ -29988,11 +28442,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(879),
             name: Some("wrap_sum".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1640)],
-=======
                 inputs: vec![DeclarationId(1641)],
->>>>>>> origin/main
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(452))),
             },
@@ -30010,11 +28460,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(880),
             name: Some("reduce_product".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1641)],
-=======
                 inputs: vec![DeclarationId(1642)],
->>>>>>> origin/main
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(469))),
             },
@@ -30163,13 +28609,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(888),
             name: Some("filter_not_dominated_by".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1642), DeclarationId(849)],
-                output: DeclarationId(1643),
-=======
                 inputs: vec![DeclarationId(1643), DeclarationId(849)],
                 output: DeclarationId(1644),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(517))),
             },
             type_params: vec![],
@@ -30186,13 +28627,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(889),
             name: Some("drop_dominated_step".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1644), DeclarationId(849)],
-                output: DeclarationId(1645),
-=======
                 inputs: vec![DeclarationId(1645), DeclarationId(849)],
                 output: DeclarationId(1646),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(524))),
             },
             type_params: vec![],
@@ -30209,13 +28645,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(890),
             name: Some("drop_dominated".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1646)],
-                output: DeclarationId(1647),
-=======
                 inputs: vec![DeclarationId(1647)],
                 output: DeclarationId(1648),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(527))),
             },
             type_params: vec![],
@@ -30235,17 +28666,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 inputs: vec![
                     DeclarationId(147),
                     DeclarationId(230),
-<<<<<<< HEAD
-                    DeclarationId(1707),
-                    DeclarationId(93),
-                    DeclarationId(1708),
-                    DeclarationId(1709),
-=======
                     DeclarationId(1708),
                     DeclarationId(93),
                     DeclarationId(1709),
                     DeclarationId(1710),
->>>>>>> origin/main
                 ],
                 output: DeclarationId(912),
                 body: ArrowBody::Unparsed(SourceSpan::new(
@@ -30276,11 +28700,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-<<<<<<< HEAD
-            meta_tag: Some(DeclarationId(1710)),
-=======
             meta_tag: Some(DeclarationId(1711)),
->>>>>>> origin/main
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![])),
@@ -30295,19 +28715,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UserMessage".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1712),
-                    },
-                    Field {
-                        label: "AssistantMessage".to_string(),
-                        ty: DeclarationId(1714),
-=======
                         ty: DeclarationId(1713),
                     },
                     Field {
                         label: "AssistantMessage".to_string(),
                         ty: DeclarationId(1715),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -30328,19 +28740,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Base64Image".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1715),
-                    },
-                    Field {
-                        label: "UrlImage".to_string(),
-                        ty: DeclarationId(1716),
-=======
                         ty: DeclarationId(1716),
                     },
                     Field {
                         label: "UrlImage".to_string(),
                         ty: DeclarationId(1717),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -30361,19 +28765,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "TextContent".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1717),
-                    },
-                    Field {
-                        label: "ImageContent".to_string(),
-                        ty: DeclarationId(1718),
-=======
                         ty: DeclarationId(1718),
                     },
                     Field {
                         label: "ImageContent".to_string(),
                         ty: DeclarationId(1719),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -30432,19 +28828,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ToolResultText".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1719),
-                    },
-                    Field {
-                        label: "ToolResultBlocks".to_string(),
-                        ty: DeclarationId(1721),
-=======
                         ty: DeclarationId(1720),
                     },
                     Field {
                         label: "ToolResultBlocks".to_string(),
                         ty: DeclarationId(1722),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -30464,11 +28852,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Text".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1722),
-=======
                     ty: DeclarationId(1723),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -30487,11 +28871,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "TextPlain".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1723),
-=======
                     ty: DeclarationId(1724),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -30536,25 +28916,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "AnthropicTextBlock".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1724),
-                    },
-                    Field {
-                        label: "AnthropicImageBlock".to_string(),
-                        ty: DeclarationId(1725),
-                    },
-                    Field {
-                        label: "AnthropicDocumentBlock".to_string(),
-                        ty: DeclarationId(1726),
-                    },
-                    Field {
-                        label: "AnthropicSearchResultBlock".to_string(),
-                        ty: DeclarationId(1730),
-                    },
-                    Field {
-                        label: "AnthropicToolReferenceBlock".to_string(),
-                        ty: DeclarationId(1731),
-=======
                         ty: DeclarationId(1725),
                     },
                     Field {
@@ -30572,7 +28933,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "AnthropicToolReferenceBlock".to_string(),
                         ty: DeclarationId(1732),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -30622,19 +28982,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UserTextBlock".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1732),
-                    },
-                    Field {
-                        label: "UserToolResultBlock".to_string(),
-                        ty: DeclarationId(1735),
-=======
                         ty: DeclarationId(1733),
                     },
                     Field {
                         label: "UserToolResultBlock".to_string(),
                         ty: DeclarationId(1736),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -30655,19 +29007,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "AssistantTextBlock".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1736),
-                    },
-                    Field {
-                        label: "AssistantToolUseBlock".to_string(),
-                        ty: DeclarationId(1737),
-=======
                         ty: DeclarationId(1737),
                     },
                     Field {
                         label: "AssistantToolUseBlock".to_string(),
                         ty: DeclarationId(1738),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -30688,34 +29032,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "EndTurn".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1738),
-                    },
-                    Field {
-                        label: "MaxTokens".to_string(),
-                        ty: DeclarationId(1739),
-                    },
-                    Field {
-                        label: "StopSequence".to_string(),
-                        ty: DeclarationId(1740),
-                    },
-                    Field {
-                        label: "ToolUse".to_string(),
-                        ty: DeclarationId(1741),
-                    },
-                    Field {
-                        label: "PauseTurn".to_string(),
-                        ty: DeclarationId(1742),
-                    },
-                    Field {
-                        label: "Refusal".to_string(),
-                        ty: DeclarationId(1743),
-                    },
-                    Field {
-                        label: "ModelContextWindowExceeded".to_string(),
-                        ty: DeclarationId(1744),
-                    },
-=======
                         ty: DeclarationId(1739),
                     },
                     Field {
@@ -30742,7 +29058,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "ModelContextWindowExceeded".to_string(),
                         ty: DeclarationId(1745),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -30762,25 +29077,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "CharLocation".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1747),
-                    },
-                    Field {
-                        label: "PageLocation".to_string(),
-                        ty: DeclarationId(1750),
-                    },
-                    Field {
-                        label: "ContentBlockLocation".to_string(),
-                        ty: DeclarationId(1753),
-                    },
-                    Field {
-                        label: "WebSearchResultLocation".to_string(),
-                        ty: DeclarationId(1755),
-                    },
-                    Field {
-                        label: "SearchResultLocation".to_string(),
-                        ty: DeclarationId(1757),
-=======
                         ty: DeclarationId(1748),
                     },
                     Field {
@@ -30794,7 +29090,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "WebSearchResultLocation".to_string(),
                         ty: DeclarationId(1756),
->>>>>>> origin/main
                     },
                     Field {
                         label: "SearchResultLocation".to_string(),
@@ -30819,29 +29114,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "MessagesTextBlock".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1760),
-                    },
-                    Field {
-                        label: "MessagesThinkingBlock".to_string(),
-                        ty: DeclarationId(1761),
-                    },
-                    Field {
-                        label: "MessagesRedactedThinkingBlock".to_string(),
-                        ty: DeclarationId(1762),
-                    },
-                    Field {
-                        label: "MessagesToolUseBlock".to_string(),
-                        ty: DeclarationId(1764),
-                    },
-                    Field {
-                        label: "MessagesServerToolUseBlock".to_string(),
-                        ty: DeclarationId(1766),
-                    },
-                    Field {
-                        label: "MessagesWebSearchToolResultBlock".to_string(),
-                        ty: DeclarationId(1768),
-=======
                         ty: DeclarationId(1761),
                     },
                     Field {
@@ -30859,7 +29131,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "MessagesServerToolUseBlock".to_string(),
                         ty: DeclarationId(1767),
->>>>>>> origin/main
                     },
                     Field {
                         label: "MessagesWebSearchToolResultBlock".to_string(),
@@ -30884,38 +29155,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "WebSearch".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1769),
-                    },
-                    Field {
-                        label: "WebFetch".to_string(),
-                        ty: DeclarationId(1770),
-                    },
-                    Field {
-                        label: "CodeExecution".to_string(),
-                        ty: DeclarationId(1771),
-                    },
-                    Field {
-                        label: "BashCodeExecution".to_string(),
-                        ty: DeclarationId(1772),
-                    },
-                    Field {
-                        label: "TextEditorCodeExecution".to_string(),
-                        ty: DeclarationId(1773),
-                    },
-                    Field {
-                        label: "ToolSearchToolRegex".to_string(),
-                        ty: DeclarationId(1774),
-                    },
-                    Field {
-                        label: "ToolSearchToolBm25".to_string(),
-                        ty: DeclarationId(1775),
-                    },
-                    Field {
-                        label: "Advisor".to_string(),
-                        ty: DeclarationId(1776),
-                    },
-=======
                         ty: DeclarationId(1770),
                     },
                     Field {
@@ -30946,7 +29185,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "Advisor".to_string(),
                         ty: DeclarationId(1777),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -30974,13 +29212,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "cache_creation_input_tokens".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1777),
-                    },
-                    Field {
-                        label: "cache_read_input_tokens".to_string(),
-                        ty: DeclarationId(1778),
-=======
                         ty: DeclarationId(1778),
                     },
                     Field {
@@ -30990,11 +29221,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "service_tier".to_string(),
                         ty: DeclarationId(1780),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "service_tier".to_string(),
-                        ty: DeclarationId(1779),
                     },
                 ],
             },
@@ -31014,11 +29240,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Assistant".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1780),
-=======
                     ty: DeclarationId(1781),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -31050,11 +29272,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "content".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1781),
-=======
                         ty: DeclarationId(1782),
->>>>>>> origin/main
                     },
                     Field {
                         label: "model".to_string(),
@@ -31066,11 +29284,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "stop_sequence".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1782),
-=======
                         ty: DeclarationId(1783),
->>>>>>> origin/main
                     },
                     Field {
                         label: "usage".to_string(),
@@ -31078,11 +29292,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "container".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1783),
-=======
                         ty: DeclarationId(1784),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -31132,26 +29342,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "StdAuthority".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1784),
-                    },
-                    Field {
-                        label: "V3StdAuthority".to_string(),
-                        ty: DeclarationId(1785),
-                    },
-                    Field {
-                        label: "V3SpecAuthority".to_string(),
-                        ty: DeclarationId(1786),
-                    },
-                    Field {
-                        label: "CompilerAuthority".to_string(),
-                        ty: DeclarationId(1787),
-                    },
-                    Field {
-                        label: "ExtdepsFixtureAuthority".to_string(),
-                        ty: DeclarationId(1788),
-                    },
-=======
                         ty: DeclarationId(1785),
                     },
                     Field {
@@ -31170,7 +29360,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "ExtdepsFixtureAuthority".to_string(),
                         ty: DeclarationId(1789),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -31226,759 +29415,483 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "dsl/std/logic.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1784),
-=======
                             constructor: DeclarationId(1785),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/bit.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1784),
-=======
                             constructor: DeclarationId(1785),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/error_primitives.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1784),
-=======
                             constructor: DeclarationId(1785),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/algebra.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1784),
-=======
                             constructor: DeclarationId(1785),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/magnitude.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1784),
-=======
                             constructor: DeclarationId(1785),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/machine_constraints.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1784),
-=======
                             constructor: DeclarationId(1785),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/nat.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1784),
-=======
                             constructor: DeclarationId(1785),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/integer.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1784),
-=======
                             constructor: DeclarationId(1785),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/rational.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1784),
-=======
                             constructor: DeclarationId(1785),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/float.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1784),
-=======
                             constructor: DeclarationId(1785),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/types.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1784),
-=======
                             constructor: DeclarationId(1785),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/string_type.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1784),
-=======
                             constructor: DeclarationId(1785),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/unicode.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1784),
-=======
                             constructor: DeclarationId(1785),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/render_repeat_string_bootstrap.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1784),
-=======
                             constructor: DeclarationId(1785),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/methods.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1784),
-=======
                             constructor: DeclarationId(1785),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/serialization.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1784),
-=======
                             constructor: DeclarationId(1785),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/algebra.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_messages.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_operations.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_schema.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/approximate_field.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bin_shim.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bootstrap_authority.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bridge_ledger.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/clean_emission.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/computation.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/computation_model.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/coproduct_projection.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/cross_target_coverage.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/diagnostics.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/dimensions.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/effects.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/emission_provenance.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/emit_model.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/extdeps_bootstrap_fixtures.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/go_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/induction.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/integer_diagnostic_order.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lens.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lens_application.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/list.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lookup.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/methods.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/parse_surface.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/python_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/resources.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/runtime.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/rust_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/services.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/substrate.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/substrate_minimal.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/termination.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/t_ci_workflow_as_data_demo.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/timing_lens.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/tokenize.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/verification.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/workflows.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1785),
-=======
                             constructor: DeclarationId(1786),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/v3_l1.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1786),
-=======
                             constructor: DeclarationId(1787),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/go.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1786),
-=======
                             constructor: DeclarationId(1787),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/python.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1786),
-=======
                             constructor: DeclarationId(1787),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/rust.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1786),
-=======
                             constructor: DeclarationId(1787),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/pipeline.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1787),
-=======
                             constructor: DeclarationId(1788),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/operators.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1787),
-=======
                             constructor: DeclarationId(1788),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/regen.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1787),
-=======
                             constructor: DeclarationId(1788),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/languages/rust/primitives.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1788),
-=======
                             constructor: DeclarationId(1789),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/cron_schedule_model.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1788),
-=======
                             constructor: DeclarationId(1789),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/github/github.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1788),
-=======
                             constructor: DeclarationId(1789),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/github/actions.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1788),
-=======
                             constructor: DeclarationId(1789),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/github/ci.dag".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1788),
-=======
                             constructor: DeclarationId(1789),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -31996,19 +29909,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Retired".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1789),
-                    },
-                    Field {
-                        label: "Open".to_string(),
-                        ty: DeclarationId(1790),
-=======
                         ty: DeclarationId(1790),
                     },
                     Field {
                         label: "Open".to_string(),
                         ty: DeclarationId(1791),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -32074,11 +29979,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6389, 6499),
         });
-<<<<<<< HEAD
-        declarations.push(Declaration { id: DeclarationId(920), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(919) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1791)), 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(1790), 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(1789), 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(1789), 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(1789), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-pb-bridge-canonical-lens-name-dispatch-closure.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(1789), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/l1_5_fixed_point_test.rs".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(1789), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/bridge_lower_helpers_patch_zero_residual_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_semantic_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1790), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-v-bridge-row-4-exact-string-deeper-detail-receipt.md".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6963, 8416) });
-=======
         declarations.push(Declaration { id: DeclarationId(920), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(919) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1792)), 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(1791), 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(1790), 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(1790), 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(1790), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-pb-bridge-canonical-lens-name-dispatch-closure.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(1790), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/l1_5_fixed_point_test.rs".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(1790), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/bridge_lower_helpers_patch_zero_residual_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_semantic_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1791), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-v-bridge-row-4-exact-string-deeper-detail-receipt.md".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6963, 8416) });
->>>>>>> origin/main
         declarations.push(Declaration {
             id: DeclarationId(921),
             name: Some("CleanEmissionContract".to_string()),
@@ -32164,13 +30065,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "WrapEverything".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1792),
-                    },
-                    Field {
-                        label: "WrapOnlyInOperandPosition".to_string(),
-                        ty: DeclarationId(1793),
-=======
                         ty: DeclarationId(1793),
                     },
                     Field {
@@ -32180,11 +30074,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "NoWrapping".to_string(),
                         ty: DeclarationId(1795),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "NoWrapping".to_string(),
-                        ty: DeclarationId(1794),
                     },
                 ],
             },
@@ -32205,22 +30094,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "EmitBindingAlways".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1795),
-                    },
-                    Field {
-                        label: "EmitUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(1796),
-                    },
-                    Field {
-                        label: "EmitPrefixedUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(1797),
-                    },
-                    Field {
-                        label: "NotApplicablePatternBinding".to_string(),
-                        ty: DeclarationId(1798),
-                    },
-=======
                         ty: DeclarationId(1796),
                     },
                     Field {
@@ -32235,7 +30108,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "NotApplicablePatternBinding".to_string(),
                         ty: DeclarationId(1799),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -32255,19 +30127,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "AccessFromPayloadBinding".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1799),
-                    },
-                    Field {
-                        label: "OverrideNamedFieldsAtBindingSite".to_string(),
-                        ty: DeclarationId(1800),
-=======
                         ty: DeclarationId(1800),
                     },
                     Field {
                         label: "OverrideNamedFieldsAtBindingSite".to_string(),
                         ty: DeclarationId(1801),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -32288,13 +30152,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ImportEverythingDeclared".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1801),
-                    },
-                    Field {
-                        label: "IncludeOnlyReferenced".to_string(),
-                        ty: DeclarationId(1802),
-=======
                         ty: DeclarationId(1802),
                     },
                     Field {
@@ -32304,11 +30161,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "ImportPerUsageSite".to_string(),
                         ty: DeclarationId(1804),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "ImportPerUsageSite".to_string(),
-                        ty: DeclarationId(1803),
                     },
                 ],
             },
@@ -32329,13 +30181,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "WrapReturnValue".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1804),
-                    },
-                    Field {
-                        label: "NoWrappingOnTerminalExpression".to_string(),
-                        ty: DeclarationId(1805),
-=======
                         ty: DeclarationId(1805),
                     },
                     Field {
@@ -32345,11 +30190,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "ExplicitReturnKeyword".to_string(),
                         ty: DeclarationId(1807),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "ExplicitReturnKeyword".to_string(),
-                        ty: DeclarationId(1806),
                     },
                 ],
             },
@@ -32370,13 +30210,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "EmitLetBindingAlways".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1807),
-                    },
-                    Field {
-                        label: "EmitLetUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(1808),
-=======
                         ty: DeclarationId(1808),
                     },
                     Field {
@@ -32386,11 +30219,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "OmitLetBinding".to_string(),
                         ty: DeclarationId(1810),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "OmitLetBinding".to_string(),
-                        ty: DeclarationId(1809),
                     },
                 ],
             },
@@ -32411,13 +30239,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "WrapBody".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1810),
-                    },
-                    Field {
-                        label: "NoWrappingOnNonComplexBody".to_string(),
-                        ty: DeclarationId(1811),
-=======
                         ty: DeclarationId(1811),
                     },
                     Field {
@@ -32427,11 +30248,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "NotApplicableMatchArmBody".to_string(),
                         ty: DeclarationId(1813),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "NotApplicableMatchArmBody".to_string(),
-                        ty: DeclarationId(1812),
                     },
                 ],
             },
@@ -32489,11 +30305,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "args".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1813),
-=======
                         ty: DeclarationId(1814),
->>>>>>> origin/main
                     },
                     Field {
                         label: "syntax_only".to_string(),
@@ -32526,22 +30338,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IgnoreVerifierOutput".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1814),
-                    },
-                    Field {
-                        label: "RequireEmptyStdout".to_string(),
-                        ty: DeclarationId(1815),
-                    },
-                    Field {
-                        label: "RequireEmptyStderr".to_string(),
-                        ty: DeclarationId(1816),
-                    },
-                    Field {
-                        label: "RequireEmptyStdoutAndStderr".to_string(),
-                        ty: DeclarationId(1817),
-                    },
-=======
                         ty: DeclarationId(1815),
                     },
                     Field {
@@ -32556,7 +30352,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "RequireEmptyStdoutAndStderr".to_string(),
                         ty: DeclarationId(1818),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -32576,38 +30371,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "CollectionSize".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1824),
-                    },
-                    Field {
-                        label: "ParserStreamSize".to_string(),
-                        ty: DeclarationId(1825),
-                    },
-                    Field {
-                        label: "WorklistDrainSize".to_string(),
-                        ty: DeclarationId(1826),
-                    },
-                    Field {
-                        label: "TreeSize".to_string(),
-                        ty: DeclarationId(1827),
-                    },
-                    Field {
-                        label: "ArithmeticParam".to_string(),
-                        ty: DeclarationId(1828),
-                    },
-                    Field {
-                        label: "ExplicitCountZero".to_string(),
-                        ty: DeclarationId(1829),
-                    },
-                    Field {
-                        label: "ExplicitCountPositive".to_string(),
-                        ty: DeclarationId(1830),
-                    },
-                    Field {
-                        label: "Forever".to_string(),
-                        ty: DeclarationId(1831),
-                    },
-=======
                         ty: DeclarationId(1825),
                     },
                     Field {
@@ -32638,7 +30401,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "Forever".to_string(),
                         ty: DeclarationId(1832),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -32680,38 +30442,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ChildAccessorCall".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1832),
-                    },
-                    Field {
-                        label: "CollectionShrinkCall".to_string(),
-                        ty: DeclarationId(1833),
-                    },
-                    Field {
-                        label: "ArithmeticSubtractCall".to_string(),
-                        ty: DeclarationId(1834),
-                    },
-                    Field {
-                        label: "ArithmeticDivideCall".to_string(),
-                        ty: DeclarationId(1835),
-                    },
-                    Field {
-                        label: "ParserAdvanceCall".to_string(),
-                        ty: DeclarationId(1836),
-                    },
-                    Field {
-                        label: "WorklistDrainCall".to_string(),
-                        ty: DeclarationId(1837),
-                    },
-                    Field {
-                        label: "FoldBodyCall".to_string(),
-                        ty: DeclarationId(1838),
-                    },
-                    Field {
-                        label: "SameArgumentCall".to_string(),
-                        ty: DeclarationId(1839),
-                    },
-=======
                         ty: DeclarationId(1833),
                     },
                     Field {
@@ -32742,7 +30472,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "SameArgumentCall".to_string(),
                         ty: DeclarationId(1840),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -32760,11 +30489,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("per_call_pattern_at".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-<<<<<<< HEAD
-                output: DeclarationId(1818),
-=======
                 output: DeclarationId(1819),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     2764,
@@ -32786,11 +30511,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("per_call_descent_operand_port".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-<<<<<<< HEAD
-                output: DeclarationId(1819),
-=======
                 output: DeclarationId(1820),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     2969,
@@ -32814,13 +30535,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UnitShrink".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1840),
-                    },
-                    Field {
-                        label: "ConstantShrink".to_string(),
-                        ty: DeclarationId(1841),
-=======
                         ty: DeclarationId(1841),
                     },
                     Field {
@@ -32830,11 +30544,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "ProportionalShrink".to_string(),
                         ty: DeclarationId(1843),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "ProportionalShrink".to_string(),
-                        ty: DeclarationId(1842),
                     },
                 ],
             },
@@ -32855,13 +30564,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Fold".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1843),
-                    },
-                    Field {
-                        label: "Descend".to_string(),
-                        ty: DeclarationId(1844),
-=======
                         ty: DeclarationId(1844),
                     },
                     Field {
@@ -32871,11 +30573,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "Repeat".to_string(),
                         ty: DeclarationId(1846),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "Repeat".to_string(),
-                        ty: DeclarationId(1845),
                     },
                 ],
             },
@@ -32908,11 +30605,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "factor".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1846),
-=======
                         ty: DeclarationId(1847),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -32953,11 +30646,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("size_bound_param".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(933)],
-<<<<<<< HEAD
-                output: DeclarationId(1820),
-=======
                 output: DeclarationId(1821),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     5787,
@@ -33023,11 +30712,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("constant_bound_value".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(933)],
-<<<<<<< HEAD
-                output: DeclarationId(1821),
-=======
                 output: DeclarationId(1822),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     6715,
@@ -33051,13 +30736,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "TreeDescent".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1847),
-                    },
-                    Field {
-                        label: "CollectionFold".to_string(),
-                        ty: DeclarationId(1848),
-=======
                         ty: DeclarationId(1848),
                     },
                     Field {
@@ -33067,11 +30745,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "ArithmeticRepeat".to_string(),
                         ty: DeclarationId(1850),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "ArithmeticRepeat".to_string(),
-                        ty: DeclarationId(1849),
                     },
                 ],
             },
@@ -33090,11 +30763,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("algebra_profile_to_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(53)],
-<<<<<<< HEAD
-                output: DeclarationId(1822),
-=======
                 output: DeclarationId(1823),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     7781,
@@ -33116,11 +30785,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("type_iteration_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230)],
-<<<<<<< HEAD
-                output: DeclarationId(1823),
-=======
                 output: DeclarationId(1824),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     8346,
@@ -33144,19 +30809,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Immutable".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1850),
-                    },
-                    Field {
-                        label: "Mutable".to_string(),
-                        ty: DeclarationId(1851),
-=======
                         ty: DeclarationId(1851),
                     },
                     Field {
                         label: "Mutable".to_string(),
                         ty: DeclarationId(1852),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -33177,19 +30834,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Pure".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1852),
-                    },
-                    Field {
-                        label: "Effectful".to_string(),
-                        ty: DeclarationId(1853),
-=======
                         ty: DeclarationId(1853),
                     },
                     Field {
                         label: "Effectful".to_string(),
                         ty: DeclarationId(1854),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -33210,19 +30859,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ExplicitDAG".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1854),
-                    },
-                    Field {
-                        label: "Arbitrary".to_string(),
-                        ty: DeclarationId(1855),
-=======
                         ty: DeclarationId(1855),
                     },
                     Field {
                         label: "Arbitrary".to_string(),
                         ty: DeclarationId(1856),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -33243,19 +30884,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Bounded".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1856),
-                    },
-                    Field {
-                        label: "Unbounded".to_string(),
-                        ty: DeclarationId(1857),
-=======
                         ty: DeclarationId(1857),
                     },
                     Field {
                         label: "Unbounded".to_string(),
                         ty: DeclarationId(1858),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -33319,44 +30952,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "mutability".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1850),
-=======
                             constructor: DeclarationId(1851),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "purity".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1852),
-=======
                             constructor: DeclarationId(1853),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "structure".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1854),
-=======
                             constructor: DeclarationId(1855),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "iteration".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1856),
-=======
                             constructor: DeclarationId(1857),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -33373,22 +30990,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ValueOnly".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1858),
-                    },
-                    Field {
-                        label: "GarbageCollected".to_string(),
-                        ty: DeclarationId(1859),
-                    },
-                    Field {
-                        label: "RefCounted".to_string(),
-                        ty: DeclarationId(1860),
-                    },
-                    Field {
-                        label: "OwnershipBased".to_string(),
-                        ty: DeclarationId(1861),
-                    },
-=======
                         ty: DeclarationId(1859),
                     },
                     Field {
@@ -33403,7 +31004,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "OwnershipBased".to_string(),
                         ty: DeclarationId(1862),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -33423,19 +31023,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LexicalScoping".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1862),
-                    },
-                    Field {
-                        label: "DynamicScoping".to_string(),
-                        ty: DeclarationId(1863),
-=======
                         ty: DeclarationId(1863),
                     },
                     Field {
                         label: "DynamicScoping".to_string(),
                         ty: DeclarationId(1864),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -33480,11 +31072,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "excluded_prefixes".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1864),
-=======
                     ty: DeclarationId(1865),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -33508,11 +31096,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "additional_excluded_prefixes".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1865),
-=======
                         ty: DeclarationId(1866),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -33560,19 +31144,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "OwnershipBased".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1866),
-                    },
-                    Field {
-                        label: "GarbageCollected".to_string(),
-                        ty: DeclarationId(1867),
-=======
                         ty: DeclarationId(1867),
                     },
                     Field {
                         label: "GarbageCollected".to_string(),
                         ty: DeclarationId(1868),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -33609,11 +31185,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "StringTag".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1868),
-=======
                     ty: DeclarationId(1869),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -33633,19 +31205,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Empty".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1869),
-                    },
-                    Field {
-                        label: "Populated".to_string(),
-                        ty: DeclarationId(1870),
-=======
                         ty: DeclarationId(1870),
                     },
                     Field {
                         label: "Populated".to_string(),
                         ty: DeclarationId(1871),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -33699,11 +31263,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "variant_projections".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1871),
-=======
                         ty: DeclarationId(1872),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -33804,30 +31364,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Atom".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1872),
-                    },
-                    Field {
-                        label: "Conj".to_string(),
-                        ty: DeclarationId(1873),
-                    },
-                    Field {
-                        label: "Disj".to_string(),
-                        ty: DeclarationId(1874),
-                    },
-                    Field {
-                        label: "Arrow".to_string(),
-                        ty: DeclarationId(1875),
-                    },
-                    Field {
-                        label: "Cardinality".to_string(),
-                        ty: DeclarationId(1876),
-                    },
-                    Field {
-                        label: "Instantiation".to_string(),
-                        ty: DeclarationId(1877),
-                    },
-=======
                         ty: DeclarationId(1873),
                     },
                     Field {
@@ -33850,7 +31386,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "Instantiation".to_string(),
                         ty: DeclarationId(1878),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -33870,26 +31405,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Value".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1878),
-                    },
-                    Field {
-                        label: "Transform".to_string(),
-                        ty: DeclarationId(1879),
-                    },
-                    Field {
-                        label: "Branch".to_string(),
-                        ty: DeclarationId(1880),
-                    },
-                    Field {
-                        label: "Loop".to_string(),
-                        ty: DeclarationId(1881),
-                    },
-                    Field {
-                        label: "Bind".to_string(),
-                        ty: DeclarationId(1882),
-                    },
-=======
                         ty: DeclarationId(1879),
                     },
                     Field {
@@ -33908,7 +31423,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "Bind".to_string(),
                         ty: DeclarationId(1883),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -33982,11 +31496,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "cells".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1883),
-=======
                         ty: DeclarationId(1884),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -34012,11 +31522,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-<<<<<<< HEAD
-            meta_tag: Some(DeclarationId(1884)),
-=======
             meta_tag: Some(DeclarationId(1885)),
->>>>>>> origin/main
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -34043,22 +31549,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34088,22 +31586,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34133,22 +31623,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34178,22 +31660,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34223,22 +31697,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34268,22 +31734,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34313,22 +31771,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34358,22 +31808,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34403,22 +31845,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34448,22 +31882,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34493,22 +31919,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34538,22 +31956,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34583,22 +31993,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34628,22 +32030,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34673,22 +32067,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34718,22 +32104,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34763,22 +32141,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34808,22 +32178,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34853,22 +32215,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34898,22 +32252,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34943,22 +32289,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -34988,22 +32326,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35033,22 +32363,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35078,22 +32400,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35123,22 +32437,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35168,22 +32474,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35213,22 +32511,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35258,22 +32548,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35303,22 +32585,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35348,22 +32622,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35393,22 +32659,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35438,22 +32696,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35483,22 +32733,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35528,22 +32770,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35573,22 +32807,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35618,22 +32844,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35663,22 +32881,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35708,22 +32918,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35753,22 +32955,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35798,22 +32992,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35843,22 +33029,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1876),
-=======
                                     constructor: DeclarationId(1877),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-<<<<<<< HEAD
-                                    constructor: DeclarationId(1879),
-=======
                                     constructor: DeclarationId(1880),
->>>>>>> origin/main
                                     payload: vec![],
                                 },
                             ),
@@ -35877,46 +33055,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1885),
-                    },
-                    Field {
-                        label: "ParseError".to_string(),
-                        ty: DeclarationId(1886),
-                    },
-                    Field {
-                        label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(1887),
-                    },
-                    Field {
-                        label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(1888),
-                    },
-                    Field {
-                        label: "ResolveError".to_string(),
-                        ty: DeclarationId(1889),
-                    },
-                    Field {
-                        label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(1890),
-                    },
-                    Field {
-                        label: "BranchConditionNotBool".to_string(),
-                        ty: DeclarationId(1891),
-                    },
-                    Field {
-                        label: "MagnitudeOutOfRange".to_string(),
-                        ty: DeclarationId(1892),
-                    },
-                    Field {
-                        label: "MalformedIntegerRangeFact".to_string(),
-                        ty: DeclarationId(1893),
-                    },
-                    Field {
-                        label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(1894),
-                    },
-=======
                         ty: DeclarationId(1886),
                     },
                     Field {
@@ -35955,7 +33093,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "NominalOpacityViolation".to_string(),
                         ty: DeclarationId(1895),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -36048,19 +33185,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "CompilerKind".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1895),
-                    },
-                    Field {
-                        label: "LensInstanceKind".to_string(),
-                        ty: DeclarationId(1896),
-=======
                         ty: DeclarationId(1896),
                     },
                     Field {
                         label: "LensInstanceKind".to_string(),
                         ty: DeclarationId(1897),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -36093,11 +33222,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "fixes".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1897),
-=======
                         ty: DeclarationId(1898),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -36118,34 +33243,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UnderRefined".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1898),
-                    },
-                    Field {
-                        label: "NoInhabitant".to_string(),
-                        ty: DeclarationId(1899),
-                    },
-                    Field {
-                        label: "ContradictoryUse".to_string(),
-                        ty: DeclarationId(1901),
-                    },
-                    Field {
-                        label: "OutOfR2Scope".to_string(),
-                        ty: DeclarationId(1902),
-                    },
-                    Field {
-                        label: "LifetimeProgramExtractionPending".to_string(),
-                        ty: DeclarationId(1903),
-                    },
-                    Field {
-                        label: "FoldNotImplemented".to_string(),
-                        ty: DeclarationId(1904),
-                    },
-                    Field {
-                        label: "MissingEmissionPath".to_string(),
-                        ty: DeclarationId(1905),
-                    },
-=======
                         ty: DeclarationId(1899),
                     },
                     Field {
@@ -36172,7 +33269,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "MissingEmissionPath".to_string(),
                         ty: DeclarationId(1906),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -36192,19 +33288,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Inhabits".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1920),
-                    },
-                    Field {
-                        label: "Violates".to_string(),
-                        ty: DeclarationId(1921),
-=======
                         ty: DeclarationId(1921),
                     },
                     Field {
                         label: "Violates".to_string(),
                         ty: DeclarationId(1922),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -36239,19 +33327,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NoDiagnostic".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1922),
-                    },
-                    Field {
-                        label: "SomeDiagnostic".to_string(),
-                        ty: DeclarationId(1923),
-=======
                         ty: DeclarationId(1923),
                     },
                     Field {
                         label: "SomeDiagnostic".to_string(),
                         ty: DeclarationId(1924),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -36272,19 +33352,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DimensionOk".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1926),
-                    },
-                    Field {
-                        label: "DimensionFail".to_string(),
-                        ty: DeclarationId(1930),
-=======
                         ty: DeclarationId(1927),
                     },
                     Field {
                         label: "DimensionFail".to_string(),
                         ty: DeclarationId(1931),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -36323,13 +33395,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "witness_of".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1932),
-                    },
-                    Field {
-                        label: "compose".to_string(),
-                        ty: DeclarationId(1933),
-=======
                         ty: DeclarationId(1933),
                     },
                     Field {
@@ -36339,11 +33404,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "break_diagnostic".to_string(),
                         ty: DeclarationId(1935),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "break_diagnostic".to_string(),
-                        ty: DeclarationId(1934),
                     },
                 ],
             },
@@ -36383,11 +33443,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             type_params: vec![DeclarationId(992), DeclarationId(993)],
             phantom_params: vec![PhantomParameter {
                 parameter: DeclarationId(992),
-<<<<<<< HEAD
-                algebra: DeclarationId(1935),
-=======
                 algebra: DeclarationId(1936),
->>>>>>> origin/main
             }],
             meta_tag: None,
             specialization_parent: None,
@@ -36528,19 +33584,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("add_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-<<<<<<< HEAD
-                    DeclarationId(1906),
-                    DeclarationId(1907),
-                    DeclarationId(1908),
-                ],
-                output: DeclarationId(1909),
-=======
                     DeclarationId(1907),
                     DeclarationId(1908),
                     DeclarationId(1909),
                 ],
                 output: DeclarationId(1910),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4966, 4988)),
             },
             type_params: vec![DeclarationId(1002), DeclarationId(1003)],
@@ -36586,19 +33634,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("sub_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-<<<<<<< HEAD
-                    DeclarationId(1910),
-                    DeclarationId(1911),
-                    DeclarationId(1912),
-                ],
-                output: DeclarationId(1913),
-=======
                     DeclarationId(1911),
                     DeclarationId(1912),
                     DeclarationId(1913),
                 ],
                 output: DeclarationId(1914),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5162, 5184)),
             },
             type_params: vec![DeclarationId(1005), DeclarationId(1006)],
@@ -36644,19 +33684,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("mul_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-<<<<<<< HEAD
-                    DeclarationId(1914),
-                    DeclarationId(1915),
-                    DeclarationId(1009),
-                ],
-                output: DeclarationId(1916),
-=======
                     DeclarationId(1915),
                     DeclarationId(1916),
                     DeclarationId(1009),
                 ],
                 output: DeclarationId(1917),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5350, 5379)),
             },
             type_params: vec![DeclarationId(1008), DeclarationId(1009)],
@@ -36702,19 +33734,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("div_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-<<<<<<< HEAD
-                    DeclarationId(1917),
-                    DeclarationId(1918),
-                    DeclarationId(1012),
-                ],
-                output: DeclarationId(1919),
-=======
                     DeclarationId(1918),
                     DeclarationId(1919),
                     DeclarationId(1012),
                 ],
                 output: DeclarationId(1920),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5545, 5574)),
             },
             type_params: vec![DeclarationId(1011), DeclarationId(1012)],
@@ -36779,19 +33803,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NoSourceSpan".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1936),
-                    },
-                    Field {
-                        label: "SomeSourceSpan".to_string(),
-                        ty: DeclarationId(1937),
-=======
                         ty: DeclarationId(1937),
                     },
                     Field {
                         label: "SomeSourceSpan".to_string(),
                         ty: DeclarationId(1938),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -36857,11 +33873,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "fields".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1938),
-=======
                         ty: DeclarationId(1939),
->>>>>>> origin/main
                     },
                     Field {
                         label: "cost".to_string(),
@@ -36923,13 +33935,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "BoundUnspecified".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1939),
-                    },
-                    Field {
-                        label: "StaticBoundFact".to_string(),
-                        ty: DeclarationId(1940),
-=======
                         ty: DeclarationId(1940),
                     },
                     Field {
@@ -36939,11 +33944,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "PlatformDependentFact".to_string(),
                         ty: DeclarationId(1942),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "PlatformDependentFact".to_string(),
-                        ty: DeclarationId(1941),
                     },
                 ],
             },
@@ -36993,19 +33993,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DirectField".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1942),
-                    },
-                    Field {
-                        label: "AccessorMethod".to_string(),
-                        ty: DeclarationId(1943),
-=======
                         ty: DeclarationId(1943),
                     },
                     Field {
                         label: "AccessorMethod".to_string(),
                         ty: DeclarationId(1944),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -37108,11 +34100,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "parameters".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1944),
-=======
                         ty: DeclarationId(1945),
->>>>>>> origin/main
                     },
                     Field {
                         label: "cost".to_string(),
@@ -37162,19 +34150,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Borrowed".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1945),
-                    },
-                    Field {
-                        label: "Consumed".to_string(),
-                        ty: DeclarationId(1946),
-=======
                         ty: DeclarationId(1946),
                     },
                     Field {
                         label: "Consumed".to_string(),
                         ty: DeclarationId(1947),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -37195,19 +34175,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Owned".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1947),
-                    },
-                    Field {
-                        label: "Borrowed".to_string(),
-                        ty: DeclarationId(1948),
-=======
                         ty: DeclarationId(1948),
                     },
                     Field {
                         label: "Borrowed".to_string(),
                         ty: DeclarationId(1949),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -37228,19 +34200,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "SelfContained".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1949),
-                    },
-                    Field {
-                        label: "Caller".to_string(),
-                        ty: DeclarationId(1950),
-=======
                         ty: DeclarationId(1950),
                     },
                     Field {
                         label: "Caller".to_string(),
                         ty: DeclarationId(1951),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -37261,13 +34225,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Growable".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1951),
-                    },
-                    Field {
-                        label: "Fixed".to_string(),
-                        ty: DeclarationId(1952),
-=======
                         ty: DeclarationId(1952),
                     },
                     Field {
@@ -37277,11 +34234,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "NotApplicable".to_string(),
                         ty: DeclarationId(1954),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "NotApplicable".to_string(),
-                        ty: DeclarationId(1953),
                     },
                 ],
             },
@@ -37301,11 +34253,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Utf8FreeMonoidChar".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1954),
-=======
                     ty: DeclarationId(1955),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -37403,46 +34351,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ListEmpty".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1955),
-                    },
-                    Field {
-                        label: "ListSingleton".to_string(),
-                        ty: DeclarationId(1956),
-                    },
-                    Field {
-                        label: "ListCons".to_string(),
-                        ty: DeclarationId(1957),
-                    },
-                    Field {
-                        label: "ListConcat".to_string(),
-                        ty: DeclarationId(1958),
-                    },
-                    Field {
-                        label: "ListLength".to_string(),
-                        ty: DeclarationId(1959),
-                    },
-                    Field {
-                        label: "ListIsEmpty".to_string(),
-                        ty: DeclarationId(1960),
-                    },
-                    Field {
-                        label: "ListFold".to_string(),
-                        ty: DeclarationId(1961),
-                    },
-                    Field {
-                        label: "ListMap".to_string(),
-                        ty: DeclarationId(1962),
-                    },
-                    Field {
-                        label: "ListFilter".to_string(),
-                        ty: DeclarationId(1963),
-                    },
-                    Field {
-                        label: "ListContains".to_string(),
-                        ty: DeclarationId(1964),
-                    },
-=======
                         ty: DeclarationId(1956),
                     },
                     Field {
@@ -37481,7 +34389,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "ListContains".to_string(),
                         ty: DeclarationId(1965),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -37562,19 +34469,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "PlaceholderPatternStrategy".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1965),
-                    },
-                    Field {
-                        label: "VectorList".to_string(),
-                        ty: DeclarationId(1966),
-=======
                         ty: DeclarationId(1966),
                     },
                     Field {
                         label: "VectorList".to_string(),
                         ty: DeclarationId(1967),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -38053,19 +34952,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Borrow".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1967),
-                    },
-                    Field {
-                        label: "PassByValue".to_string(),
-                        ty: DeclarationId(1968),
-=======
                         ty: DeclarationId(1968),
                     },
                     Field {
                         label: "PassByValue".to_string(),
                         ty: DeclarationId(1969),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -38086,19 +34977,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "CopyOrClone".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1969),
-                    },
-                    Field {
-                        label: "PassByValue".to_string(),
-                        ty: DeclarationId(1970),
-=======
                         ty: DeclarationId(1970),
                     },
                     Field {
                         label: "PassByValue".to_string(),
                         ty: DeclarationId(1971),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -38184,19 +35067,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IndexedArgs".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1971),
-                    },
-                    Field {
-                        label: "NamedArg".to_string(),
-                        ty: DeclarationId(1972),
-=======
                         ty: DeclarationId(1972),
                     },
                     Field {
                         label: "NamedArg".to_string(),
                         ty: DeclarationId(1973),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -38217,19 +35092,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "SingleTemplate".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1973),
-                    },
-                    Field {
-                        label: "HigherOrderTemplates".to_string(),
-                        ty: DeclarationId(1974),
-=======
                         ty: DeclarationId(1974),
                     },
                     Field {
                         label: "HigherOrderTemplates".to_string(),
                         ty: DeclarationId(1975),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -38496,11 +35363,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({left}, {right}...)".to_string(),
                             ))],
@@ -38513,11 +35376,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -38555,11 +35414,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "int64(len({recv}))".to_string(),
                             ))],
@@ -38572,11 +35427,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -38614,11 +35465,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv}) == 0".to_string(),
                             ))],
@@ -38631,11 +35478,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -38675,11 +35518,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "/* fold({recv}, {init}, {body}) */".to_string(),
                             ))],
@@ -38692,11 +35531,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -38736,11 +35571,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "/* map({recv}, {body}) */".to_string(),
                             ))],
@@ -38753,11 +35584,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -38797,11 +35624,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Filter({recv}, {arg})".to_string(),
                             ))],
@@ -38814,11 +35637,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -38858,11 +35677,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Any({recv}, {arg})".to_string(),
                             ))],
@@ -38875,11 +35690,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -38919,11 +35730,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.All({recv}, {arg})".to_string(),
                             ))],
@@ -38936,11 +35743,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -38980,11 +35783,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.FlatMap({recv}, {arg})".to_string(),
                             ))],
@@ -38997,11 +35796,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -39023,11 +35818,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-<<<<<<< HEAD
-            meta_tag: Some(DeclarationId(1975)),
-=======
             meta_tag: Some(DeclarationId(1976)),
->>>>>>> origin/main
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -39046,11 +35837,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -39063,11 +35850,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -39089,11 +35872,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Join({recv}, {arg})".to_string(),
                             ))],
@@ -39106,11 +35885,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -39132,11 +35907,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Split({recv}, {arg})".to_string(),
                             ))],
@@ -39149,11 +35920,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -39177,11 +35944,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -39194,11 +35957,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -39218,11 +35977,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -39235,11 +35990,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -39261,11 +36012,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.SortBy({recv}, {arg})".to_string(),
                             ))],
@@ -39278,11 +36025,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -39304,11 +36047,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({recv}, {arg})".to_string(),
                             ))],
@@ -39321,11 +36060,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -39347,11 +36082,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Contains({recv}, {arg})".to_string(),
                             ))],
@@ -39364,11 +36095,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -39385,26 +36112,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DirectRecursion".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1989),
-                    },
-                    Field {
-                        label: "ListRecursion".to_string(),
-                        ty: DeclarationId(1990),
-                    },
-                    Field {
-                        label: "OptionalRecursion".to_string(),
-                        ty: DeclarationId(1991),
-                    },
-                    Field {
-                        label: "SetRecursion".to_string(),
-                        ty: DeclarationId(1992),
-                    },
-                    Field {
-                        label: "MapValueRecursion".to_string(),
-                        ty: DeclarationId(1993),
-                    },
-=======
                         ty: DeclarationId(1990),
                     },
                     Field {
@@ -39423,7 +36130,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "MapValueRecursion".to_string(),
                         ty: DeclarationId(1994),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -39534,26 +36240,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "StrictSubValue".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1994),
-                    },
-                    Field {
-                        label: "IteratedSubValue".to_string(),
-                        ty: DeclarationId(1995),
-                    },
-                    Field {
-                        label: "ArithmeticDescent".to_string(),
-                        ty: DeclarationId(1996),
-                    },
-                    Field {
-                        label: "PreservedValue".to_string(),
-                        ty: DeclarationId(1997),
-                    },
-                    Field {
-                        label: "SubValueUnknown".to_string(),
-                        ty: DeclarationId(1998),
-                    },
-=======
                         ty: DeclarationId(1995),
                     },
                     Field {
@@ -39572,7 +36258,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "SubValueUnknown".to_string(),
                         ty: DeclarationId(1999),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -39722,11 +36407,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(1073)],
-<<<<<<< HEAD
-                output: DeclarationId(1976),
-=======
                 output: DeclarationId(1977),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     20571,
@@ -39748,11 +36429,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(1073)],
-<<<<<<< HEAD
-                output: DeclarationId(1977),
-=======
                 output: DeclarationId(1978),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     21959,
@@ -39776,22 +36453,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IntegerExpZero".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1999),
-                    },
-                    Field {
-                        label: "IntegerExpPos".to_string(),
-                        ty: DeclarationId(2000),
-                    },
-                    Field {
-                        label: "FractionExp".to_string(),
-                        ty: DeclarationId(2001),
-                    },
-                    Field {
-                        label: "LogBasedExp".to_string(),
-                        ty: DeclarationId(2002),
-                    },
-=======
                         ty: DeclarationId(2000),
                     },
                     Field {
@@ -39806,7 +36467,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "LogBasedExp".to_string(),
                         ty: DeclarationId(2003),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -39848,19 +36508,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "PolyCost".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2003),
-                    },
-                    Field {
-                        label: "LogCost".to_string(),
-                        ty: DeclarationId(2004),
-=======
                         ty: DeclarationId(2004),
                     },
                     Field {
                         label: "LogCost".to_string(),
                         ty: DeclarationId(2005),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -39881,29 +36533,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ConstantBound".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2005),
-                    },
-                    Field {
-                        label: "AtomicBound".to_string(),
-                        ty: DeclarationId(2006),
-                    },
-                    Field {
-                        label: "ProductBound".to_string(),
-                        ty: DeclarationId(2008),
-                    },
-                    Field {
-                        label: "SumOfProductsBound".to_string(),
-                        ty: DeclarationId(2011),
-                    },
-                    Field {
-                        label: "SumBound".to_string(),
-                        ty: DeclarationId(2013),
-                    },
-                    Field {
-                        label: "ForeverBound".to_string(),
-                        ty: DeclarationId(2014),
-=======
                         ty: DeclarationId(2006),
                     },
                     Field {
@@ -39929,11 +36558,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "ErrorBound".to_string(),
                         ty: DeclarationId(2016),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "ErrorBound".to_string(),
-                        ty: DeclarationId(2015),
                     },
                 ],
             },
@@ -39951,11 +36575,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1086),
             name: Some("sum_bound".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1978)],
-=======
                 inputs: vec![DeclarationId(1979)],
->>>>>>> origin/main
                 output: DeclarationId(1085),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -40035,11 +36655,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1090),
             name: Some("product_atoms_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1979)],
-=======
                 inputs: vec![DeclarationId(1980)],
->>>>>>> origin/main
                 output: DeclarationId(849),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -40061,11 +36677,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1091),
             name: Some("product_term_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1980)],
-=======
                 inputs: vec![DeclarationId(1981)],
->>>>>>> origin/main
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(555))),
             },
@@ -40083,11 +36695,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1092),
             name: Some("sum_products_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1982)],
-=======
                 inputs: vec![DeclarationId(1983)],
->>>>>>> origin/main
                 output: DeclarationId(849),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -40341,11 +36949,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("int_add_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-<<<<<<< HEAD
-                output: DeclarationId(1983),
-=======
                 output: DeclarationId(1984),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33617,
@@ -40367,11 +36971,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("int_mul_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-<<<<<<< HEAD
-                output: DeclarationId(1984),
-=======
                 output: DeclarationId(1985),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33913,
@@ -40393,11 +36993,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(93)],
-<<<<<<< HEAD
-                output: DeclarationId(1985),
-=======
                 output: DeclarationId(1986),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35162,
@@ -40419,11 +37015,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("int_pow_bounded".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-<<<<<<< HEAD
-                output: DeclarationId(1986),
-=======
                 output: DeclarationId(1987),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35637,
@@ -40445,11 +37037,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("ceil_log".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-<<<<<<< HEAD
-                output: DeclarationId(1987),
-=======
                 output: DeclarationId(1988),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     36900,
@@ -40476,11 +37064,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     DeclarationId(93),
                     DeclarationId(93),
                 ],
-<<<<<<< HEAD
-                output: DeclarationId(1988),
-=======
                 output: DeclarationId(1989),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     37172,
@@ -40888,11 +37472,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-<<<<<<< HEAD
-            meta_tag: Some(DeclarationId(2016)),
-=======
             meta_tag: Some(DeclarationId(2017)),
->>>>>>> origin/main
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -40918,11 +37498,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-<<<<<<< HEAD
-            meta_tag: Some(DeclarationId(2017)),
-=======
             meta_tag: Some(DeclarationId(2018)),
->>>>>>> origin/main
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -40947,26 +37523,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "read".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2019),
-                    },
-                    Field {
-                        label: "sequential".to_string(),
-                        ty: DeclarationId(2020),
-                    },
-                    Field {
-                        label: "branch".to_string(),
-                        ty: DeclarationId(2021),
-                    },
-                    Field {
-                        label: "iterate".to_string(),
-                        ty: DeclarationId(2022),
-                    },
-                    Field {
-                        label: "validate".to_string(),
-                        ty: DeclarationId(2023),
-                    },
-=======
                         ty: DeclarationId(2020),
                     },
                     Field {
@@ -40985,7 +37541,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "validate".to_string(),
                         ty: DeclarationId(2024),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![DeclarationId(1129)],
@@ -41019,19 +37574,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DeclarationScope".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2024),
-                    },
-                    Field {
-                        label: "NodeScope".to_string(),
-                        ty: DeclarationId(2025),
-=======
                         ty: DeclarationId(2025),
                     },
                     Field {
                         label: "NodeScope".to_string(),
                         ty: DeclarationId(2026),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -41051,11 +37598,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Error".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2026),
-=======
                     ty: DeclarationId(2027),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -41075,19 +37618,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "project".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2027),
-                    },
-                    Field {
-                        label: "violates".to_string(),
-                        ty: DeclarationId(2028),
-=======
                         ty: DeclarationId(2028),
                     },
                     Field {
                         label: "violates".to_string(),
                         ty: DeclarationId(2029),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -41136,19 +37671,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "lens".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2029),
-                    },
-                    Field {
-                        label: "enforcement".to_string(),
-                        ty: DeclarationId(2030),
-=======
                         ty: DeclarationId(2030),
                     },
                     Field {
                         label: "enforcement".to_string(),
                         ty: DeclarationId(2031),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -41197,11 +37724,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "enforceable_lens".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2031),
-=======
                         ty: DeclarationId(2032),
->>>>>>> origin/main
                     },
                     Field {
                         label: "section".to_string(),
@@ -41266,11 +37789,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "lens".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2032),
-=======
                         ty: DeclarationId(2033),
->>>>>>> origin/main
                     },
                     Field {
                         label: "section".to_string(),
@@ -41313,19 +37832,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Miss".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2035),
-                    },
-                    Field {
-                        label: "Hit".to_string(),
-                        ty: DeclarationId(2036),
-=======
                         ty: DeclarationId(2036),
                     },
                     Field {
                         label: "Hit".to_string(),
                         ty: DeclarationId(2037),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -41358,11 +37869,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("miss_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-<<<<<<< HEAD
-                output: DeclarationId(2033),
-=======
                 output: DeclarationId(2034),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4601, 4611)),
             },
             type_params: vec![],
@@ -41380,11 +37887,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("hit_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-<<<<<<< HEAD
-                output: DeclarationId(2034),
-=======
                 output: DeclarationId(2035),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4654, 4666)),
             },
             type_params: vec![],
@@ -41425,11 +37928,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[*{left}, *{right}]".to_string(),
                             ))],
@@ -41442,11 +37941,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -41488,11 +37983,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -41505,11 +37996,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -41551,11 +38038,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "(len({recv}) == 0)".to_string(),
                             ))],
@@ -41568,11 +38051,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -41616,11 +38095,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "__v3_fold({recv}, {init}, {body})".to_string(),
                             ))],
@@ -41633,11 +38108,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -41681,11 +38152,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[{body} for {item} in {recv}]".to_string(),
                             ))],
@@ -41698,11 +38165,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -41746,11 +38209,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[x for x in {recv} if {arg}(x)]".to_string(),
                             ))],
@@ -41763,11 +38222,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -41811,11 +38266,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "any({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -41828,11 +38279,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -41876,11 +38323,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "all({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -41893,11 +38336,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -41941,11 +38380,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[y for x in {recv} for y in {arg}(x)]".to_string(),
                             ))],
@@ -41958,11 +38393,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -41988,11 +38419,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-<<<<<<< HEAD
-            meta_tag: Some(DeclarationId(2037)),
-=======
             meta_tag: Some(DeclarationId(2038)),
->>>>>>> origin/main
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -42011,11 +38438,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -42028,11 +38451,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -42052,11 +38471,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg}.join({recv})".to_string(),
                             ))],
@@ -42069,11 +38484,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -42093,11 +38504,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}.split({arg})".to_string(),
                             ))],
@@ -42110,11 +38517,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -42136,11 +38539,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[-1] if {recv} else None".to_string(),
                             ))],
@@ -42153,11 +38552,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -42179,11 +38574,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[0] if {recv} else None".to_string(),
                             ))],
@@ -42196,11 +38587,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -42222,11 +38609,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "list(enumerate({recv}))".to_string(),
                             ))],
@@ -42239,11 +38622,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -42265,11 +38644,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[ord(c) for c in {recv}]".to_string(),
                             ))],
@@ -42282,11 +38657,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -42310,11 +38681,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -42327,11 +38694,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -42351,11 +38714,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -42368,11 +38727,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -42394,11 +38749,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "sorted({recv}, key={arg})".to_string(),
                             ))],
@@ -42411,11 +38762,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -42435,11 +38782,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv} + [{arg}]".to_string(),
                             ))],
@@ -42452,11 +38795,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -42476,11 +38815,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1973),
-=======
                             constructor: DeclarationId(1974),
->>>>>>> origin/main
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg} in {recv}".to_string(),
                             ))],
@@ -42493,11 +38828,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(1972),
-=======
                             constructor: DeclarationId(1973),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -42595,26 +38926,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LiteralValue".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2039),
-                    },
-                    Field {
-                        label: "RecordValue".to_string(),
-                        ty: DeclarationId(2041),
-                    },
-                    Field {
-                        label: "VariantValue".to_string(),
-                        ty: DeclarationId(2042),
-                    },
-                    Field {
-                        label: "NodeRef".to_string(),
-                        ty: DeclarationId(2043),
-                    },
-                    Field {
-                        label: "CardinalityValue".to_string(),
-                        ty: DeclarationId(2044),
-                    },
-=======
                         ty: DeclarationId(2040),
                     },
                     Field {
@@ -42633,7 +38944,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "CardinalityValue".to_string(),
                         ty: DeclarationId(2045),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -42685,11 +38995,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bindings".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2045),
-=======
                     ty: DeclarationId(2046),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -42708,11 +39014,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "frames".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2046),
-=======
                     ty: DeclarationId(2047),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -42750,11 +39052,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "ApplicativeOrder".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2047),
-=======
                     ty: DeclarationId(2048),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -42774,19 +39072,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LeftFirst".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2048),
-                    },
-                    Field {
-                        label: "RightFirst".to_string(),
-                        ty: DeclarationId(2049),
-=======
                         ty: DeclarationId(2049),
                     },
                     Field {
                         label: "RightFirst".to_string(),
                         ty: DeclarationId(2050),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -42837,11 +39127,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1169),
             name: Some("evaluate".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(828), DeclarationId(721), DeclarationId(2038)],
-=======
                 inputs: vec![DeclarationId(828), DeclarationId(721), DeclarationId(2039)],
->>>>>>> origin/main
                 output: DeclarationId(1160),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/runtime.dag", 11265, 11284)),
             },
@@ -42855,19 +39141,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/runtime.dag", 11196, 11284),
         });
-<<<<<<< HEAD
-        declarations.push(Declaration { id: DeclarationId(1170), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(263)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1974), payload: vec![FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __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(1972), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3555, 4208) });
-        declarations.push(Declaration { id: DeclarationId(1171), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(249)))])), ("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(1974), 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(1972), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4210, 4705) });
-        declarations.push(Declaration { id: DeclarationId(1172), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(248)))])), ("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(1974), 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(1972), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4707, 5196) });
-        declarations.push(Declaration { id: DeclarationId(1173), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(265)))])), ("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(1974), 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(1972), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5198, 5729) });
-        declarations.push(Declaration { id: DeclarationId(1174), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(1054) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2050)), 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(258)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1973), 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(1972), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(271)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1973), 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(1972), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(295)))])), ("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(1973), 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(1972), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(273)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1973), 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(1972), 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}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1973), 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(1972), 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}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1973), 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(1972), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(252)))])), ("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(1973), 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(1972), payload: vec![] })]), FieldValue::Reference(DeclarationId(1170)), FieldValue::Reference(DeclarationId(1171)), FieldValue::Reference(DeclarationId(1172)), FieldValue::Reference(DeclarationId(1173)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(293)))])), ("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(1973), 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(1972), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(299)))])), ("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(1973), 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(1972), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5732, 8453) });
-=======
         declarations.push(Declaration { id: DeclarationId(1170), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(263)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1975), payload: vec![FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __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(1973), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3555, 4208) });
         declarations.push(Declaration { id: DeclarationId(1171), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(249)))])), ("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(1975), 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(1973), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4210, 4705) });
         declarations.push(Declaration { id: DeclarationId(1172), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(248)))])), ("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(1975), 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(1973), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4707, 5196) });
         declarations.push(Declaration { id: DeclarationId(1173), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(265)))])), ("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(1975), 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(1973), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5198, 5729) });
         declarations.push(Declaration { id: DeclarationId(1174), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(1054) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2051)), 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(258)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1974), 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(1973), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(271)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1974), 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(1973), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(295)))])), ("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(1974), 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(1973), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(273)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1974), 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(1973), 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}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1974), 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(1973), 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}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1974), 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(1973), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(252)))])), ("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(1974), 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(1973), payload: vec![] })]), FieldValue::Reference(DeclarationId(1170)), FieldValue::Reference(DeclarationId(1171)), FieldValue::Reference(DeclarationId(1172)), FieldValue::Reference(DeclarationId(1173)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(293)))])), ("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(1974), 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(1973), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(299)))])), ("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(1974), 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(1973), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5732, 8453) });
->>>>>>> origin/main
         declarations.push(Declaration {
             id: DeclarationId(1175),
             name: Some("InputField".to_string()),
@@ -42880,7 +39158,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/services.dag", 3669, 3687),
+            span: SourceSpan::new("src/v3/std/services.dag", 3670, 3688),
         });
         declarations.push(Declaration {
             id: DeclarationId(1176),
@@ -42905,7 +39183,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/services.dag", 4599, 4671),
+            span: SourceSpan::new("src/v3/std/services.dag", 4600, 4672),
         });
         declarations.push(Declaration {
             id: DeclarationId(1177),
@@ -42924,7 +39202,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/services.dag", 5479, 5522),
+            span: SourceSpan::new("src/v3/std/services.dag", 5480, 5523),
         });
         declarations.push(Declaration {
             id: DeclarationId(1178),
@@ -42937,11 +39215,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "inputs".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2051),
-=======
                         ty: DeclarationId(2052),
->>>>>>> origin/main
                     },
                     Field {
                         label: "endpoint".to_string(),
@@ -42957,26 +39231,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/services.dag", 6731, 6841),
+            span: SourceSpan::new("src/v3/std/services.dag", 6732, 6842),
         });
         declarations.push(Declaration {
             id: DeclarationId(1179),
             name: Some("modeled_gunbc_ci_workflow".to_string()),
             connective: TypeConnective::Instantiation {
-<<<<<<< HEAD
-                template: DeclarationId(1358),
-=======
                 template: DeclarationId(1359),
->>>>>>> origin/main
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-<<<<<<< HEAD
-            meta_tag: Some(DeclarationId(1358)),
-=======
             meta_tag: Some(DeclarationId(1359)),
->>>>>>> origin/main
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -42993,11 +39259,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("ci_demo_timing_read".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-<<<<<<< HEAD
-                output: DeclarationId(2052),
-=======
                 output: DeclarationId(2053),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(597))),
             },
             type_params: vec![],
@@ -43015,11 +39277,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("ci_wad_modeled_workflow_timing_witness".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-<<<<<<< HEAD
-                output: DeclarationId(2053),
-=======
                 output: DeclarationId(2054),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(599))),
             },
             type_params: vec![],
@@ -43037,11 +39295,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_seed_list_declaration_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-<<<<<<< HEAD
-                output: DeclarationId(2054),
-=======
                 output: DeclarationId(2055),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(601))),
             },
             type_params: vec![],
@@ -43059,11 +39313,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_seed_list_behavior_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-<<<<<<< HEAD
-                output: DeclarationId(2055),
-=======
                 output: DeclarationId(2056),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(603))),
             },
             type_params: vec![],
@@ -43081,11 +39331,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_seed_list_dagport_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-<<<<<<< HEAD
-                output: DeclarationId(2056),
-=======
                 output: DeclarationId(2057),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(605))),
             },
             type_params: vec![],
@@ -43103,11 +39349,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_seed_list_cluster_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-<<<<<<< HEAD
-                output: DeclarationId(2057),
-=======
                 output: DeclarationId(2058),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(607))),
             },
             type_params: vec![],
@@ -43125,11 +39367,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_empty_list_diagnostic".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-<<<<<<< HEAD
-                output: DeclarationId(2058),
-=======
                 output: DeclarationId(2059),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(609))),
             },
             type_params: vec![],
@@ -43147,11 +39385,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_empty_list_witness_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-<<<<<<< HEAD
-                output: DeclarationId(2060),
-=======
                 output: DeclarationId(2061),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(611))),
             },
             type_params: vec![],
@@ -43169,11 +39403,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_witnesses_singleton_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1222)],
-<<<<<<< HEAD
-                output: DeclarationId(2062),
-=======
                 output: DeclarationId(2063),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(615))),
             },
             type_params: vec![],
@@ -43191,11 +39421,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_violations_singleton".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(982)],
-<<<<<<< HEAD
-                output: DeclarationId(2063),
-=======
                 output: DeclarationId(2064),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(618))),
             },
             type_params: vec![],
@@ -43213,11 +39439,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_dimension_ok_tm_payload".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1222)],
-<<<<<<< HEAD
-                output: DeclarationId(2064),
-=======
                 output: DeclarationId(2065),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(622))),
             },
             type_params: vec![],
@@ -43235,11 +39457,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_dimension_fail_tm_payload".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1222), DeclarationId(982)],
-<<<<<<< HEAD
-                output: DeclarationId(2065),
-=======
                 output: DeclarationId(2066),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(627))),
             },
             type_params: vec![],
@@ -43257,11 +39475,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("report_dim_ok_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(1222)],
-<<<<<<< HEAD
-                output: DeclarationId(2066),
-=======
                 output: DeclarationId(2067),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(634))),
             },
             type_params: vec![],
@@ -43279,11 +39493,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("report_dim_fail_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(1222), DeclarationId(982)],
-<<<<<<< HEAD
-                output: DeclarationId(2067),
-=======
                 output: DeclarationId(2068),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(641))),
             },
             type_params: vec![],
@@ -43301,11 +39511,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("report_inhabits_branch_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(1222), DeclarationId(986)],
-<<<<<<< HEAD
-                output: DeclarationId(2068),
-=======
                 output: DeclarationId(2069),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(646))),
             },
             type_params: vec![],
@@ -43322,13 +39528,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1195),
             name: Some("dimension_report_tm_from_witness".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(828), DeclarationId(2069)],
-                output: DeclarationId(2070),
-=======
                 inputs: vec![DeclarationId(828), DeclarationId(2070)],
                 output: DeclarationId(2071),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(656))),
             },
             type_params: vec![],
@@ -43346,11 +39547,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("demo_ci_modeled_timing_dimension_report".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-<<<<<<< HEAD
-                output: DeclarationId(2071),
-=======
                 output: DeclarationId(2072),
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(664))),
             },
             type_params: vec![],
@@ -43370,13 +39567,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Strict".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2101),
-                    },
-                    Field {
-                        label: "NonIncreasing".to_string(),
-                        ty: DeclarationId(2102),
-=======
                         ty: DeclarationId(2102),
                     },
                     Field {
@@ -43386,11 +39576,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "DescentUnknown".to_string(),
                         ty: DeclarationId(2104),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2103),
                     },
                 ],
             },
@@ -43492,13 +39677,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1202),
             name: Some("optional_evidence_meet".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(2093), DeclarationId(2094)],
-                output: DeclarationId(2095),
-=======
                 inputs: vec![DeclarationId(2094), DeclarationId(2095)],
                 output: DeclarationId(2096),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2488,
@@ -43519,13 +39699,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1203),
             name: Some("map_evidence_merge_at".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(2096), DeclarationId(230), DeclarationId(1197)],
-                output: DeclarationId(2097),
-=======
                 inputs: vec![DeclarationId(2097), DeclarationId(230), DeclarationId(1197)],
                 output: DeclarationId(2098),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2833,
@@ -43549,26 +39724,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "TreeSize".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2104),
-                    },
-                    Field {
-                        label: "ListLength".to_string(),
-                        ty: DeclarationId(2105),
-                    },
-                    Field {
-                        label: "ArithmeticValue".to_string(),
-                        ty: DeclarationId(2106),
-                    },
-                    Field {
-                        label: "TokenPosition".to_string(),
-                        ty: DeclarationId(2107),
-                    },
-                    Field {
-                        label: "SetCardinality".to_string(),
-                        ty: DeclarationId(2108),
-                    },
-=======
                         ty: DeclarationId(2105),
                     },
                     Field {
@@ -43587,7 +39742,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "SetCardinality".to_string(),
                         ty: DeclarationId(2109),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -43607,19 +39761,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "OneStep".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2109),
-                    },
-                    Field {
-                        label: "AdditionalStep".to_string(),
-                        ty: DeclarationId(2110),
-=======
                         ty: DeclarationId(2110),
                     },
                     Field {
                         label: "AdditionalStep".to_string(),
                         ty: DeclarationId(2111),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -43662,19 +39808,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DivideByTwo".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2111),
-                    },
-                    Field {
-                        label: "StrictlyLarger".to_string(),
-                        ty: DeclarationId(2112),
-=======
                         ty: DeclarationId(2112),
                     },
                     Field {
                         label: "StrictlyLarger".to_string(),
                         ty: DeclarationId(2113),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -43737,11 +39875,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(93)],
-<<<<<<< HEAD
-                output: DeclarationId(2098),
-=======
                 output: DeclarationId(2099),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     6420,
@@ -43763,11 +39897,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(93)],
-<<<<<<< HEAD
-                output: DeclarationId(2099),
-=======
                 output: DeclarationId(2100),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     6860,
@@ -43791,34 +39921,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ChildAccessor".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2113),
-                    },
-                    Field {
-                        label: "ListShrink".to_string(),
-                        ty: DeclarationId(2114),
-                    },
-                    Field {
-                        label: "ArithmeticSubtractDescent".to_string(),
-                        ty: DeclarationId(2115),
-                    },
-                    Field {
-                        label: "ArithmeticDivideDescent".to_string(),
-                        ty: DeclarationId(2116),
-                    },
-                    Field {
-                        label: "ParserAdvance".to_string(),
-                        ty: DeclarationId(2117),
-                    },
-                    Field {
-                        label: "SetRemoval".to_string(),
-                        ty: DeclarationId(2118),
-                    },
-                    Field {
-                        label: "FoldIteration".to_string(),
-                        ty: DeclarationId(2119),
-                    },
-=======
                         ty: DeclarationId(2114),
                     },
                     Field {
@@ -43845,7 +39947,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "FoldIteration".to_string(),
                         ty: DeclarationId(2120),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -43864,11 +39965,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "dimensions".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2120),
-=======
                     ty: DeclarationId(2121),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -43896,11 +39993,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "evidence".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2121),
-=======
                         ty: DeclarationId(2122),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -43920,11 +40013,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Strict".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2122),
-=======
                     ty: DeclarationId(2123),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -43944,19 +40033,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NonIncreasing".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2123),
-                    },
-                    Field {
-                        label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2124),
-=======
                         ty: DeclarationId(2124),
                     },
                     Field {
                         label: "DescentUnknown".to_string(),
                         ty: DeclarationId(2125),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -43977,19 +40058,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "EvidenceUnknown".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2125),
-                    },
-                    Field {
-                        label: "EvidenceIncomplete".to_string(),
-                        ty: DeclarationId(2126),
-=======
                         ty: DeclarationId(2126),
                     },
                     Field {
                         label: "EvidenceIncomplete".to_string(),
                         ty: DeclarationId(2127),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -44018,11 +40091,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "per_path".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2127),
-=======
                         ty: DeclarationId(2128),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -44041,11 +40110,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("descent_execution_proof".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(724), DeclarationId(722)],
-<<<<<<< HEAD
-                output: DeclarationId(2100),
-=======
                 output: DeclarationId(2101),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     12400,
@@ -44106,22 +40171,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Observed".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2130),
-                    },
-                    Field {
-                        label: "Unobserved".to_string(),
-                        ty: DeclarationId(2131),
-                    },
-                    Field {
-                        label: "Ambiguous".to_string(),
-                        ty: DeclarationId(2132),
-                    },
-                    Field {
-                        label: "Stale".to_string(),
-                        ty: DeclarationId(2133),
-                    },
-=======
                         ty: DeclarationId(2131),
                     },
                     Field {
@@ -44136,7 +40185,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "Stale".to_string(),
                         ty: DeclarationId(2134),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -44261,11 +40309,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "observations".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2134),
-=======
                     ty: DeclarationId(2135),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -44438,27 +40482,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1222), DeclarationId(1222)],
                 output: DeclarationId(1222),
-<<<<<<< HEAD
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(712))),
-            },
-            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/timing_lens.dag", 8098, 8231),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1234),
-            name: Some("timing_lens_empty_corrections".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![],
-                output: DeclarationId(2128),
-=======
->>>>>>> origin/main
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(714))),
             },
             type_params: vec![],
@@ -44584,13 +40607,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("timing_lens_read".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-<<<<<<< HEAD
-                output: DeclarationId(2129),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(793))),
-=======
                 output: DeclarationId(2130),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(795))),
->>>>>>> origin/main
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -44627,186 +40645,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2146),
-                    },
-                    Field {
-                        label: "KwIf".to_string(),
-                        ty: DeclarationId(2147),
-                    },
-                    Field {
-                        label: "KwThen".to_string(),
-                        ty: DeclarationId(2148),
-                    },
-                    Field {
-                        label: "KwElse".to_string(),
-                        ty: DeclarationId(2149),
-                    },
-                    Field {
-                        label: "KwFn".to_string(),
-                        ty: DeclarationId(2150),
-                    },
-                    Field {
-                        label: "KwType".to_string(),
-                        ty: DeclarationId(2151),
-                    },
-                    Field {
-                        label: "KwModule".to_string(),
-                        ty: DeclarationId(2152),
-                    },
-                    Field {
-                        label: "KwImport".to_string(),
-                        ty: DeclarationId(2153),
-                    },
-                    Field {
-                        label: "KwMatch".to_string(),
-                        ty: DeclarationId(2154),
-                    },
-                    Field {
-                        label: "KwData".to_string(),
-                        ty: DeclarationId(2155),
-                    },
-                    Field {
-                        label: "KwWhere".to_string(),
-                        ty: DeclarationId(2156),
-                    },
-                    Field {
-                        label: "KwTrue".to_string(),
-                        ty: DeclarationId(2157),
-                    },
-                    Field {
-                        label: "KwFalse".to_string(),
-                        ty: DeclarationId(2158),
-                    },
-                    Field {
-                        label: "Ident".to_string(),
-                        ty: DeclarationId(2159),
-                    },
-                    Field {
-                        label: "IntLit".to_string(),
-                        ty: DeclarationId(2160),
-                    },
-                    Field {
-                        label: "StringLit".to_string(),
-                        ty: DeclarationId(2161),
-                    },
-                    Field {
-                        label: "Eq".to_string(),
-                        ty: DeclarationId(2162),
-                    },
-                    Field {
-                        label: "EqEq".to_string(),
-                        ty: DeclarationId(2163),
-                    },
-                    Field {
-                        label: "NotEq".to_string(),
-                        ty: DeclarationId(2164),
-                    },
-                    Field {
-                        label: "Lt".to_string(),
-                        ty: DeclarationId(2165),
-                    },
-                    Field {
-                        label: "Le".to_string(),
-                        ty: DeclarationId(2166),
-                    },
-                    Field {
-                        label: "Gt".to_string(),
-                        ty: DeclarationId(2167),
-                    },
-                    Field {
-                        label: "Ge".to_string(),
-                        ty: DeclarationId(2168),
-                    },
-                    Field {
-                        label: "Plus".to_string(),
-                        ty: DeclarationId(2169),
-                    },
-                    Field {
-                        label: "Minus".to_string(),
-                        ty: DeclarationId(2170),
-                    },
-                    Field {
-                        label: "Star".to_string(),
-                        ty: DeclarationId(2171),
-                    },
-                    Field {
-                        label: "Slash".to_string(),
-                        ty: DeclarationId(2172),
-                    },
-                    Field {
-                        label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2173),
-                    },
-                    Field {
-                        label: "PipePipe".to_string(),
-                        ty: DeclarationId(2174),
-                    },
-                    Field {
-                        label: "Colon".to_string(),
-                        ty: DeclarationId(2175),
-                    },
-                    Field {
-                        label: "Arrow".to_string(),
-                        ty: DeclarationId(2176),
-                    },
-                    Field {
-                        label: "FatArrow".to_string(),
-                        ty: DeclarationId(2177),
-                    },
-                    Field {
-                        label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2178),
-                    },
-                    Field {
-                        label: "Dot".to_string(),
-                        ty: DeclarationId(2179),
-                    },
-                    Field {
-                        label: "LParen".to_string(),
-                        ty: DeclarationId(2180),
-                    },
-                    Field {
-                        label: "RParen".to_string(),
-                        ty: DeclarationId(2181),
-                    },
-                    Field {
-                        label: "LBrace".to_string(),
-                        ty: DeclarationId(2182),
-                    },
-                    Field {
-                        label: "RBrace".to_string(),
-                        ty: DeclarationId(2183),
-                    },
-                    Field {
-                        label: "LBracket".to_string(),
-                        ty: DeclarationId(2184),
-                    },
-                    Field {
-                        label: "RBracket".to_string(),
-                        ty: DeclarationId(2185),
-                    },
-                    Field {
-                        label: "Comma".to_string(),
-                        ty: DeclarationId(2186),
-                    },
-                    Field {
-                        label: "Semicolon".to_string(),
-                        ty: DeclarationId(2187),
-                    },
-                    Field {
-                        label: "Pipe".to_string(),
-                        ty: DeclarationId(2188),
-                    },
-                    Field {
-                        label: "Question".to_string(),
-                        ty: DeclarationId(2189),
-                    },
-                    Field {
-                        label: "Eof".to_string(),
-                        ty: DeclarationId(2190),
-                    },
-=======
                         ty: DeclarationId(2147),
                     },
                     Field {
@@ -44985,7 +40823,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "Eof".to_string(),
                         ty: DeclarationId(2191),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -45030,58 +40867,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2191),
-                    },
-                    Field {
-                        label: "KwIf".to_string(),
-                        ty: DeclarationId(2192),
-                    },
-                    Field {
-                        label: "KwThen".to_string(),
-                        ty: DeclarationId(2193),
-                    },
-                    Field {
-                        label: "KwElse".to_string(),
-                        ty: DeclarationId(2194),
-                    },
-                    Field {
-                        label: "KwFn".to_string(),
-                        ty: DeclarationId(2195),
-                    },
-                    Field {
-                        label: "KwType".to_string(),
-                        ty: DeclarationId(2196),
-                    },
-                    Field {
-                        label: "KwModule".to_string(),
-                        ty: DeclarationId(2197),
-                    },
-                    Field {
-                        label: "KwImport".to_string(),
-                        ty: DeclarationId(2198),
-                    },
-                    Field {
-                        label: "KwMatch".to_string(),
-                        ty: DeclarationId(2199),
-                    },
-                    Field {
-                        label: "KwData".to_string(),
-                        ty: DeclarationId(2200),
-                    },
-                    Field {
-                        label: "KwWhere".to_string(),
-                        ty: DeclarationId(2201),
-                    },
-                    Field {
-                        label: "KwTrue".to_string(),
-                        ty: DeclarationId(2202),
-                    },
-                    Field {
-                        label: "KwFalse".to_string(),
-                        ty: DeclarationId(2203),
-                    },
-=======
                         ty: DeclarationId(2192),
                     },
                     Field {
@@ -45132,7 +40917,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "KwFalse".to_string(),
                         ty: DeclarationId(2204),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -45152,118 +40936,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2204),
-                    },
-                    Field {
-                        label: "EqEq".to_string(),
-                        ty: DeclarationId(2205),
-                    },
-                    Field {
-                        label: "NotEq".to_string(),
-                        ty: DeclarationId(2206),
-                    },
-                    Field {
-                        label: "Lt".to_string(),
-                        ty: DeclarationId(2207),
-                    },
-                    Field {
-                        label: "Le".to_string(),
-                        ty: DeclarationId(2208),
-                    },
-                    Field {
-                        label: "Gt".to_string(),
-                        ty: DeclarationId(2209),
-                    },
-                    Field {
-                        label: "Ge".to_string(),
-                        ty: DeclarationId(2210),
-                    },
-                    Field {
-                        label: "Plus".to_string(),
-                        ty: DeclarationId(2211),
-                    },
-                    Field {
-                        label: "Minus".to_string(),
-                        ty: DeclarationId(2212),
-                    },
-                    Field {
-                        label: "Star".to_string(),
-                        ty: DeclarationId(2213),
-                    },
-                    Field {
-                        label: "Slash".to_string(),
-                        ty: DeclarationId(2214),
-                    },
-                    Field {
-                        label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2215),
-                    },
-                    Field {
-                        label: "PipePipe".to_string(),
-                        ty: DeclarationId(2216),
-                    },
-                    Field {
-                        label: "Colon".to_string(),
-                        ty: DeclarationId(2217),
-                    },
-                    Field {
-                        label: "Arrow".to_string(),
-                        ty: DeclarationId(2218),
-                    },
-                    Field {
-                        label: "FatArrow".to_string(),
-                        ty: DeclarationId(2219),
-                    },
-                    Field {
-                        label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2220),
-                    },
-                    Field {
-                        label: "Dot".to_string(),
-                        ty: DeclarationId(2221),
-                    },
-                    Field {
-                        label: "LParen".to_string(),
-                        ty: DeclarationId(2222),
-                    },
-                    Field {
-                        label: "RParen".to_string(),
-                        ty: DeclarationId(2223),
-                    },
-                    Field {
-                        label: "LBrace".to_string(),
-                        ty: DeclarationId(2224),
-                    },
-                    Field {
-                        label: "RBrace".to_string(),
-                        ty: DeclarationId(2225),
-                    },
-                    Field {
-                        label: "LBracket".to_string(),
-                        ty: DeclarationId(2226),
-                    },
-                    Field {
-                        label: "RBracket".to_string(),
-                        ty: DeclarationId(2227),
-                    },
-                    Field {
-                        label: "Comma".to_string(),
-                        ty: DeclarationId(2228),
-                    },
-                    Field {
-                        label: "Semicolon".to_string(),
-                        ty: DeclarationId(2229),
-                    },
-                    Field {
-                        label: "Pipe".to_string(),
-                        ty: DeclarationId(2230),
-                    },
-                    Field {
-                        label: "Question".to_string(),
-                        ty: DeclarationId(2231),
-                    },
-=======
                         ty: DeclarationId(2205),
                     },
                     Field {
@@ -45374,7 +41046,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "Question".to_string(),
                         ty: DeclarationId(2232),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -45619,46 +41290,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2235),
-                    },
-                    Field {
-                        label: "ParseError".to_string(),
-                        ty: DeclarationId(2236),
-                    },
-                    Field {
-                        label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(2237),
-                    },
-                    Field {
-                        label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(2238),
-                    },
-                    Field {
-                        label: "ResolveError".to_string(),
-                        ty: DeclarationId(2239),
-                    },
-                    Field {
-                        label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(2240),
-                    },
-                    Field {
-                        label: "BranchConditionNotBool".to_string(),
-                        ty: DeclarationId(2241),
-                    },
-                    Field {
-                        label: "MagnitudeOutOfRange".to_string(),
-                        ty: DeclarationId(2242),
-                    },
-                    Field {
-                        label: "MalformedIntegerRangeFact".to_string(),
-                        ty: DeclarationId(2243),
-                    },
-                    Field {
-                        label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(2244),
-                    },
-=======
                         ty: DeclarationId(2236),
                     },
                     Field {
@@ -45697,7 +41328,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "NominalOpacityViolation".to_string(),
                         ty: DeclarationId(2245),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -45717,19 +41347,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "AnyDetail".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2245),
-                    },
-                    Field {
-                        label: "Contains".to_string(),
-                        ty: DeclarationId(2246),
-=======
                         ty: DeclarationId(2246),
                     },
                     Field {
                         label: "Contains".to_string(),
                         ty: DeclarationId(2247),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -45775,19 +41397,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Resolved".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2247),
-                    },
-                    Field {
-                        label: "Unresolved".to_string(),
-                        ty: DeclarationId(2248),
-=======
                         ty: DeclarationId(2248),
                     },
                     Field {
                         label: "Unresolved".to_string(),
                         ty: DeclarationId(2249),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -45807,11 +41421,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "AtMostBudget".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2249),
-=======
                     ty: DeclarationId(2250),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -45831,13 +41441,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Associativity".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2250),
-                    },
-                    Field {
-                        label: "Commutativity".to_string(),
-                        ty: DeclarationId(2251),
-=======
                         ty: DeclarationId(2251),
                     },
                     Field {
@@ -45847,11 +41450,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "Identity".to_string(),
                         ty: DeclarationId(2253),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "Identity".to_string(),
-                        ty: DeclarationId(2252),
                     },
                 ],
             },
@@ -45890,11 +41488,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "LiteralProgram".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2253),
-=======
                     ty: DeclarationId(2254),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -45913,11 +41507,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "LinearCostForBindParam".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2254),
-=======
                     ty: DeclarationId(2255),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -45936,11 +41526,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "SelectedBindParamSizeVariable".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2255),
-=======
                     ty: DeclarationId(2256),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -45979,19 +41565,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LensCapabilityStructuralTerminal".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2256),
-                    },
-                    Field {
-                        label: "LensCapabilityStructuralPartial".to_string(),
-                        ty: DeclarationId(2257),
-=======
                         ty: DeclarationId(2257),
                     },
                     Field {
                         label: "LensCapabilityStructuralPartial".to_string(),
                         ty: DeclarationId(2258),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -46012,22 +41590,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LensCapabilityBehavioralComplete".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2258),
-                    },
-                    Field {
-                        label: "LensCapabilityBehavioralPartial".to_string(),
-                        ty: DeclarationId(2259),
-                    },
-                    Field {
-                        label: "LensCapabilityBehavioralStub".to_string(),
-                        ty: DeclarationId(2260),
-                    },
-                    Field {
-                        label: "LensCapabilityBehavioralNA".to_string(),
-                        ty: DeclarationId(2261),
-                    },
-=======
                         ty: DeclarationId(2259),
                     },
                     Field {
@@ -46042,7 +41604,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "LensCapabilityBehavioralNA".to_string(),
                         ty: DeclarationId(2262),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -46062,13 +41623,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LensCapabilityV2RealV2".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2262),
-                    },
-                    Field {
-                        label: "LensCapabilityV2NoneV3Native".to_string(),
-                        ty: DeclarationId(2263),
-=======
                         ty: DeclarationId(2263),
                     },
                     Field {
@@ -46078,11 +41632,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "LensCapabilityV2NotApplicable".to_string(),
                         ty: DeclarationId(2265),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "LensCapabilityV2NotApplicable".to_string(),
-                        ty: DeclarationId(2264),
                     },
                 ],
             },
@@ -46141,11 +41690,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-<<<<<<< HEAD
-            meta_tag: Some(DeclarationId(2304)),
-=======
             meta_tag: Some(DeclarationId(2305)),
->>>>>>> origin/main
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -46157,9 +41702,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2256),
-=======
                             constructor: DeclarationId(2257),
                             payload: vec![],
                         },
@@ -46246,7 +41788,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "structural".to_string(),
                         FieldValue::Variant {
                             constructor: DeclarationId(2257),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -46265,96 +41806,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         },
                     ),
                 ]),
-                FieldValue::Record(vec![
-                    (
-                        "lens_basename".to_string(),
-                        FieldValue::Literal(LiteralBits::String("cost.dag".to_string())),
-                    ),
-                    (
-                        "structural".to_string(),
-                        FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2256),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "behavioral".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2258),
-=======
-                            constructor: DeclarationId(2257),
->>>>>>> origin/main
-                            payload: vec![],
-                        },
-                    ),
-                    (
-<<<<<<< HEAD
-                        "v2_counterpart".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2262),
-                            payload: vec![],
-                        },
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "lens_basename".to_string(),
-                        FieldValue::Literal(LiteralBits::String(
-                            "cost_target_realization.dag".to_string(),
-                        )),
-                    ),
-                    (
-                        "structural".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2256),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "behavioral".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2261),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "v2_counterpart".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2263),
-                            payload: vec![],
-                        },
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "lens_basename".to_string(),
-                        FieldValue::Literal(LiteralBits::String(
-                            "effect_enumeration.dag".to_string(),
-                        )),
-                    ),
-                    (
-                        "structural".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2256),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "behavioral".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2259),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "v2_counterpart".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2263),
-                            payload: vec![],
-                        },
-                    ),
-                ]),
                 FieldValue::Record(vec![
                     (
                         "lens_basename".to_string(),
@@ -46363,40 +41814,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2256),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "behavioral".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2258),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "v2_counterpart".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2263),
-                            payload: vec![],
-                        },
-                    ),
-                ]),
-                FieldValue::Record(vec![
-                    (
-                        "lens_basename".to_string(),
-                        FieldValue::Literal(LiteralBits::String("parallelism.dag".to_string())),
-                    ),
-                    (
-                        "structural".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2256),
+                            constructor: DeclarationId(2257),
                             payload: vec![],
                         },
                     ),
                     (
-=======
->>>>>>> origin/main
                         "behavioral".to_string(),
                         FieldValue::Variant {
                             constructor: DeclarationId(2259),
@@ -46406,9 +41828,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2263),
-=======
                             constructor: DeclarationId(2264),
                             payload: vec![],
                         },
@@ -46437,7 +41856,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
                             constructor: DeclarationId(2264),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -46450,33 +41868,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2256),
-=======
                             constructor: DeclarationId(2257),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2258),
-=======
                             constructor: DeclarationId(2259),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2263),
-=======
                             constructor: DeclarationId(2264),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -46491,33 +41897,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2256),
-=======
                             constructor: DeclarationId(2257),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2258),
-=======
                             constructor: DeclarationId(2259),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2263),
-=======
                             constructor: DeclarationId(2264),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -46530,33 +41924,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2256),
-=======
                             constructor: DeclarationId(2257),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2258),
-=======
                             constructor: DeclarationId(2259),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2263),
-=======
                             constructor: DeclarationId(2264),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -46571,33 +41953,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2256),
-=======
                             constructor: DeclarationId(2257),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2258),
-=======
                             constructor: DeclarationId(2259),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2263),
-=======
                             constructor: DeclarationId(2264),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -46610,33 +41980,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2257),
-=======
                             constructor: DeclarationId(2258),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2261),
-=======
                             constructor: DeclarationId(2262),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2264),
-=======
                             constructor: DeclarationId(2265),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -46649,33 +42007,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2257),
-=======
                             constructor: DeclarationId(2258),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2261),
-=======
                             constructor: DeclarationId(2262),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2264),
-=======
                             constructor: DeclarationId(2265),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -46690,33 +42036,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2256),
-=======
                             constructor: DeclarationId(2257),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2261),
-=======
                             constructor: DeclarationId(2262),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2264),
-=======
                             constructor: DeclarationId(2265),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -46724,7 +42058,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ])),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 7185, 9772),
+            span: SourceSpan::new("src/v3/std/verification.dag", 7185, 9768),
         });
         declarations.push(Declaration {
             id: DeclarationId(1277),
@@ -46733,110 +42067,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Compiles".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2265),
-                    },
-                    Field {
-                        label: "FailsWithDiagnostic".to_string(),
-                        ty: DeclarationId(2266),
-                    },
-                    Field {
-                        label: "OutputEquals".to_string(),
-                        ty: DeclarationId(2267),
-                    },
-                    Field {
-                        label: "PortHasState".to_string(),
-                        ty: DeclarationId(2268),
-                    },
-                    Field {
-                        label: "DeclarationHasRefinement".to_string(),
-                        ty: DeclarationId(2269),
-                    },
-                    Field {
-                        label: "CostBounded".to_string(),
-                        ty: DeclarationId(2270),
-                    },
-                    Field {
-                        label: "BehavioralObservation".to_string(),
-                        ty: DeclarationId(2271),
-                    },
-                    Field {
-                        label: "MockBackedInvariant".to_string(),
-                        ty: DeclarationId(2272),
-                    },
-                    Field {
-                        label: "ExecuteCommand".to_string(),
-                        ty: DeclarationId(2274),
-                    },
-                    Field {
-                        label: "ForAllTargets".to_string(),
-                        ty: DeclarationId(2276),
-                    },
-                    Field {
-                        label: "LensOutputEquals".to_string(),
-                        ty: DeclarationId(2277),
-                    },
-                    Field {
-                        label: "DifferentialEquals".to_string(),
-                        ty: DeclarationId(2278),
-                    },
-                    Field {
-                        label: "SymbolicCostExprEquals".to_string(),
-                        ty: DeclarationId(2279),
-                    },
-                    Field {
-                        label: "SymbolicCostExprEqualsForBindParam".to_string(),
-                        ty: DeclarationId(2280),
-                    },
-                    Field {
-                        label: "PerfWithinBaseline".to_string(),
-                        ty: DeclarationId(2281),
-                    },
-                    Field {
-                        label: "BinaryDimensionReportEquals".to_string(),
-                        ty: DeclarationId(2282),
-                    },
-                    Field {
-                        label: "AlgebraicLaw".to_string(),
-                        ty: DeclarationId(2283),
-                    },
-                    Field {
-                        label: "CensusBoundCheck".to_string(),
-                        ty: DeclarationId(2284),
-                    },
-                    Field {
-                        label: "CensusSubsetCount".to_string(),
-                        ty: DeclarationId(2285),
-                    },
-                    Field {
-                        label: "FixedPointConverges".to_string(),
-                        ty: DeclarationId(2286),
-                    },
-                    Field {
-                        label: "RatchetZero".to_string(),
-                        ty: DeclarationId(2287),
-                    },
-                    Field {
-                        label: "GeneratedFromDag".to_string(),
-                        ty: DeclarationId(2289),
-                    },
-                    Field {
-                        label: "CementingDispatchMatchesProjection".to_string(),
-                        ty: DeclarationId(2290),
-                    },
-                    Field {
-                        label: "ReleaseDeferredClaim".to_string(),
-                        ty: DeclarationId(2291),
-                    },
-                    Field {
-                        label: "SubstrateResearchDeferredClaim".to_string(),
-                        ty: DeclarationId(2292),
-                    },
-                    Field {
-                        label: "BridgeLedgerZero".to_string(),
-                        ty: DeclarationId(2293),
-                    },
-=======
                         ty: DeclarationId(2266),
                     },
                     Field {
@@ -46939,7 +42169,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "BridgeLedgerZero".to_string(),
                         ty: DeclarationId(2294),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -46950,7 +42179,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", 9774, 22667),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9770, 22663),
         });
         declarations.push(Declaration {
             id: DeclarationId(1278),
@@ -46964,7 +42193,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", 22775, 22795),
+            span: SourceSpan::new("src/v3/std/verification.dag", 22771, 22791),
         });
         declarations.push(Declaration {
             id: DeclarationId(1279),
@@ -46983,7 +42212,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", 22938, 22993),
+            span: SourceSpan::new("src/v3/std/verification.dag", 22934, 22989),
         });
         declarations.push(Declaration {
             id: DeclarationId(1280),
@@ -47008,11 +42237,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "requires".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2294),
-=======
                         ty: DeclarationId(2295),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -47024,7 +42249,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", 23603, 23736),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23599, 23732),
         });
         declarations.push(Declaration {
             id: DeclarationId(1281),
@@ -47033,19 +42258,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ForAll".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2295),
-                    },
-                    Field {
-                        label: "Exists".to_string(),
-                        ty: DeclarationId(2296),
-=======
                         ty: DeclarationId(2296),
                     },
                     Field {
                         label: "Exists".to_string(),
                         ty: DeclarationId(2297),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -47057,7 +42274,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", 23917, 23954),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23913, 23950),
         });
         declarations.push(Declaration {
             id: DeclarationId(1282),
@@ -47082,11 +42299,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "requires".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2297),
-=======
                         ty: DeclarationId(2298),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -47098,7 +42311,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", 23956, 24117),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23952, 24113),
         });
         declarations.push(Declaration {
             id: DeclarationId(1283),
@@ -47107,19 +42320,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "EnumeratedTestNode".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2298),
-                    },
-                    Field {
-                        label: "QuantifiedTestNode".to_string(),
-                        ty: DeclarationId(2299),
-=======
                         ty: DeclarationId(2299),
                     },
                     Field {
                         label: "QuantifiedTestNode".to_string(),
                         ty: DeclarationId(2300),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -47131,7 +42336,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", 25817, 25911),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25813, 25907),
         });
         declarations.push(Declaration {
             id: DeclarationId(1284),
@@ -47160,7 +42365,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", 25913, 26016),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25909, 26012),
         });
         declarations.push(Declaration {
             id: DeclarationId(1285),
@@ -47169,13 +42374,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Enumerated".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2300),
-                    },
-                    Field {
-                        label: "Quantified".to_string(),
-                        ty: DeclarationId(2301),
-=======
                         ty: DeclarationId(2301),
                     },
                     Field {
@@ -47206,7 +42404,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "claims".to_string(),
                         ty: DeclarationId(2303),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -47218,46 +42415,11 @@ 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", 26749, 26826),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26824, 26884),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1284),
-            name: Some("TestSuite".to_string()),
-=======
             id: DeclarationId(1287),
             name: Some("TestObligation".to_string()),
->>>>>>> origin/main
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-<<<<<<< HEAD
-                        label: "claims".to_string(),
-                        ty: DeclarationId(2302),
-=======
-                        label: "resources".to_string(),
-                        ty: DeclarationId(2304),
->>>>>>> origin/main
-                    },
-                ],
-            },
-            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", 26828, 26888),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1285),
-            name: Some("TestObligation".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
@@ -47266,7 +42428,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "resources".to_string(),
-                        ty: DeclarationId(2303),
+                        ty: DeclarationId(2304),
                     },
                 ],
             },
@@ -47278,23 +42440,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", 27086, 27167),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27082, 27163),
         });
         declarations.push(Declaration {
             id: DeclarationId(1288),
             name: Some("claim_obligation_resources".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(1278)],
-                output: DeclarationId(2232),
-=======
                 inputs: vec![DeclarationId(1280)],
                 output: DeclarationId(2233),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    27609,
-                    27625,
+                    27605,
+                    27621,
                 )),
             },
             type_params: vec![],
@@ -47305,7 +42462,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", 27538, 27625),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27534, 27621),
         });
         declarations.push(Declaration {
             id: DeclarationId(1289),
@@ -47315,8 +42472,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 output: DeclarationId(1287),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    27683,
-                    27768,
+                    27679,
+                    27764,
                 )),
             },
             type_params: vec![],
@@ -47327,7 +42484,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", 27627, 27768),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27623, 27764),
         });
         declarations.push(Declaration {
             id: DeclarationId(1290),
@@ -47337,8 +42494,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 output: DeclarationId(1287),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    28075,
-                    28141,
+                    28071,
+                    28137,
                 )),
             },
             type_params: vec![],
@@ -47349,7 +42506,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", 27998, 28141),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27994, 28137),
         });
         declarations.push(Declaration {
             id: DeclarationId(1291),
@@ -47367,23 +42524,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", 28446, 28635),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28442, 28631),
         });
         declarations.push(Declaration {
             id: DeclarationId(1292),
             name: Some("materialize_test_obligations".to_string()),
             connective: TypeConnective::Arrow {
-<<<<<<< HEAD
-                inputs: vec![DeclarationId(2233)],
-                output: DeclarationId(2234),
-=======
                 inputs: vec![DeclarationId(2234)],
                 output: DeclarationId(2235),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    28719,
-                    28764,
+                    28715,
+                    28760,
                 )),
             },
             type_params: vec![],
@@ -47394,20 +42546,15 @@ 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", 28637, 28764),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28633, 28760),
         });
         declarations.push(Declaration {
             id: DeclarationId(1293),
             name: Some("behavior_spine".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828)],
-<<<<<<< HEAD
-                output: DeclarationId(2305),
-                body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(813))),
-=======
                 output: DeclarationId(2306),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(815))),
->>>>>>> origin/main
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -47543,13 +42690,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "SnapshotSurface".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2306),
-                    },
-                    Field {
-                        label: "SnapshotDag".to_string(),
-                        ty: DeclarationId(2307),
-=======
                         ty: DeclarationId(2307),
                     },
                     Field {
@@ -47559,11 +42699,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "SnapshotText".to_string(),
                         ty: DeclarationId(2309),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "SnapshotText".to_string(),
-                        ty: DeclarationId(2308),
                     },
                 ],
             },
@@ -47763,81 +42898,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-<<<<<<< HEAD
-            meta_tag: Some(DeclarationId(1301)),
-            specialization_parent: None,
-            inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![
-                    (
-                        "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1314)),
-                    ),
-                    (
-                        "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1302)),
-                    ),
-                    (
-                        "snapshot".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2306),
-                            payload: vec![],
-                        },
-                    ),
-                ],
-            }),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1254, 1382),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1309),
-            name: Some("lower_stage_binding".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1301),
-                arguments: vec![],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1301)),
-            specialization_parent: None,
-            inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![
-                    (
-                        "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1315)),
-                    ),
-                    (
-                        "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1303)),
-                    ),
-                    (
-                        "snapshot".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2307),
-                            payload: vec![],
-                        },
-                    ),
-                ],
-            }),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1384, 1508),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1310),
-            name: Some("infer_stage_binding".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1301),
-                arguments: vec![],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1301)),
-=======
             meta_tag: Some(DeclarationId(1303)),
->>>>>>> origin/main
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -47888,11 +42949,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2307),
-=======
                             constructor: DeclarationId(2308),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -47927,11 +42984,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2307),
-=======
                             constructor: DeclarationId(2308),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -47967,8 +43020,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "snapshot".to_string(),
                         FieldValue::Variant {
                             constructor: DeclarationId(2308),
-<<<<<<< HEAD
-=======
                             payload: vec![],
                         },
                     ),
@@ -48039,7 +43090,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         "snapshot".to_string(),
                         FieldValue::Variant {
                             constructor: DeclarationId(2309),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ),
@@ -48189,11 +43239,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("from_symbol".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230)],
-<<<<<<< HEAD
-                output: DeclarationId(2309),
-=======
                 output: DeclarationId(2310),
->>>>>>> origin/main
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/compiler/operators.dag",
                     156,
@@ -48423,47 +43469,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2818, 3035),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1329),
-            name: Some("lens_parallelism_entry".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1324),
-                arguments: vec![],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1324)),
-            specialization_parent: None,
-            inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![
-                    (
-                        "name".to_string(),
-                        FieldValue::Literal(LiteralBits::String("parallelism".to_string())),
-                    ),
-                    (
-                        "lens_file".to_string(),
-                        FieldValue::Literal(LiteralBits::String(
-                            "src/v3/lenses/parallelism.dag".to_string(),
-                        )),
-                    ),
-                    (
-                        "generated_file".to_string(),
-                        FieldValue::Literal(LiteralBits::String(
-                            "src/v3/compiler/src/lens_parallelism_generated.rs".to_string(),
-                        )),
-                    ),
-                ],
-            }),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 3037, 3226),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1330),
-=======
             id: DeclarationId(1331),
->>>>>>> origin/main
             name: Some("lens_provenance_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1326),
@@ -48496,14 +43502,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 3228, 3413),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 3037, 3222),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1331),
-=======
             id: DeclarationId(1332),
->>>>>>> origin/main
             name: Some("lens_structural_resolution_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1326),
@@ -48539,14 +43541,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 3415, 3644),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 3224, 3453),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1332),
-=======
             id: DeclarationId(1333),
->>>>>>> origin/main
             name: Some("lens_unused_parameters_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1326),
@@ -48579,14 +43577,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 3646, 3859),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 3455, 3668),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1333),
-=======
             id: DeclarationId(1334),
->>>>>>> origin/main
             name: Some("lens_infer_helpers_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1326),
@@ -48619,14 +43613,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 4486, 4678),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 4295, 4487),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1334),
-=======
             id: DeclarationId(1335),
->>>>>>> origin/main
             name: Some("lens_variant_payload_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1326),
@@ -48659,14 +43649,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 4680, 4880),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 4489, 4689),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1335),
-=======
             id: DeclarationId(1336),
->>>>>>> origin/main
             name: Some("lens_lower_helpers_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1326),
@@ -48699,32 +43685,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 5130, 5322),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 4939, 5131),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1336),
-=======
             id: DeclarationId(1337),
->>>>>>> origin/main
             name: Some("IntegerAlgebra".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "OrderedRingAlgebra".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2310),
-                    },
-                    Field {
-                        label: "SemiringAlgebra".to_string(),
-                        ty: DeclarationId(2311),
-=======
                         ty: DeclarationId(2311),
                     },
                     Field {
                         label: "SemiringAlgebra".to_string(),
                         ty: DeclarationId(2312),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -48739,23 +43713,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6404, 6466),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1337),
-=======
             id: DeclarationId(1338),
->>>>>>> origin/main
             name: Some("NonIntegerAlgebra".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ApproximateFieldAlgebra".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2312),
-                    },
-                    Field {
-                        label: "BooleanAlgebraAlgebra".to_string(),
-                        ty: DeclarationId(2313),
-=======
                         ty: DeclarationId(2313),
                     },
                     Field {
@@ -48765,11 +43728,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "TerminalAlgebra".to_string(),
                         ty: DeclarationId(2315),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "TerminalAlgebra".to_string(),
-                        ty: DeclarationId(2314),
                     },
                 ],
             },
@@ -48784,44 +43742,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6468, 6564),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1338),
-=======
             id: DeclarationId(1339),
->>>>>>> origin/main
             name: Some("TargetCarrier".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BitCarrier".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2315),
-                    },
-                    Field {
-                        label: "ByteCarrier".to_string(),
-                        ty: DeclarationId(2316),
-                    },
-                    Field {
-                        label: "Word16Carrier".to_string(),
-                        ty: DeclarationId(2317),
-                    },
-                    Field {
-                        label: "Word32Carrier".to_string(),
-                        ty: DeclarationId(2318),
-                    },
-                    Field {
-                        label: "Word64Carrier".to_string(),
-                        ty: DeclarationId(2319),
-                    },
-                    Field {
-                        label: "Word128Carrier".to_string(),
-                        ty: DeclarationId(2320),
-                    },
-                    Field {
-                        label: "TerminalCarrier".to_string(),
-                        ty: DeclarationId(2321),
-                    },
-=======
                         ty: DeclarationId(2316),
                     },
                     Field {
@@ -48848,7 +43774,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "TerminalCarrier".to_string(),
                         ty: DeclarationId(2322),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -48862,23 +43787,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8154, 8296),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1339),
-=======
             id: DeclarationId(1340),
->>>>>>> origin/main
             name: Some("IntegerOverflow".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TwoComplementWrap".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2322),
-                    },
-                    Field {
-                        label: "Saturating".to_string(),
-                        ty: DeclarationId(2323),
-=======
                         ty: DeclarationId(2323),
                     },
                     Field {
@@ -48888,11 +43802,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "Trap".to_string(),
                         ty: DeclarationId(2325),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "Trap".to_string(),
-                        ty: DeclarationId(2324),
                     },
                 ],
             },
@@ -48907,29 +43816,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9013, 9079),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1340),
-=======
             id: DeclarationId(1341),
->>>>>>> origin/main
             name: Some("RustPrimitive".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IntegerPrimitive".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2325),
-                    },
-                    Field {
-                        label: "NonIntegerPrimitive".to_string(),
-                        ty: DeclarationId(2326),
-=======
                         ty: DeclarationId(2326),
                     },
                     Field {
                         label: "NonIntegerPrimitive".to_string(),
                         ty: DeclarationId(2327),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -48944,150 +43841,75 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9834, 10616),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1341),
-=======
             id: DeclarationId(1342),
->>>>>>> origin/main
             name: Some("rust_pilot_primitives".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-<<<<<<< HEAD
-                    value: DeclarationId(1340),
-=======
                     value: DeclarationId(1341),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-<<<<<<< HEAD
-            meta_tag: Some(DeclarationId(2327)),
-=======
             meta_tag: Some(DeclarationId(2328)),
->>>>>>> origin/main
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
                 FieldValue::Variant {
-<<<<<<< HEAD
-                    constructor: DeclarationId(2325),
-                    payload: vec![
-                        FieldValue::Literal(LiteralBits::String("i8".to_string())),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2310),
-                            payload: vec![],
-                        },
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2316),
-                            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(2322),
-                            payload: vec![],
-                        },
-                    ],
-                },
-                FieldValue::Variant {
-                    constructor: DeclarationId(2325),
-                    payload: vec![
-                        FieldValue::Literal(LiteralBits::String("i16".to_string())),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2310),
-=======
                     constructor: DeclarationId(2326),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i8".to_string())),
                         FieldValue::Variant {
                             constructor: DeclarationId(2311),
->>>>>>> origin/main
                             payload: vec![],
                         },
                         FieldValue::Variant {
                             constructor: DeclarationId(2317),
                             payload: vec![],
                         },
-<<<<<<< HEAD
-                        FieldValue::Literal(LiteralBits::String("-32768".to_string())),
-                        FieldValue::Literal(LiteralBits::String("32767".to_string())),
-                        FieldValue::Literal(LiteralBits::Bool(true)),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2322),
-=======
                         FieldValue::Literal(LiteralBits::String("-128".to_string())),
                         FieldValue::Literal(LiteralBits::String("127".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
                             constructor: DeclarationId(2323),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-<<<<<<< HEAD
-                    constructor: DeclarationId(2325),
-                    payload: vec![
-                        FieldValue::Literal(LiteralBits::String("i32".to_string())),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2310),
-=======
                     constructor: DeclarationId(2326),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i16".to_string())),
                         FieldValue::Variant {
                             constructor: DeclarationId(2311),
->>>>>>> origin/main
                             payload: vec![],
                         },
                         FieldValue::Variant {
                             constructor: DeclarationId(2318),
                             payload: vec![],
                         },
-<<<<<<< HEAD
-                        FieldValue::Literal(LiteralBits::String("-2147483648".to_string())),
-                        FieldValue::Literal(LiteralBits::String("2147483647".to_string())),
-                        FieldValue::Literal(LiteralBits::Bool(true)),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2322),
-=======
                         FieldValue::Literal(LiteralBits::String("-32768".to_string())),
                         FieldValue::Literal(LiteralBits::String("32767".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
                             constructor: DeclarationId(2323),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-<<<<<<< HEAD
-                    constructor: DeclarationId(2325),
-                    payload: vec![
-                        FieldValue::Literal(LiteralBits::String("i64".to_string())),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2310),
-=======
                     constructor: DeclarationId(2326),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i32".to_string())),
                         FieldValue::Variant {
                             constructor: DeclarationId(2311),
->>>>>>> origin/main
                             payload: vec![],
                         },
                         FieldValue::Variant {
                             constructor: DeclarationId(2319),
                             payload: vec![],
                         },
-<<<<<<< HEAD
-=======
                         FieldValue::Literal(LiteralBits::String("-2147483648".to_string())),
                         FieldValue::Literal(LiteralBits::String("2147483647".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
@@ -49109,34 +43931,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             constructor: DeclarationId(2320),
                             payload: vec![],
                         },
->>>>>>> origin/main
                         FieldValue::Literal(LiteralBits::String(
                             "-9223372036854775808".to_string(),
                         )),
                         FieldValue::Literal(LiteralBits::String("9223372036854775807".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2322),
-=======
                             constructor: DeclarationId(2323),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-<<<<<<< HEAD
-                    constructor: DeclarationId(2325),
-                    payload: vec![
-                        FieldValue::Literal(LiteralBits::String("i128".to_string())),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2310),
-                            payload: vec![],
-                        },
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2320),
-=======
                     constructor: DeclarationId(2326),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i128".to_string())),
@@ -49146,7 +43952,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         },
                         FieldValue::Variant {
                             constructor: DeclarationId(2321),
->>>>>>> origin/main
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -49157,50 +43962,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2322),
-=======
                             constructor: DeclarationId(2323),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-<<<<<<< HEAD
-                    constructor: DeclarationId(2325),
-                    payload: vec![
-                        FieldValue::Literal(LiteralBits::String("u8".to_string())),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2311),
-                            payload: vec![],
-                        },
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2316),
-                            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(2322),
-                            payload: vec![],
-                        },
-                    ],
-                },
-                FieldValue::Variant {
-                    constructor: DeclarationId(2325),
-                    payload: vec![
-                        FieldValue::Literal(LiteralBits::String("u16".to_string())),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2311),
-=======
                     constructor: DeclarationId(2326),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u8".to_string())),
                         FieldValue::Variant {
                             constructor: DeclarationId(2312),
->>>>>>> origin/main
                             payload: vec![],
                         },
                         FieldValue::Variant {
@@ -49208,35 +43980,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
-<<<<<<< HEAD
-                        FieldValue::Literal(LiteralBits::String("65535".to_string())),
-                        FieldValue::Literal(LiteralBits::Bool(true)),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2322),
-=======
                         FieldValue::Literal(LiteralBits::String("255".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
                             constructor: DeclarationId(2323),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-<<<<<<< HEAD
-                    constructor: DeclarationId(2325),
-                    payload: vec![
-                        FieldValue::Literal(LiteralBits::String("u32".to_string())),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2311),
-=======
                     constructor: DeclarationId(2326),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u16".to_string())),
                         FieldValue::Variant {
                             constructor: DeclarationId(2312),
->>>>>>> origin/main
                             payload: vec![],
                         },
                         FieldValue::Variant {
@@ -49244,12 +44001,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
-<<<<<<< HEAD
-                        FieldValue::Literal(LiteralBits::String("4294967295".to_string())),
-                        FieldValue::Literal(LiteralBits::Bool(true)),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2322),
-=======
                         FieldValue::Literal(LiteralBits::String("65535".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
@@ -49298,25 +44049,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
                             constructor: DeclarationId(2323),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-<<<<<<< HEAD
-                    constructor: DeclarationId(2325),
-=======
                     constructor: DeclarationId(2326),
->>>>>>> origin/main
                     payload: vec![
-                        FieldValue::Literal(LiteralBits::String("u64".to_string())),
+                        FieldValue::Literal(LiteralBits::String("u128".to_string())),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2311),
-=======
                             constructor: DeclarationId(2312),
->>>>>>> origin/main
                             payload: vec![],
                         },
                         FieldValue::Variant {
@@ -49324,72 +44066,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
-                        FieldValue::Literal(LiteralBits::String(
-                            "18446744073709551615".to_string(),
-                        )),
-                        FieldValue::Literal(LiteralBits::Bool(true)),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2322),
-                            payload: vec![],
-                        },
-                    ],
-                },
-                FieldValue::Variant {
-                    constructor: DeclarationId(2325),
-                    payload: vec![
-                        FieldValue::Literal(LiteralBits::String("u128".to_string())),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2311),
-                            payload: vec![],
-                        },
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2320),
-                            payload: vec![],
-                        },
-                        FieldValue::Literal(LiteralBits::String("0".to_string())),
                         FieldValue::Literal(LiteralBits::String(
                             "340282366920938463463374607431768211455".to_string(),
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-<<<<<<< HEAD
-                            constructor: DeclarationId(2322),
-=======
                             constructor: DeclarationId(2323),
->>>>>>> origin/main
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-<<<<<<< HEAD
-                    constructor: DeclarationId(2326),
-                    payload: vec![
-                        FieldValue::Literal(LiteralBits::String("f32".to_string())),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2312),
-                            payload: vec![],
-                        },
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2318),
-                            payload: vec![],
-                        },
-                        FieldValue::Literal(LiteralBits::Bool(true)),
-                    ],
-                },
-                FieldValue::Variant {
-                    constructor: DeclarationId(2326),
-                    payload: vec![
-                        FieldValue::Literal(LiteralBits::String("f64".to_string())),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2312),
-=======
                     constructor: DeclarationId(2327),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("f32".to_string())),
                         FieldValue::Variant {
                             constructor: DeclarationId(2313),
->>>>>>> origin/main
                             payload: vec![],
                         },
                         FieldValue::Variant {
@@ -49400,36 +44092,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     ],
                 },
                 FieldValue::Variant {
-<<<<<<< HEAD
-                    constructor: DeclarationId(2326),
-                    payload: vec![
-                        FieldValue::Literal(LiteralBits::String("bool".to_string())),
-=======
                     constructor: DeclarationId(2327),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("f64".to_string())),
->>>>>>> origin/main
                         FieldValue::Variant {
                             constructor: DeclarationId(2313),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2315),
-                            payload: vec![],
-                        },
-                        FieldValue::Literal(LiteralBits::Bool(true)),
-                    ],
-                },
-                FieldValue::Variant {
-                    constructor: DeclarationId(2326),
-                    payload: vec![
-                        FieldValue::Literal(LiteralBits::String("()".to_string())),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2314),
-                            payload: vec![],
-                        },
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2321),
+                            constructor: DeclarationId(2320),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
@@ -49471,31 +44142,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10937, 15660),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1342),
-=======
             id: DeclarationId(1343),
->>>>>>> origin/main
             name: Some("CronField".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Wildcard".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2328),
-                    },
-                    Field {
-                        label: "Exact".to_string(),
-                        ty: DeclarationId(2329),
-                    },
-                    Field {
-                        label: "Listed".to_string(),
-                        ty: DeclarationId(2331),
-                    },
-                    Field {
-                        label: "Ranged".to_string(),
-                        ty: DeclarationId(2332),
-=======
                         ty: DeclarationId(2329),
                     },
                     Field {
@@ -49513,11 +44165,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "Step".to_string(),
                         ty: DeclarationId(2334),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "Step".to_string(),
-                        ty: DeclarationId(2333),
                     },
                 ],
             },
@@ -49532,35 +44179,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4214, 4433),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1343),
-=======
             id: DeclarationId(1344),
->>>>>>> origin/main
             name: Some("CronSchedule".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "minute".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1342),
-                    },
-                    Field {
-                        label: "hour".to_string(),
-                        ty: DeclarationId(1342),
-                    },
-                    Field {
-                        label: "day_of_month".to_string(),
-                        ty: DeclarationId(1342),
-                    },
-                    Field {
-                        label: "month".to_string(),
-                        ty: DeclarationId(1342),
-                    },
-                    Field {
-                        label: "day_of_week".to_string(),
-                        ty: DeclarationId(1342),
-=======
                         ty: DeclarationId(1343),
                     },
                     Field {
@@ -49578,7 +44202,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "day_of_week".to_string(),
                         ty: DeclarationId(1343),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -49593,11 +44216,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4435, 4564),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1344),
-=======
             id: DeclarationId(1345),
->>>>>>> origin/main
             name: Some("CronEntry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -49607,11 +44226,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "schedule".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1343),
-=======
                         ty: DeclarationId(1344),
->>>>>>> origin/main
                     },
                     Field {
                         label: "command".to_string(),
@@ -49630,17 +44245,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4566, 4641),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1345),
-            name: Some("render_cron_field".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1342)],
-=======
             id: DeclarationId(1346),
             name: Some("render_cron_field".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1343)],
->>>>>>> origin/main
                 output: DeclarationId(230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "dsl/extdeps/cron_schedule_model.dag",
@@ -49659,17 +44267,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4643, 4963),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1346),
-            name: Some("render_cron_schedule".to_string()),
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1343)],
-=======
             id: DeclarationId(1347),
             name: Some("render_cron_schedule".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1344)],
->>>>>>> origin/main
                 output: DeclarationId(230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "dsl/extdeps/cron_schedule_model.dag",
@@ -49688,11 +44289,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4965, 5253),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1347),
-=======
             id: DeclarationId(1348),
->>>>>>> origin/main
             name: Some("wire_contract".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(312),
@@ -49713,23 +44310,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 684, 758),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1348),
-=======
             id: DeclarationId(1349),
->>>>>>> origin/main
             name: Some("UserType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "User".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2334),
-                    },
-                    Field {
-                        label: "Bot".to_string(),
-                        ty: DeclarationId(2335),
-=======
                         ty: DeclarationId(2335),
                     },
                     Field {
@@ -49739,11 +44325,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "Organization".to_string(),
                         ty: DeclarationId(2337),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "Organization".to_string(),
-                        ty: DeclarationId(2336),
                     },
                 ],
             },
@@ -49758,11 +44339,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 831, 872),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1349),
-=======
             id: DeclarationId(1350),
->>>>>>> origin/main
             name: Some("GitHubUser".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -49776,11 +44353,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "type".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1348),
-=======
                         ty: DeclarationId(1349),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -49795,11 +44368,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 874, 936),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1350),
-=======
             id: DeclarationId(1351),
->>>>>>> origin/main
             name: Some("Repository".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -49836,11 +44405,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1009, 1120),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1351),
-=======
             id: DeclarationId(1352),
->>>>>>> origin/main
             name: Some("GitHubAuthToken".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -49850,19 +44415,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "scopes".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2337),
-                    },
-                    Field {
-                        label: "expires_at".to_string(),
-                        ty: DeclarationId(2338),
-=======
                         ty: DeclarationId(2338),
                     },
                     Field {
                         label: "expires_at".to_string(),
                         ty: DeclarationId(2339),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -49877,36 +44434,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1193, 1286),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1352),
-=======
             id: DeclarationId(1353),
->>>>>>> origin/main
             name: Some("GitHubScope".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ScopeRepo".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2339),
-                    },
-                    Field {
-                        label: "ScopeGist".to_string(),
-                        ty: DeclarationId(2340),
-                    },
-                    Field {
-                        label: "ScopeWorkflow".to_string(),
-                        ty: DeclarationId(2341),
-                    },
-                    Field {
-                        label: "ScopeReadOrg".to_string(),
-                        ty: DeclarationId(2342),
-                    },
-                    Field {
-                        label: "ScopeReadUser".to_string(),
-                        ty: DeclarationId(2343),
-                    },
-=======
                         ty: DeclarationId(2340),
                     },
                     Field {
@@ -49925,7 +44458,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "ScopeReadUser".to_string(),
                         ty: DeclarationId(2344),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -49939,11 +44471,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1288, 1385),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1353),
-=======
             id: DeclarationId(1354),
->>>>>>> origin/main
             name: Some("Pagination".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -49953,11 +44481,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "cursor".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2344),
-=======
                         ty: DeclarationId(2345),
->>>>>>> origin/main
                     },
                     Field {
                         label: "has_next".to_string(),
@@ -49976,23 +44500,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1510, 1580),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1354),
-=======
             id: DeclarationId(1355),
->>>>>>> origin/main
             name: Some("GitHubPermission".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PermRead".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2345),
-                    },
-                    Field {
-                        label: "PermWrite".to_string(),
-                        ty: DeclarationId(2346),
-=======
                         ty: DeclarationId(2346),
                     },
                     Field {
@@ -50002,11 +44515,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "PermAdmin".to_string(),
                         ty: DeclarationId(2348),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "PermAdmin".to_string(),
-                        ty: DeclarationId(2347),
                     },
                 ],
             },
@@ -50021,11 +44529,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1653, 1709),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1355),
-=======
             id: DeclarationId(1356),
->>>>>>> origin/main
             name: Some("default_api_base".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -50044,11 +44548,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1782, 1838),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1356),
-=======
             id: DeclarationId(1357),
->>>>>>> origin/main
             name: Some("default_per_page".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -50065,11 +44565,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1840, 1871),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1357),
-=======
             id: DeclarationId(1358),
->>>>>>> origin/main
             name: Some("max_per_page".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -50086,11 +44582,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1873, 1901),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1358),
-=======
             id: DeclarationId(1359),
->>>>>>> origin/main
             name: Some("Workflow".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -50100,21 +44592,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "on".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2348),
-                    },
-                    Field {
-                        label: "concurrency".to_string(),
-                        ty: DeclarationId(2349),
-                    },
-                    Field {
-                        label: "jobs".to_string(),
-                        ty: DeclarationId(2350),
-                    },
-                    Field {
-                        label: "env".to_string(),
-                        ty: DeclarationId(2352),
-=======
                         ty: DeclarationId(2349),
                     },
                     Field {
@@ -50124,7 +44601,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "jobs".to_string(),
                         ty: DeclarationId(2351),
->>>>>>> origin/main
                     },
                     Field {
                         label: "env".to_string(),
@@ -50132,11 +44608,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "permissions".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2353),
-=======
                         ty: DeclarationId(2354),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -50151,31 +44623,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1484, 1748),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1359),
-=======
             id: DeclarationId(1360),
->>>>>>> origin/main
             name: Some("WorkflowPermissions".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "contents".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1360),
-                    },
-                    Field {
-                        label: "pull_requests".to_string(),
-                        ty: DeclarationId(1360),
-                    },
-                    Field {
-                        label: "issues".to_string(),
-                        ty: DeclarationId(1360),
-                    },
-                    Field {
-                        label: "actions".to_string(),
-                        ty: DeclarationId(1360),
-=======
                         ty: DeclarationId(1361),
                     },
                     Field {
@@ -50189,7 +44642,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "actions".to_string(),
                         ty: DeclarationId(1361),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -50204,23 +44656,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1750, 1892),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1360),
-=======
             id: DeclarationId(1361),
->>>>>>> origin/main
             name: Some("PermissionLevel".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PermRead".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2354),
-                    },
-                    Field {
-                        label: "PermWrite".to_string(),
-                        ty: DeclarationId(2355),
-=======
                         ty: DeclarationId(2355),
                     },
                     Field {
@@ -50230,11 +44671,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "PermNone".to_string(),
                         ty: DeclarationId(2357),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "PermNone".to_string(),
-                        ty: DeclarationId(2356),
                     },
                 ],
             },
@@ -50249,35 +44685,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1894, 1948),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1361),
-=======
             id: DeclarationId(1362),
->>>>>>> origin/main
             name: Some("WorkflowTrigger".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Push".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2359),
-                    },
-                    Field {
-                        label: "PullRequest".to_string(),
-                        ty: DeclarationId(2362),
-                    },
-                    Field {
-                        label: "Schedule".to_string(),
-                        ty: DeclarationId(2363),
-                    },
-                    Field {
-                        label: "WorkflowDispatch".to_string(),
-                        ty: DeclarationId(2365),
-                    },
-                    Field {
-                        label: "WorkflowCall".to_string(),
-                        ty: DeclarationId(2367),
-=======
                         ty: DeclarationId(2360),
                     },
                     Field {
@@ -50291,7 +44704,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "WorkflowDispatch".to_string(),
                         ty: DeclarationId(2366),
->>>>>>> origin/main
                     },
                     Field {
                         label: "WorkflowCall".to_string(),
@@ -50310,36 +44722,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2064, 2356),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1362),
-=======
             id: DeclarationId(1363),
->>>>>>> origin/main
             name: Some("PullRequestActivity".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Opened".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2368),
-                    },
-                    Field {
-                        label: "Synchronize".to_string(),
-                        ty: DeclarationId(2369),
-                    },
-                    Field {
-                        label: "Reopened".to_string(),
-                        ty: DeclarationId(2370),
-                    },
-                    Field {
-                        label: "ReadyForReview".to_string(),
-                        ty: DeclarationId(2371),
-                    },
-                    Field {
-                        label: "Closed".to_string(),
-                        ty: DeclarationId(2372),
-                    },
-=======
                         ty: DeclarationId(2369),
                     },
                     Field {
@@ -50358,7 +44746,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "Closed".to_string(),
                         ty: DeclarationId(2373),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -50372,11 +44759,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2358, 2452),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1363),
-=======
             id: DeclarationId(1364),
->>>>>>> origin/main
             name: Some("DispatchInput".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -50386,11 +44769,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "description".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2373),
-=======
                         ty: DeclarationId(2374),
->>>>>>> origin/main
                     },
                     Field {
                         label: "required".to_string(),
@@ -50398,19 +44777,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "default".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2374),
-                    },
-                    Field {
-                        label: "type".to_string(),
-                        ty: DeclarationId(1364),
-=======
                         ty: DeclarationId(2375),
                     },
                     Field {
                         label: "type".to_string(),
                         ty: DeclarationId(1365),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -50425,32 +44796,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2454, 2576),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1364),
-=======
             id: DeclarationId(1365),
->>>>>>> origin/main
             name: Some("DispatchInputType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "InputString".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2375),
-                    },
-                    Field {
-                        label: "InputBoolean".to_string(),
-                        ty: DeclarationId(2376),
-                    },
-                    Field {
-                        label: "InputChoice".to_string(),
-                        ty: DeclarationId(2377),
-                    },
-                    Field {
-                        label: "InputEnvironment".to_string(),
-                        ty: DeclarationId(2378),
-                    },
-=======
                         ty: DeclarationId(2376),
                     },
                     Field {
@@ -50465,7 +44816,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "InputEnvironment".to_string(),
                         ty: DeclarationId(2379),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -50479,23 +44829,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2578, 2662),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1365),
-=======
             id: DeclarationId(1366),
->>>>>>> origin/main
             name: Some("SecretScope".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "StepScope".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2379),
-                    },
-                    Field {
-                        label: "JobScope".to_string(),
-                        ty: DeclarationId(2380),
-=======
                         ty: DeclarationId(2380),
                     },
                     Field {
@@ -50505,11 +44844,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "WorkflowScope".to_string(),
                         ty: DeclarationId(2382),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "WorkflowScope".to_string(),
-                        ty: DeclarationId(2381),
                     },
                 ],
             },
@@ -50524,11 +44858,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4765, 4820),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1366),
-=======
             id: DeclarationId(1367),
->>>>>>> origin/main
             name: Some("WorkflowSecret".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -50538,11 +44868,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "scope".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1365),
-=======
                         ty: DeclarationId(1366),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -50557,11 +44883,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5095, 5158),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1367),
-=======
             id: DeclarationId(1368),
->>>>>>> origin/main
             name: Some("Job".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -50571,43 +44893,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "name".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2382),
-                    },
-                    Field {
-                        label: "runner".to_string(),
-                        ty: DeclarationId(1371),
-                    },
-                    Field {
-                        label: "steps".to_string(),
-                        ty: DeclarationId(2383),
-                    },
-                    Field {
-                        label: "needs".to_string(),
-                        ty: DeclarationId(2384),
-                    },
-                    Field {
-                        label: "env".to_string(),
-                        ty: DeclarationId(2386),
-                    },
-                    Field {
-                        label: "outputs".to_string(),
-                        ty: DeclarationId(2388),
-                    },
-                    Field {
-                        label: "if_condition".to_string(),
-                        ty: DeclarationId(2389),
-                    },
-                    Field {
-                        label: "strategy".to_string(),
-                        ty: DeclarationId(2390),
-                    },
-                    Field {
-                        label: "timeout_minutes".to_string(),
-                        ty: DeclarationId(2391),
-                    },
-                    Field {
-=======
                         ty: DeclarationId(2383),
                     },
                     Field {
@@ -50643,17 +44928,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         ty: DeclarationId(2392),
                     },
                     Field {
->>>>>>> origin/main
                         label: "continue_on_error".to_string(),
                         ty: DeclarationId(128),
                     },
                     Field {
                         label: "concurrency".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2392),
-=======
                         ty: DeclarationId(2393),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -50668,29 +44948,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5302, 5771),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1368),
-=======
             id: DeclarationId(1369),
->>>>>>> origin/main
             name: Some("CancelInProgressSpec".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "CancelInProgressBool".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2393),
-                    },
-                    Field {
-                        label: "CancelInProgressExpression".to_string(),
-                        ty: DeclarationId(2394),
-=======
                         ty: DeclarationId(2394),
                     },
                     Field {
                         label: "CancelInProgressExpression".to_string(),
                         ty: DeclarationId(2395),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -50705,29 +44973,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6589, 6709),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1369),
-=======
             id: DeclarationId(1370),
->>>>>>> origin/main
             name: Some("CancelInProgressWhenQueueMax".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "QueueMaxCancelInProgressFalse".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2395),
-                    },
-                    Field {
-                        label: "QueueMaxCancelInProgressExpression".to_string(),
-                        ty: DeclarationId(2396),
-=======
                         ty: DeclarationId(2396),
                     },
                     Field {
                         label: "QueueMaxCancelInProgressExpression".to_string(),
                         ty: DeclarationId(2397),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -50742,25 +44998,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7517, 7646),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1370),
-=======
             id: DeclarationId(1371),
->>>>>>> origin/main
             name: Some("ConcurrencySpec".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ConcurrencyScalar".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2397),
-                    },
-                    Field {
-                        label: "ConcurrencyMappingQueueMax".to_string(),
-                        ty: DeclarationId(2399),
-=======
                         ty: DeclarationId(2398),
->>>>>>> origin/main
                     },
                     Field {
                         label: "ConcurrencyMappingQueueMax".to_string(),
@@ -50768,11 +45012,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "ConcurrencyMappingQueueNotMax".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2402),
-=======
                         ty: DeclarationId(2403),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -50787,25 +45027,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8199, 8845),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1371),
-=======
             id: DeclarationId(1372),
->>>>>>> origin/main
             name: Some("RunnerSpec".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "HostedRunner".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2403),
-                    },
-                    Field {
-                        label: "SelfHosted".to_string(),
-                        ty: DeclarationId(2405),
-=======
                         ty: DeclarationId(2404),
->>>>>>> origin/main
                     },
                     Field {
                         label: "SelfHosted".to_string(),
@@ -50813,11 +45041,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "RunsOnExpression".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2406),
-=======
                         ty: DeclarationId(2407),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -50832,40 +45056,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10017, 10240),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1372),
-=======
             id: DeclarationId(1373),
->>>>>>> origin/main
             name: Some("RunnerLabel".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "UbuntuLatest".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2407),
-                    },
-                    Field {
-                        label: "Ubuntu2404".to_string(),
-                        ty: DeclarationId(2408),
-                    },
-                    Field {
-                        label: "Ubuntu2204".to_string(),
-                        ty: DeclarationId(2409),
-                    },
-                    Field {
-                        label: "MacosLatest".to_string(),
-                        ty: DeclarationId(2410),
-                    },
-                    Field {
-                        label: "Macos14".to_string(),
-                        ty: DeclarationId(2411),
-                    },
-                    Field {
-                        label: "WindowsLatest".to_string(),
-                        ty: DeclarationId(2412),
-                    },
-=======
                         ty: DeclarationId(2408),
                     },
                     Field {
@@ -50888,7 +45084,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "WindowsLatest".to_string(),
                         ty: DeclarationId(2413),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -50902,29 +45097,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10242, 10351),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1373),
-=======
             id: DeclarationId(1374),
->>>>>>> origin/main
             name: Some("Step".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "RunStep".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2420),
-                    },
-                    Field {
-                        label: "UsesStep".to_string(),
-                        ty: DeclarationId(2429),
-=======
                         ty: DeclarationId(2421),
                     },
                     Field {
                         label: "UsesStep".to_string(),
                         ty: DeclarationId(2430),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -50939,36 +45122,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10496, 11091),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1374),
-=======
             id: DeclarationId(1375),
->>>>>>> origin/main
             name: Some("ShellType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Bash".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2430),
-                    },
-                    Field {
-                        label: "Sh".to_string(),
-                        ty: DeclarationId(2431),
-                    },
-                    Field {
-                        label: "Pwsh".to_string(),
-                        ty: DeclarationId(2432),
-                    },
-                    Field {
-                        label: "Python".to_string(),
-                        ty: DeclarationId(2433),
-                    },
-                    Field {
-                        label: "Cmd".to_string(),
-                        ty: DeclarationId(2434),
-                    },
-=======
                         ty: DeclarationId(2431),
                     },
                     Field {
@@ -50987,7 +45146,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "Cmd".to_string(),
                         ty: DeclarationId(2435),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -51001,11 +45159,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11093, 11141),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1375),
-=======
             id: DeclarationId(1376),
->>>>>>> origin/main
             name: Some("ActionRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -51034,48 +45188,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11143, 11206),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1376),
-=======
             id: DeclarationId(1377),
->>>>>>> origin/main
             name: Some("LogAnnotation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "AnnotationError".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2438),
-                    },
-                    Field {
-                        label: "AnnotationWarning".to_string(),
-                        ty: DeclarationId(2442),
-                    },
-                    Field {
-                        label: "AnnotationNotice".to_string(),
-                        ty: DeclarationId(2446),
-                    },
-                    Field {
-                        label: "AnnotationGroup".to_string(),
-                        ty: DeclarationId(2447),
-                    },
-                    Field {
-                        label: "AnnotationEndGroup".to_string(),
-                        ty: DeclarationId(2448),
-                    },
-                    Field {
-                        label: "SetOutput".to_string(),
-                        ty: DeclarationId(2449),
-                    },
-                    Field {
-                        label: "AddMask".to_string(),
-                        ty: DeclarationId(2450),
-                    },
-                    Field {
-                        label: "StopCommands".to_string(),
-                        ty: DeclarationId(2451),
-                    },
-=======
                         ty: DeclarationId(2439),
                     },
                     Field {
@@ -51106,7 +45224,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "StopCommands".to_string(),
                         ty: DeclarationId(2452),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -51120,11 +45237,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11440, 11867),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1377),
-=======
             id: DeclarationId(1378),
->>>>>>> origin/main
             name: Some("annotation_error_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -51143,11 +45256,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11933, 11982),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1378),
-=======
             id: DeclarationId(1379),
->>>>>>> origin/main
             name: Some("annotation_warning_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -51166,11 +45275,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11983, 12036),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1379),
-=======
             id: DeclarationId(1380),
->>>>>>> origin/main
             name: Some("annotation_notice_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -51189,11 +45294,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12037, 12088),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1380),
-=======
             id: DeclarationId(1381),
->>>>>>> origin/main
             name: Some("annotation_group_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -51212,11 +45313,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12089, 12139),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1381),
-=======
             id: DeclarationId(1382),
->>>>>>> origin/main
             name: Some("annotation_endgroup".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -51235,11 +45332,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12140, 12189),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1382),
-=======
             id: DeclarationId(1383),
->>>>>>> origin/main
             name: Some("annotation_set_output_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -51258,11 +45351,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12190, 12254),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1383),
-=======
             id: DeclarationId(1384),
->>>>>>> origin/main
             name: Some("annotation_add_mask_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -51281,11 +45370,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12255, 12311),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1384),
-=======
             id: DeclarationId(1385),
->>>>>>> origin/main
             name: Some("annotation_stop_commands_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -51304,29 +45389,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12312, 12378),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1385),
-=======
             id: DeclarationId(1386),
->>>>>>> origin/main
             name: Some("ArtifactOp".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Upload".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2453),
-                    },
-                    Field {
-                        label: "Download".to_string(),
-                        ty: DeclarationId(2455),
-=======
                         ty: DeclarationId(2454),
                     },
                     Field {
                         label: "Download".to_string(),
                         ty: DeclarationId(2456),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -51341,23 +45414,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12600, 12765),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1386),
-=======
             id: DeclarationId(1387),
->>>>>>> origin/main
             name: Some("MissingFilesBehavior".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Warn".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2456),
-                    },
-                    Field {
-                        label: "ErrorOut".to_string(),
-                        ty: DeclarationId(2457),
-=======
                         ty: DeclarationId(2457),
                     },
                     Field {
@@ -51367,11 +45429,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "Ignore".to_string(),
                         ty: DeclarationId(2459),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "Ignore".to_string(),
-                        ty: DeclarationId(2458),
                     },
                 ],
             },
@@ -51386,26 +45443,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12767, 12819),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1387),
-            name: Some("upload_artifact_action".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1375),
-=======
             id: DeclarationId(1388),
             name: Some("upload_artifact_action".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1376),
->>>>>>> origin/main
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-<<<<<<< HEAD
-            meta_tag: Some(DeclarationId(1375)),
-=======
             meta_tag: Some(DeclarationId(1376)),
->>>>>>> origin/main
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -51418,26 +45464,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12870, 12979),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1388),
-            name: Some("download_artifact_action".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1375),
-=======
             id: DeclarationId(1389),
             name: Some("download_artifact_action".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1376),
->>>>>>> origin/main
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-<<<<<<< HEAD
-            meta_tag: Some(DeclarationId(1375)),
-=======
             meta_tag: Some(DeclarationId(1376)),
->>>>>>> origin/main
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -51450,33 +45485,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12981, 13094),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1389),
-=======
             id: DeclarationId(1390),
->>>>>>> origin/main
             name: Some("MatrixStrategy".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "dimensions".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2460),
-                    },
-                    Field {
-                        label: "include".to_string(),
-                        ty: DeclarationId(2462),
-                    },
-                    Field {
-                        label: "exclude".to_string(),
-                        ty: DeclarationId(2464),
-=======
                         ty: DeclarationId(2461),
                     },
                     Field {
                         label: "include".to_string(),
                         ty: DeclarationId(2463),
->>>>>>> origin/main
                     },
                     Field {
                         label: "exclude".to_string(),
@@ -51488,11 +45507,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "max_parallel".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2465),
-=======
                         ty: DeclarationId(2466),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -51507,40 +45522,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13233, 13409),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1390),
-=======
             id: DeclarationId(1391),
->>>>>>> origin/main
             name: Some("CheckConclusion".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Success".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2466),
-                    },
-                    Field {
-                        label: "Failure".to_string(),
-                        ty: DeclarationId(2467),
-                    },
-                    Field {
-                        label: "Cancelled".to_string(),
-                        ty: DeclarationId(2468),
-                    },
-                    Field {
-                        label: "Skipped".to_string(),
-                        ty: DeclarationId(2469),
-                    },
-                    Field {
-                        label: "TimedOut".to_string(),
-                        ty: DeclarationId(2470),
-                    },
-                    Field {
-                        label: "ActionRequired".to_string(),
-                        ty: DeclarationId(2471),
-                    },
-=======
                         ty: DeclarationId(2467),
                     },
                     Field {
@@ -51563,7 +45550,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         label: "ActionRequired".to_string(),
                         ty: DeclarationId(2472),
                     },
->>>>>>> origin/main
                 ],
             },
             type_params: vec![],
@@ -51577,26 +45563,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13538, 13640),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1391),
-            name: Some("checkout_action".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1375),
-=======
             id: DeclarationId(1392),
             name: Some("checkout_action".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1376),
->>>>>>> origin/main
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-<<<<<<< HEAD
-            meta_tag: Some(DeclarationId(1375)),
-=======
             meta_tag: Some(DeclarationId(1376)),
->>>>>>> origin/main
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -51609,26 +45584,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13766, 13861),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1392),
-            name: Some("setup_rust_action".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1375),
-=======
             id: DeclarationId(1393),
             name: Some("setup_rust_action".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1376),
->>>>>>> origin/main
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-<<<<<<< HEAD
-            meta_tag: Some(DeclarationId(1375)),
-=======
             meta_tag: Some(DeclarationId(1376)),
->>>>>>> origin/main
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -51641,26 +45605,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13863, 13987),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1393),
-            name: Some("cache_action".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1375),
-=======
             id: DeclarationId(1394),
             name: Some("cache_action".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1376),
->>>>>>> origin/main
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-<<<<<<< HEAD
-            meta_tag: Some(DeclarationId(1375)),
-=======
             meta_tag: Some(DeclarationId(1376)),
->>>>>>> origin/main
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -51673,11 +45626,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13989, 14078),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1394),
-=======
             id: DeclarationId(1395),
->>>>>>> origin/main
             name: Some("max_job_timeout_minutes".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -51694,11 +45643,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14154, 14193),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1395),
-=======
             id: DeclarationId(1396),
->>>>>>> origin/main
             name: Some("default_job_timeout_minutes".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -51715,11 +45660,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14195, 14238),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1396),
-=======
             id: DeclarationId(1397),
->>>>>>> origin/main
             name: Some("max_matrix_combinations".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -51736,11 +45677,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14240, 14279),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1397),
-=======
             id: DeclarationId(1398),
->>>>>>> origin/main
             name: Some("github_actions_workflows_dir".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -51759,29 +45696,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1207, 1270),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1398),
-=======
             id: DeclarationId(1399),
->>>>>>> origin/main
             name: Some("GitHubActionsWorkflowExtension".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "GitHubActionsWorkflowYml".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2472),
-                    },
-                    Field {
-                        label: "GitHubActionsWorkflowYaml".to_string(),
-                        ty: DeclarationId(2473),
-=======
                         ty: DeclarationId(2473),
                     },
                     Field {
                         label: "GitHubActionsWorkflowYaml".to_string(),
                         ty: DeclarationId(2474),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -51796,11 +45721,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1895, 1989),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1399),
-=======
             id: DeclarationId(1400),
->>>>>>> origin/main
             name: Some("GitHubActionsWorkflowStemSegment".to_string()),
             connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
@@ -51809,29 +45730,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-<<<<<<< HEAD
-            refinement: Some(DeclarationId(2474)),
-=======
             refinement: Some(DeclarationId(2475)),
->>>>>>> origin/main
             nominal_opacity: None,
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2615, 2714),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1400),
-=======
             id: DeclarationId(1401),
->>>>>>> origin/main
             name: Some("GitHubActionsWorkflowStem".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "segment".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1399),
-=======
                     ty: DeclarationId(1400),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -51845,29 +45754,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2916, 2994),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1401),
-=======
             id: DeclarationId(1402),
->>>>>>> origin/main
             name: Some("GitHubActionsWorkflowFileRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "stem".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1400),
-                    },
-                    Field {
-                        label: "extension".to_string(),
-                        ty: DeclarationId(1398),
-=======
                         ty: DeclarationId(1401),
                     },
                     Field {
                         label: "extension".to_string(),
                         ty: DeclarationId(1399),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -51882,11 +45779,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 3398, 3513),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1402),
-=======
             id: DeclarationId(1403),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -51906,11 +45799,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 3259, 3272),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1403),
-=======
             id: DeclarationId(1404),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -51930,11 +45819,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 3421, 3434),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1404),
-=======
             id: DeclarationId(1405),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -51954,11 +45839,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 3439, 3452),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1405),
-=======
             id: DeclarationId(1406),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -51978,11 +45859,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 3556, 3569),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1406),
-=======
             id: DeclarationId(1407),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -52002,11 +45879,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 4162, 4169),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1407),
-=======
             id: DeclarationId(1408),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(695), DeclarationId(694)],
@@ -52024,11 +45897,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1408),
-=======
             id: DeclarationId(1409),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -52048,11 +45917,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 4617, 4624),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1409),
-=======
             id: DeclarationId(1410),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(697), DeclarationId(698)],
@@ -52070,29 +45935,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 4638, 4651),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1410),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(700),
-                }],
-            },
-            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/list.dag", 5336, 5349),
-        });
-        declarations.push(Declaration {
-=======
->>>>>>> origin/main
             id: DeclarationId(1411),
             name: None,
             connective: TypeConnective::Instantiation {
@@ -52110,11 +45952,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/list.dag", 5354, 5367),
-=======
             span: SourceSpan::new("src/v3/std/list.dag", 5336, 5349),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(1412),
@@ -52134,12 +45972,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/list.dag", 5372, 5385),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1413),
-=======
             span: SourceSpan::new("src/v3/std/list.dag", 5354, 5367),
         });
         declarations.push(Declaration {
@@ -52164,7 +45996,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(1414),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -52184,11 +46015,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5686, 5693),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1414),
-=======
             id: DeclarationId(1415),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(702)],
@@ -52206,11 +46033,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5698, 5708),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1415),
-=======
             id: DeclarationId(1416),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -52230,11 +46053,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5713, 5720),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1416),
-=======
             id: DeclarationId(1417),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -52254,11 +46073,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5867, 5874),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1417),
-=======
             id: DeclarationId(1418),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(705)],
@@ -52276,11 +46091,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1418),
-=======
             id: DeclarationId(1419),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -52300,11 +46111,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5897, 5904),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1419),
-=======
             id: DeclarationId(1420),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -52324,11 +46131,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 6130, 6137),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1420),
-=======
             id: DeclarationId(1421),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -52348,19 +46151,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 6151, 6158),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1421),
-            name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(707)],
-                output: DeclarationId(1420),
-=======
             id: DeclarationId(1422),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(707)],
                 output: DeclarationId(1421),
->>>>>>> origin/main
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -52374,11 +46169,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 6142, 6158),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1422),
-=======
             id: DeclarationId(1423),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -52398,11 +46189,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 6163, 6170),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1423),
-=======
             id: DeclarationId(1424),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -52422,11 +46209,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 6356, 6363),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1424),
-=======
             id: DeclarationId(1425),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -52446,11 +46229,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 6588, 6595),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1425),
-=======
             id: DeclarationId(1426),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -52470,11 +46249,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 7202, 7209),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1426),
-=======
             id: DeclarationId(1427),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(713),
@@ -52494,21 +46269,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 7219, 7236),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1427),
-=======
             id: DeclarationId(1428),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-<<<<<<< HEAD
-                    value: DeclarationId(1426),
-=======
                     value: DeclarationId(1427),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -52522,11 +46289,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 7214, 7237),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1428),
-=======
             id: DeclarationId(1429),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -52546,11 +46309,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 7415, 7422),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1429),
-=======
             id: DeclarationId(1430),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(713),
@@ -52570,21 +46329,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 7444, 7461),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1430),
-=======
             id: DeclarationId(1431),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-<<<<<<< HEAD
-                    value: DeclarationId(1429),
-=======
                     value: DeclarationId(1430),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -52598,11 +46349,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 7439, 7462),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1431),
-=======
             id: DeclarationId(1432),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -52622,11 +46369,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 8177, 8184),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1432),
-=======
             id: DeclarationId(1433),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52640,11 +46383,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 2106, 2111),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1433),
-=======
             id: DeclarationId(1434),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -52664,11 +46403,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 2144, 2157),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1434),
-=======
             id: DeclarationId(1435),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52678,11 +46413,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "tail".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1433),
-=======
                         ty: DeclarationId(1434),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -52697,11 +46428,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 2116, 2159),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1435),
-=======
             id: DeclarationId(1436),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -52721,11 +46448,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1436),
-=======
             id: DeclarationId(1437),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -52745,11 +46468,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1437),
-=======
             id: DeclarationId(1438),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52768,51 +46487,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1438),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(813),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(814),
-                    value: DeclarationId(744),
-                }],
-            },
-            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/effects.dag", 20914, 20941),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1439),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(713),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(714),
-                    value: DeclarationId(744),
-                }],
-            },
-            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/effects.dag", 20993, 21024),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1440),
-=======
             id: DeclarationId(1439),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -52829,14 +46504,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21056),
-=======
             span: SourceSpan::new("src/v3/std/effects.dag", 20916, 20943),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
-            id: DeclarationId(1441),
+            id: DeclarationId(1440),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(713),
@@ -52880,11 +46551,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-<<<<<<< HEAD
-                    DeclarationId(1440),
-=======
                     DeclarationId(1441),
->>>>>>> origin/main
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -52896,9 +46563,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
-=======
             span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059),
         });
         declarations.push(Declaration {
@@ -52920,31 +46584,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             refinement: None,
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/effects.dag", 21185, 21206),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(1444),
             name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(744),
-                }],
-            },
-            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/effects.dag", 21183, 21204),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1443),
-            name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
                 arguments: vec![TemplateArgument {
@@ -52960,22 +46603,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/effects.dag", 21209, 21236),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21238),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1444),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1443),
-=======
             id: DeclarationId(1445),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
                     DeclarationId(1444),
->>>>>>> origin/main
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -52987,14 +46622,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/effects.dag", 21209, 21237),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1445),
-=======
             id: DeclarationId(1446),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -53011,14 +46642,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/effects.dag", 22266, 22287),
+            span: SourceSpan::new("src/v3/std/effects.dag", 22268, 22289),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1446),
-=======
             id: DeclarationId(1447),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53034,9 +46661,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
-=======
             span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706),
         });
         declarations.push(Declaration {
@@ -53057,7 +46681,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             refinement: None,
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(1449),
@@ -53076,30 +46699,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669),
         });
         declarations.push(Declaration {
             id: DeclarationId(1450),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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/effects.dag", 30660, 30667),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1449),
-            name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
@@ -53115,14 +46719,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/effects.dag", 36579, 36600),
+            span: SourceSpan::new("src/v3/std/effects.dag", 36581, 36602),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1450),
-=======
             id: DeclarationId(1451),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -53139,14 +46739,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/effects.dag", 36606, 36637),
+            span: SourceSpan::new("src/v3/std/effects.dag", 36608, 36639),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1451),
-=======
             id: DeclarationId(1452),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53165,11 +46761,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 7532, 7561),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1452),
-=======
             id: DeclarationId(1453),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53188,9 +46780,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 7566, 7595),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1453),
-=======
             id: DeclarationId(1454),
             name: None,
             connective: TypeConnective::Instantiation {
@@ -53212,27 +46801,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(1455),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(729),
-                }],
-            },
-            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/effects.dag", 7627, 7645),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1456),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -53252,16 +46820,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(1455),
+            id: DeclarationId(1456),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tokens".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1454),
-=======
                     ty: DeclarationId(1455),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -53275,11 +46839,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 8036, 8086),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1456),
-=======
             id: DeclarationId(1457),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -53304,11 +46864,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 8091, 8147),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1457),
-=======
             id: DeclarationId(1458),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53327,11 +46883,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 8510, 8555),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1458),
-=======
             id: DeclarationId(1459),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -53360,11 +46912,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 8560, 8630),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1459),
-=======
             id: DeclarationId(1460),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53375,9 +46923,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/effects.dag", 14353, 14363),
-=======
             span: SourceSpan::new("src/v3/std/effects.dag", 14355, 14365),
         });
         declarations.push(Declaration {
@@ -53398,7 +46943,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             refinement: None,
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/effects.dag", 14370, 14408),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(1462),
@@ -53417,30 +46961,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 14368, 14406),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14413, 14451),
         });
         declarations.push(Declaration {
             id: DeclarationId(1463),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "key_source".to_string(),
-                    ty: DeclarationId(740),
-                }],
-            },
-            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/effects.dag", 14411, 14449),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1462),
-            name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "cause".to_string(),
@@ -53455,14 +46980,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/effects.dag", 14695, 14730),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14697, 14732),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1463),
-=======
             id: DeclarationId(1464),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53473,14 +46994,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/effects.dag", 14735, 14747),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14737, 14749),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1464),
-=======
             id: DeclarationId(1465),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53496,14 +47013,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/effects.dag", 15169, 15198),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15171, 15200),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1465),
-=======
             id: DeclarationId(1466),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53519,14 +47032,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/effects.dag", 15203, 15228),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15205, 15230),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1466),
-=======
             id: DeclarationId(1467),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53537,14 +47046,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/effects.dag", 15741, 15751),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15743, 15753),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1467),
-=======
             id: DeclarationId(1468),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53560,14 +47065,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/effects.dag", 15756, 15794),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15758, 15796),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1468),
-=======
             id: DeclarationId(1469),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53583,14 +47084,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/effects.dag", 16499, 16526),
+            span: SourceSpan::new("src/v3/std/effects.dag", 16501, 16528),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1469),
-=======
             id: DeclarationId(1470),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53606,14 +47103,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/effects.dag", 16531, 16559),
+            span: SourceSpan::new("src/v3/std/effects.dag", 16533, 16561),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1470),
-=======
             id: DeclarationId(1471),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -53630,23 +47123,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 16587, 16599),
+            span: SourceSpan::new("src/v3/std/effects.dag", 16589, 16601),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1471),
-=======
             id: DeclarationId(1472),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "fields".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1470),
-=======
                     ty: DeclarationId(1471),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -53657,9 +47142,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/effects.dag", 16564, 16601),
-=======
             span: SourceSpan::new("src/v3/std/effects.dag", 16566, 16603),
         });
         declarations.push(Declaration {
@@ -53675,7 +47157,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             refinement: None,
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/effects.dag", 17280, 17293),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(1474),
@@ -53689,25 +47170,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 17278, 17291),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17298, 17312),
         });
         declarations.push(Declaration {
             id: DeclarationId(1475),
             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/effects.dag", 17296, 17310),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1474),
-            name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "reason".to_string(),
@@ -53722,14 +47189,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/effects.dag", 17315, 17347),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17317, 17349),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1475),
-=======
             id: DeclarationId(1476),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53745,14 +47208,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/effects.dag", 19517, 19558),
+            span: SourceSpan::new("src/v3/std/effects.dag", 19519, 19560),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1476),
-=======
             id: DeclarationId(1477),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -53774,14 +47233,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/effects.dag", 19563, 19632),
+            span: SourceSpan::new("src/v3/std/effects.dag", 19565, 19634),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1477),
-=======
             id: DeclarationId(1478),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -53815,14 +47270,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/effects.dag", 19637, 19787),
+            span: SourceSpan::new("src/v3/std/effects.dag", 19639, 19789),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1478),
-=======
             id: DeclarationId(1479),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53833,14 +47284,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/effects.dag", 20536, 20557),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20538, 20559),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1479),
-=======
             id: DeclarationId(1480),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -53857,23 +47304,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20588, 20615),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20590, 20617),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1480),
-=======
             id: DeclarationId(1481),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "first_breaker".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1479),
-=======
                     ty: DeclarationId(1480),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -53884,14 +47323,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/effects.dag", 20562, 20617),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20564, 20619),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1481),
-=======
             id: DeclarationId(1482),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -53908,23 +47343,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 24541, 24562),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24543, 24564),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1482),
-=======
             id: DeclarationId(1483),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "ops".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1481),
-=======
                     ty: DeclarationId(1482),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -53935,14 +47362,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/effects.dag", 24521, 24564),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24523, 24566),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1483),
-=======
             id: DeclarationId(1484),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -53959,23 +47382,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 24590, 24617),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24592, 24619),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1484),
-=======
             id: DeclarationId(1485),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "arms".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1483),
-=======
                     ty: DeclarationId(1484),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -53986,14 +47401,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/effects.dag", 24569, 24619),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24571, 24621),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1485),
-=======
             id: DeclarationId(1486),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54009,14 +47420,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/effects.dag", 24624, 24659),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24626, 24661),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1486),
-=======
             id: DeclarationId(1487),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -54033,23 +47440,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 24691, 24723),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24693, 24725),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1487),
-=======
             id: DeclarationId(1488),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "branches".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1486),
-=======
                     ty: DeclarationId(1487),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -54060,14 +47459,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/effects.dag", 24664, 24725),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24666, 24727),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1488),
-=======
             id: DeclarationId(1489),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54083,14 +47478,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/effects.dag", 25362, 25408),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25364, 25410),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1489),
-=======
             id: DeclarationId(1490),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54106,9 +47497,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/effects.dag", 25413, 25465),
-=======
             span: SourceSpan::new("src/v3/std/effects.dag", 25415, 25467),
         });
         declarations.push(Declaration {
@@ -54124,7 +47512,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             refinement: None,
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/effects.dag", 25964, 25984),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(1492),
@@ -54138,7 +47525,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/effects.dag", 25962, 25982),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25989, 26010),
         });
         declarations.push(Declaration {
             id: DeclarationId(1493),
@@ -54152,7 +47539,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/effects.dag", 25987, 26008),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26015, 26038),
         });
         declarations.push(Declaration {
             id: DeclarationId(1494),
@@ -54166,7 +47553,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/effects.dag", 26013, 26036),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26043, 26061),
         });
         declarations.push(Declaration {
             id: DeclarationId(1495),
@@ -54180,25 +47567,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 26041, 26059),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26066, 26084),
         });
         declarations.push(Declaration {
             id: DeclarationId(1496),
             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/effects.dag", 26064, 26082),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1495),
-            name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
@@ -54213,14 +47586,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/effects.dag", 26399, 26445),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26401, 26447),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1496),
-=======
             id: DeclarationId(1497),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54236,14 +47605,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/effects.dag", 26450, 26502),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26452, 26504),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1497),
-=======
             id: DeclarationId(1498),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54254,9 +47619,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/effects.dag", 32456, 32462),
-=======
             span: SourceSpan::new("src/v3/std/effects.dag", 32458, 32464),
         });
         declarations.push(Declaration {
@@ -54277,7 +47639,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             refinement: None,
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/effects.dag", 32469, 32506),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(1500),
@@ -54296,30 +47657,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 32467, 32504),
+            span: SourceSpan::new("src/v3/std/effects.dag", 32511, 32548),
         });
         declarations.push(Declaration {
             id: DeclarationId(1501),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "reason".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-            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/effects.dag", 32509, 32546),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1500),
-            name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -54329,14 +47671,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/effects.dag", 33020, 33039),
+            span: SourceSpan::new("src/v3/std/effects.dag", 33022, 33041),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1501),
-=======
             id: DeclarationId(1502),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54352,14 +47690,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/effects.dag", 33044, 33093),
+            span: SourceSpan::new("src/v3/std/effects.dag", 33046, 33095),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1502),
-=======
             id: DeclarationId(1503),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54378,11 +47712,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1503),
-=======
             id: DeclarationId(1504),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54401,11 +47731,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1504),
-=======
             id: DeclarationId(1505),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54424,11 +47750,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1505),
-=======
             id: DeclarationId(1506),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54447,11 +47769,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1506),
-=======
             id: DeclarationId(1507),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54470,11 +47788,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1507),
-=======
             id: DeclarationId(1508),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54493,9 +47807,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1508),
-=======
             id: DeclarationId(1509),
             name: None,
             connective: TypeConnective::Instantiation {
@@ -54517,27 +47828,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(1510),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1143),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1144),
-                    value: DeclarationId(723),
-                }],
-            },
-            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/substrate.dag", 28003, 28024),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1511),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -54557,7 +47847,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 28088, 28109),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1510),
+            id: DeclarationId(1511),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54571,11 +47861,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 754, 764),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1511),
-=======
             id: DeclarationId(1512),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54594,11 +47880,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 769, 788),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1512),
-=======
             id: DeclarationId(1513),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54612,11 +47894,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 793, 803),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1513),
-=======
             id: DeclarationId(1514),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54635,11 +47913,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1514),
-=======
             id: DeclarationId(1515),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54658,11 +47932,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 1379, 1393),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1515),
-=======
             id: DeclarationId(1516),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54681,11 +47951,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 1398, 1411),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1516),
-=======
             id: DeclarationId(1517),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54704,11 +47970,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 1416, 1433),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1517),
-=======
             id: DeclarationId(1518),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54727,11 +47989,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 3566, 3586),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1518),
-=======
             id: DeclarationId(1519),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54750,11 +48008,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 3591, 3619),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1519),
-=======
             id: DeclarationId(1520),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54773,11 +48027,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 3624, 3658),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1520),
-=======
             id: DeclarationId(1521),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54796,11 +48046,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 3663, 3692),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1521),
-=======
             id: DeclarationId(1522),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54819,11 +48065,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 3697, 3714),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1522),
-=======
             id: DeclarationId(1523),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54837,11 +48079,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 4338, 4345),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1523),
-=======
             id: DeclarationId(1524),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54860,11 +48098,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 4350, 4400),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1524),
-=======
             id: DeclarationId(1525),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54883,11 +48117,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 5964, 5988),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1525),
-=======
             id: DeclarationId(1526),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54901,11 +48131,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6013, 6022),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1526),
-=======
             id: DeclarationId(1527),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54924,11 +48150,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6027, 6063),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1527),
-=======
             id: DeclarationId(1528),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -54953,11 +48175,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6375, 6425),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1528),
-=======
             id: DeclarationId(1529),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54971,11 +48189,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6430, 6439),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1529),
-=======
             id: DeclarationId(1530),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(786),
@@ -54995,20 +48209,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7015, 7028),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1530),
-=======
             id: DeclarationId(1531),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1529),
-=======
                     ty: DeclarationId(1530),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -55022,11 +48228,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7003, 7029),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1531),
-=======
             id: DeclarationId(1532),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55040,11 +48242,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7034, 7051),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1532),
-=======
             id: DeclarationId(1533),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55063,11 +48261,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7302, 7312),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1533),
-=======
             id: DeclarationId(1534),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55081,11 +48275,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7317, 7326),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1534),
-=======
             id: DeclarationId(1535),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55099,11 +48289,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7331, 7340),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1535),
-=======
             id: DeclarationId(1536),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55122,11 +48308,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7767, 7787),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1536),
-=======
             id: DeclarationId(1537),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55145,11 +48327,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7792, 7816),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1537),
-=======
             id: DeclarationId(1538),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -55169,20 +48347,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7828, 7844),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1538),
-=======
             id: DeclarationId(1539),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1537),
-=======
                     ty: DeclarationId(1538),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -55196,11 +48366,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7821, 7845),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1539),
-=======
             id: DeclarationId(1540),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -55220,20 +48386,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7855, 7871),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1540),
-=======
             id: DeclarationId(1541),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1539),
-=======
                     ty: DeclarationId(1540),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -55247,11 +48405,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7850, 7872),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1541),
-=======
             id: DeclarationId(1542),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -55271,20 +48425,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7881, 7897),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1542),
-=======
             id: DeclarationId(1543),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1541),
-=======
                     ty: DeclarationId(1542),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -55298,11 +48444,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7877, 7898),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1543),
-=======
             id: DeclarationId(1544),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -55322,11 +48464,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7961, 7977),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1544),
-=======
             id: DeclarationId(1545),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -55336,11 +48474,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "payload".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1543),
-=======
                         ty: DeclarationId(1544),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -55355,11 +48489,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7903, 7983),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1545),
-=======
             id: DeclarationId(1546),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55378,11 +48508,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9596, 9625),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1546),
-=======
             id: DeclarationId(1547),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -55402,20 +48528,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9660, 9676),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1547),
-=======
             id: DeclarationId(1548),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "fields".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1546),
-=======
                     ty: DeclarationId(1547),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -55429,11 +48547,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9630, 9678),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1548),
-=======
             id: DeclarationId(1549),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55452,11 +48566,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9683, 9711),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1549),
-=======
             id: DeclarationId(1550),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -55476,20 +48586,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9730, 9746),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1550),
-=======
             id: DeclarationId(1551),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1549),
-=======
                     ty: DeclarationId(1550),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -55503,11 +48605,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9716, 9747),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1551),
-=======
             id: DeclarationId(1552),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -55527,20 +48625,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9765, 9781),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1552),
-=======
             id: DeclarationId(1553),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1551),
-=======
                     ty: DeclarationId(1552),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -55554,11 +48644,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9752, 9782),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1553),
-=======
             id: DeclarationId(1554),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55577,11 +48663,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11036, 11059),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1554),
-=======
             id: DeclarationId(1555),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55600,11 +48682,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11064, 11098),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1555),
-=======
             id: DeclarationId(1556),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55618,11 +48696,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11103, 11110),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1556),
-=======
             id: DeclarationId(1557),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55636,11 +48710,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11115, 11121),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1557),
-=======
             id: DeclarationId(1558),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55659,11 +48729,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11126, 11146),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1558),
-=======
             id: DeclarationId(1559),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55682,50 +48748,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11375, 11392),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1559),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(791),
-                }],
-            },
-            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/substrate.dag", 11414, 11429),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1560),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "children".to_string(),
-                    ty: DeclarationId(1559),
-                }],
-            },
-            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/substrate.dag", 11397, 11431),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1561),
-=======
             id: DeclarationId(1560),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -55745,17 +48768,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11414, 11429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1562),
+            id: DeclarationId(1561),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
-<<<<<<< HEAD
-                    label: "variants".to_string(),
-                    ty: DeclarationId(1561),
-=======
                     label: "children".to_string(),
                     ty: DeclarationId(1560),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -55808,11 +48826,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11436, 11470),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1563),
-=======
             id: DeclarationId(1564),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -55832,21 +48846,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11497, 11516),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1564),
-=======
             id: DeclarationId(1565),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "inputs".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1563),
-=======
                         ty: DeclarationId(1564),
->>>>>>> origin/main
                     },
                     Field {
                         label: "output".to_string(),
@@ -55869,11 +48875,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11475, 11572),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1565),
-=======
             id: DeclarationId(1566),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -55898,11 +48900,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11577, 11655),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1566),
-=======
             id: DeclarationId(1567),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -55922,11 +48920,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11723, 11745),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1567),
-=======
             id: DeclarationId(1568),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -55936,11 +48930,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "arguments".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1566),
-=======
                         ty: DeclarationId(1567),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -55955,11 +48945,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11660, 11751),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1568),
-=======
             id: DeclarationId(1569),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -55978,11 +48964,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1569),
-=======
             id: DeclarationId(1570),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -56002,11 +48984,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11852, 11871),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1570),
-=======
             id: DeclarationId(1571),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -56026,11 +49004,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11890, 11912),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1571),
-=======
             id: DeclarationId(1572),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56049,11 +49023,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1572),
-=======
             id: DeclarationId(1573),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56072,11 +49042,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1573),
-=======
             id: DeclarationId(1574),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56095,11 +49061,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1574),
-=======
             id: DeclarationId(1575),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56118,11 +49080,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1575),
-=======
             id: DeclarationId(1576),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -56142,11 +49100,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13149, 13168),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1576),
-=======
             id: DeclarationId(1577),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56160,11 +49114,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13449, 13452),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1577),
-=======
             id: DeclarationId(1578),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56178,11 +49128,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13457, 13460),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1578),
-=======
             id: DeclarationId(1579),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56196,11 +49142,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13465, 13468),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1579),
-=======
             id: DeclarationId(1580),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56214,11 +49156,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13473, 13476),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1580),
-=======
             id: DeclarationId(1581),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56232,11 +49170,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13600, 13602),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1581),
-=======
             id: DeclarationId(1582),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56250,11 +49184,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13607, 13609),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1582),
-=======
             id: DeclarationId(1583),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56268,11 +49198,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13614, 13616),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1583),
-=======
             id: DeclarationId(1584),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56286,11 +49212,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13621, 13623),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1584),
-=======
             id: DeclarationId(1585),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56304,11 +49226,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13628, 13630),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1585),
-=======
             id: DeclarationId(1586),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56322,11 +49240,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13635, 13637),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1586),
-=======
             id: DeclarationId(1587),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56340,11 +49254,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14414, 14417),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1587),
-=======
             id: DeclarationId(1588),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56358,11 +49268,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14422, 14424),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1588),
-=======
             id: DeclarationId(1589),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56381,11 +49287,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14660, 14684),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1589),
-=======
             id: DeclarationId(1590),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56404,11 +49306,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14689, 14713),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1590),
-=======
             id: DeclarationId(1591),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56427,11 +49325,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14718, 14736),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1591),
-=======
             id: DeclarationId(1592),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56450,11 +49344,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14923, 14946),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1592),
-=======
             id: DeclarationId(1593),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56473,11 +49363,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14951, 15007),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1593),
-=======
             id: DeclarationId(1594),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56496,11 +49382,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15012, 15066),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1594),
-=======
             id: DeclarationId(1595),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56519,11 +49401,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15071, 15093),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1595),
-=======
             id: DeclarationId(1596),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56548,11 +49426,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15218, 15270),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1596),
-=======
             id: DeclarationId(1597),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56571,11 +49445,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15275, 15305),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1597),
-=======
             id: DeclarationId(1598),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56594,11 +49464,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1598),
-=======
             id: DeclarationId(1599),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -56618,11 +49484,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 17460, 17491),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1599),
-=======
             id: DeclarationId(1600),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(725),
@@ -56642,11 +49504,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 17515, 17545),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1600),
-=======
             id: DeclarationId(1601),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56665,11 +49523,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18168, 18197),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1601),
-=======
             id: DeclarationId(1602),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56694,11 +49548,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18202, 18249),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1602),
-=======
             id: DeclarationId(1603),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56717,11 +49567,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1603),
-=======
             id: DeclarationId(1604),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -56741,11 +49587,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18607, 18619),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1604),
-=======
             id: DeclarationId(1605),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56759,11 +49601,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18860, 18869),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1605),
-=======
             id: DeclarationId(1606),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -56783,11 +49621,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18927, 18943),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1606),
-=======
             id: DeclarationId(1607),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56806,11 +49640,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1607),
-=======
             id: DeclarationId(1608),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56824,11 +49654,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19445, 19457),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1608),
-=======
             id: DeclarationId(1609),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -56848,11 +49674,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19535, 19547),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1609),
-=======
             id: DeclarationId(1610),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56871,11 +49693,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1610),
-=======
             id: DeclarationId(1611),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56894,11 +49712,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1611),
-=======
             id: DeclarationId(1612),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56917,11 +49731,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19737, 19753),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1612),
-=======
             id: DeclarationId(1613),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56940,11 +49750,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19758, 19782),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1613),
-=======
             id: DeclarationId(1614),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56963,11 +49769,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19787, 19805),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1614),
-=======
             id: DeclarationId(1615),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56986,11 +49788,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19810, 19824),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1615),
-=======
             id: DeclarationId(1616),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57009,11 +49807,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19829, 19843),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1616),
-=======
             id: DeclarationId(1617),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57033,11 +49827,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19872, 19889),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1617),
-=======
             id: DeclarationId(1618),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57057,11 +49847,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19899, 19913),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1618),
-=======
             id: DeclarationId(1619),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57081,11 +49867,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19923, 19936),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1619),
-=======
             id: DeclarationId(1620),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57105,11 +49887,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19949, 19962),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1620),
-=======
             id: DeclarationId(1621),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57128,11 +49906,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 26045, 26063),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1621),
-=======
             id: DeclarationId(1622),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57146,11 +49920,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 26068, 26074),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1622),
-=======
             id: DeclarationId(1623),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -57170,20 +49940,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 26107, 26131),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1623),
-=======
             id: DeclarationId(1624),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "candidates".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1622),
-=======
                     ty: DeclarationId(1623),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -57197,9 +49959,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 26079, 26133),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1624),
-=======
             id: DeclarationId(1625),
             name: None,
             connective: TypeConnective::Instantiation {
@@ -57221,27 +49980,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(1626),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1143),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1144),
-                    value: DeclarationId(849),
-                }],
-            },
-            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/algebra.dag", 10942, 10962),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1627),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -57261,7 +49999,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11026, 11046),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1626),
+            id: DeclarationId(1627),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -57281,11 +50019,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11114, 11144),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1627),
-=======
             id: DeclarationId(1628),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57305,11 +50039,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11611, 11629),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1628),
-=======
             id: DeclarationId(1629),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -57329,11 +50059,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11635, 11665),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1629),
-=======
             id: DeclarationId(1630),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57353,11 +50079,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 14162, 14180),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1630),
-=======
             id: DeclarationId(1631),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -57377,11 +50099,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22217, 22247),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1631),
-=======
             id: DeclarationId(1632),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57401,11 +50119,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22252, 22270),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1632),
-=======
             id: DeclarationId(1633),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57425,11 +50139,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22530, 22548),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1633),
-=======
             id: DeclarationId(1634),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57449,11 +50159,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22553, 22571),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1634),
-=======
             id: DeclarationId(1635),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57473,11 +50179,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23044, 23062),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1635),
-=======
             id: DeclarationId(1636),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57497,11 +50199,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23067, 23085),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1636),
-=======
             id: DeclarationId(1637),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57521,11 +50219,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23186, 23204),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1637),
-=======
             id: DeclarationId(1638),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57545,11 +50239,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23524, 23542),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1638),
-=======
             id: DeclarationId(1639),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57569,11 +50259,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23547, 23565),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1639),
-=======
             id: DeclarationId(1640),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57593,11 +50279,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 25113, 25131),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1640),
-=======
             id: DeclarationId(1641),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57617,11 +50299,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 25384, 25402),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1641),
-=======
             id: DeclarationId(1642),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57641,11 +50319,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 25850, 25868),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1642),
-=======
             id: DeclarationId(1643),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57665,11 +50339,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 27885, 27903),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1643),
-=======
             id: DeclarationId(1644),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57689,11 +50359,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 27933, 27951),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1644),
-=======
             id: DeclarationId(1645),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57713,11 +50379,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28238, 28256),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1645),
-=======
             id: DeclarationId(1646),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57737,11 +50399,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28284, 28302),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1646),
-=======
             id: DeclarationId(1647),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57761,11 +50419,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28662, 28680),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1647),
-=======
             id: DeclarationId(1648),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57785,11 +50439,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28685, 28703),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1648),
-=======
             id: DeclarationId(1649),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57803,11 +50453,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 4953, 4965),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1649),
-=======
             id: DeclarationId(1650),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57821,11 +50467,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 4970, 4986),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1650),
-=======
             id: DeclarationId(1651),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57839,11 +50481,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 4991, 5005),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1651),
-=======
             id: DeclarationId(1652),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57857,11 +50495,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 5855, 5868),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1652),
-=======
             id: DeclarationId(1653),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57875,11 +50509,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 5873, 5888),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1653),
-=======
             id: DeclarationId(1654),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57893,11 +50523,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 5893, 5909),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1654),
-=======
             id: DeclarationId(1655),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57911,11 +50537,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 5914, 5927),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1655),
-=======
             id: DeclarationId(1656),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -57934,11 +50556,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1656),
-=======
             id: DeclarationId(1657),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -57957,11 +50575,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1657),
-=======
             id: DeclarationId(1658),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -57980,11 +50594,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1658),
-=======
             id: DeclarationId(1659),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -58003,11 +50613,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1659),
-=======
             id: DeclarationId(1660),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58021,11 +50627,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 8405, 8414),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1660),
-=======
             id: DeclarationId(1661),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58044,11 +50646,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 8419, 8465),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1661),
-=======
             id: DeclarationId(1662),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58067,11 +50665,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9506, 9523),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1662),
-=======
             id: DeclarationId(1663),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58090,11 +50684,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9528, 9552),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1663),
-=======
             id: DeclarationId(1664),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -58119,11 +50709,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9557, 9619),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1664),
-=======
             id: DeclarationId(1665),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -58143,20 +50729,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9636, 9666),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1665),
-=======
             id: DeclarationId(1666),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1664),
-=======
                     ty: DeclarationId(1665),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -58170,11 +50748,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9624, 9667),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1666),
-=======
             id: DeclarationId(1667),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -58194,20 +50768,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9680, 9710),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1667),
-=======
             id: DeclarationId(1668),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1666),
-=======
                     ty: DeclarationId(1667),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -58221,11 +50787,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9672, 9711),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1668),
-=======
             id: DeclarationId(1669),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58244,11 +50806,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9716, 9737),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1669),
-=======
             id: DeclarationId(1670),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58267,11 +50825,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9742, 9761),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1670),
-=======
             id: DeclarationId(1671),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(31),
@@ -58291,11 +50845,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9479, 9501),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1671),
-=======
             id: DeclarationId(1672),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58309,11 +50859,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18143, 18156),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1672),
-=======
             id: DeclarationId(1673),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58327,11 +50873,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18161, 18169),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1673),
-=======
             id: DeclarationId(1674),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58345,11 +50887,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18174, 18185),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1674),
-=======
             id: DeclarationId(1675),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58363,11 +50901,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18190, 18207),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1675),
-=======
             id: DeclarationId(1676),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58381,11 +50915,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18212, 18226),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1676),
-=======
             id: DeclarationId(1677),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58404,11 +50934,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18231, 18280),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1677),
-=======
             id: DeclarationId(1678),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58422,11 +50948,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18285, 18301),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1678),
-=======
             id: DeclarationId(1679),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58440,11 +50962,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18306, 18318),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1679),
-=======
             id: DeclarationId(1680),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(43),
@@ -58464,11 +50982,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18107, 18138),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1680),
-=======
             id: DeclarationId(1681),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(691),
@@ -58488,11 +51002,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11495, 11507),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1681),
-=======
             id: DeclarationId(1682),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(728)],
@@ -58510,11 +51020,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1682),
-=======
             id: DeclarationId(1683),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(704),
@@ -58524,11 +51030,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         value: DeclarationId(849),
                     },
                     TemplateArgument {
-<<<<<<< HEAD
-                        parameter: DeclarationId(1417),
-=======
                         parameter: DeclarationId(1418),
->>>>>>> origin/main
                         value: DeclarationId(856),
                     },
                 ],
@@ -58544,11 +51046,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11488, 11535),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1683),
-=======
             id: DeclarationId(1684),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(691),
@@ -58568,11 +51066,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11795, 11810),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1684),
-=======
             id: DeclarationId(1685),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(849), DeclarationId(849)],
@@ -58590,74 +51084,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1685),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(693),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(695),
-                        value: DeclarationId(849),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(694),
-                        value: DeclarationId(849),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(1407),
-                        value: DeclarationId(860),
-                    },
-                ],
-            },
-            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/algebra.dag", 14202, 14245),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1686),
-            name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(850), DeclarationId(694)],
-                output: DeclarationId(850),
-                body: ArrowBody::NoBody,
-            },
-            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/list.dag", 4183, 4196),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1687),
-=======
             id: DeclarationId(1686),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
                 arguments: vec![
                     TemplateArgument {
                         parameter: DeclarationId(695),
-<<<<<<< HEAD
-                        value: DeclarationId(850),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(1407),
-                        value: DeclarationId(886),
-=======
                         value: DeclarationId(849),
->>>>>>> origin/main
                     },
                     TemplateArgument {
                         parameter: DeclarationId(694),
@@ -58680,7 +51114,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 14202, 14245),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1688),
+            id: DeclarationId(1687),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(850), DeclarationId(694)],
@@ -58698,7 +51132,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(1689),
+            id: DeclarationId(1688),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
@@ -58708,9 +51142,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         value: DeclarationId(850),
                     },
                     TemplateArgument {
-<<<<<<< HEAD
-                        parameter: DeclarationId(1407),
-=======
                         parameter: DeclarationId(1408),
                         value: DeclarationId(886),
                     },
@@ -58760,7 +51191,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     TemplateArgument {
                         parameter: DeclarationId(1408),
->>>>>>> origin/main
                         value: DeclarationId(886),
                     },
                     TemplateArgument {
@@ -58780,11 +51210,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 17076, 17186),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1690),
-=======
             id: DeclarationId(1691),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -58804,11 +51230,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22293, 22323),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1691),
-=======
             id: DeclarationId(1692),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -58828,11 +51250,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22275, 22324),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1692),
-=======
             id: DeclarationId(1693),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -58852,11 +51270,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22603, 22610),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1693),
-=======
             id: DeclarationId(1694),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -58876,11 +51290,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22737, 22789),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1694),
-=======
             id: DeclarationId(1695),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -58900,11 +51310,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23140, 23147),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1695),
-=======
             id: DeclarationId(1696),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -58924,11 +51330,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23118, 23148),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1696),
-=======
             id: DeclarationId(1697),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -58948,11 +51350,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23597, 23604),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1697),
-=======
             id: DeclarationId(1698),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -58972,11 +51370,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23735, 23792),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1698),
-=======
             id: DeclarationId(1699),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -58996,11 +51390,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 25317, 25349),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1699),
-=======
             id: DeclarationId(1700),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -59020,11 +51410,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 27988, 27995),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1700),
-=======
             id: DeclarationId(1701),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -59044,11 +51430,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28136, 28201),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1701),
-=======
             id: DeclarationId(1702),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(850), DeclarationId(849)],
@@ -59066,11 +51448,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1702),
-=======
             id: DeclarationId(1703),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
@@ -59084,11 +51462,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         value: DeclarationId(849),
                     },
                     TemplateArgument {
-<<<<<<< HEAD
-                        parameter: DeclarationId(1407),
-=======
                         parameter: DeclarationId(1408),
->>>>>>> origin/main
                         value: DeclarationId(886),
                     },
                 ],
@@ -59104,11 +51478,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28319, 28377),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1703),
-=======
             id: DeclarationId(1704),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -59128,11 +51498,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28403, 28449),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1704),
-=======
             id: DeclarationId(1705),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -59152,19 +51518,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28720, 28727),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1705),
-            name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1647), DeclarationId(849)],
-                output: DeclarationId(1647),
-=======
             id: DeclarationId(1706),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1648), DeclarationId(849)],
                 output: DeclarationId(1648),
->>>>>>> origin/main
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -59178,33 +51536,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1706),
-=======
             id: DeclarationId(1707),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
                 arguments: vec![
                     TemplateArgument {
                         parameter: DeclarationId(695),
-<<<<<<< HEAD
-                        value: DeclarationId(1647),
-=======
                         value: DeclarationId(1648),
->>>>>>> origin/main
                     },
                     TemplateArgument {
                         parameter: DeclarationId(694),
                         value: DeclarationId(849),
                     },
                     TemplateArgument {
-<<<<<<< HEAD
-                        parameter: DeclarationId(1407),
-=======
                         parameter: DeclarationId(1408),
->>>>>>> origin/main
                         value: DeclarationId(889),
                     },
                 ],
@@ -59220,11 +51566,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28708, 28749),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1707),
-=======
             id: DeclarationId(1708),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -59244,11 +51586,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1708),
-=======
             id: DeclarationId(1709),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -59267,11 +51605,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1709),
-=======
             id: DeclarationId(1710),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -59290,11 +51624,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1710),
-=======
             id: DeclarationId(1711),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -59314,11 +51644,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_operations.dag", 6546, 6561),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1711),
-=======
             id: DeclarationId(1712),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -59338,20 +51664,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2718, 2749),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1712),
-=======
             id: DeclarationId(1713),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "content".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1711),
-=======
                     ty: DeclarationId(1712),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -59365,11 +51683,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2690, 2751),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1713),
-=======
             id: DeclarationId(1714),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -59389,20 +51703,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2784, 2820),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1714),
-=======
             id: DeclarationId(1715),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "content".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1713),
-=======
                     ty: DeclarationId(1714),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -59416,11 +51722,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2756, 2822),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1715),
-=======
             id: DeclarationId(1716),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -59445,11 +51747,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3211, 3276),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1716),
-=======
             id: DeclarationId(1717),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59468,11 +51766,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3281, 3305),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1717),
-=======
             id: DeclarationId(1718),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59491,11 +51785,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3568, 3596),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1718),
-=======
             id: DeclarationId(1719),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59514,11 +51804,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3601, 3637),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1719),
-=======
             id: DeclarationId(1720),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59537,11 +51823,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4332, 4354),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1720),
-=======
             id: DeclarationId(1721),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -59561,20 +51843,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4376, 4406),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1721),
-=======
             id: DeclarationId(1722),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1720),
-=======
                     ty: DeclarationId(1721),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -59588,11 +51862,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4359, 4407),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1722),
-=======
             id: DeclarationId(1723),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59606,11 +51876,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5616, 5623),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1723),
-=======
             id: DeclarationId(1724),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59624,11 +51890,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5749, 5761),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1724),
-=======
             id: DeclarationId(1725),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59647,11 +51909,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5979, 6014),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1725),
-=======
             id: DeclarationId(1726),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59670,11 +51928,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6019, 6062),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1726),
-=======
             id: DeclarationId(1727),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59693,11 +51947,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6067, 6144),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1727),
-=======
             id: DeclarationId(1728),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -59717,11 +51967,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6234, 6268),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1728),
-=======
             id: DeclarationId(1729),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -59740,11 +51986,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1729),
-=======
             id: DeclarationId(1730),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -59763,11 +52005,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1730),
-=======
             id: DeclarationId(1731),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -59781,13 +52019,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "content".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1727),
-                    },
-                    Field {
-                        label: "citations".to_string(),
-                        ty: DeclarationId(1728),
-=======
                         ty: DeclarationId(1728),
                     },
                     Field {
@@ -59797,11 +52028,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "cache_control".to_string(),
                         ty: DeclarationId(1730),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "cache_control".to_string(),
-                        ty: DeclarationId(1729),
                     },
                 ],
             },
@@ -59816,11 +52042,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6149, 6364),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1731),
-=======
             id: DeclarationId(1732),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59839,11 +52061,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6369, 6418),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1732),
-=======
             id: DeclarationId(1733),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59862,11 +52080,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6926, 6962),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1733),
-=======
             id: DeclarationId(1734),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -59885,11 +52099,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1734),
-=======
             id: DeclarationId(1735),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -59908,11 +52118,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1735),
-=======
             id: DeclarationId(1736),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -59922,19 +52128,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "content".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1733),
-                    },
-                    Field {
-                        label: "is_error".to_string(),
-                        ty: DeclarationId(1734),
-=======
                         ty: DeclarationId(1734),
                     },
                     Field {
                         label: "is_error".to_string(),
                         ty: DeclarationId(1735),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -59949,11 +52147,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6967, 7085),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1736),
-=======
             id: DeclarationId(1737),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59972,11 +52166,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7532, 7570),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1737),
-=======
             id: DeclarationId(1738),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60005,11 +52195,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7575, 7658),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1738),
-=======
             id: DeclarationId(1739),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60023,11 +52209,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8016, 8023),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1739),
-=======
             id: DeclarationId(1740),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60041,11 +52223,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8028, 8037),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1740),
-=======
             id: DeclarationId(1741),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60059,11 +52237,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8042, 8054),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1741),
-=======
             id: DeclarationId(1742),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60077,11 +52251,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8059, 8066),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1742),
-=======
             id: DeclarationId(1743),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60095,11 +52265,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8071, 8080),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1743),
-=======
             id: DeclarationId(1744),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60113,11 +52279,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8085, 8092),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1744),
-=======
             id: DeclarationId(1745),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60131,9 +52293,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8097, 8123),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1745),
-=======
             id: DeclarationId(1746),
             name: None,
             connective: TypeConnective::Cardinality(
@@ -60154,26 +52313,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(1747),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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/anthropic_schema.dag", 8435, 8442),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1748),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -60192,7 +52331,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1747),
+            id: DeclarationId(1748),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60206,19 +52345,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "document_title".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1745),
-                    },
-                    Field {
-                        label: "file_id".to_string(),
-                        ty: DeclarationId(1746),
-=======
                         ty: DeclarationId(1746),
                     },
                     Field {
                         label: "file_id".to_string(),
                         ty: DeclarationId(1747),
->>>>>>> origin/main
                     },
                     Field {
                         label: "start_char_index".to_string(),
@@ -60241,11 +52372,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8363, 8506),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1748),
-=======
             id: DeclarationId(1749),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -60264,11 +52391,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1749),
-=======
             id: DeclarationId(1750),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -60287,11 +52410,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1750),
-=======
             id: DeclarationId(1751),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60305,19 +52424,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "document_title".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1748),
-                    },
-                    Field {
-                        label: "file_id".to_string(),
-                        ty: DeclarationId(1749),
-=======
                         ty: DeclarationId(1749),
                     },
                     Field {
                         label: "file_id".to_string(),
                         ty: DeclarationId(1750),
->>>>>>> origin/main
                     },
                     Field {
                         label: "start_page_number".to_string(),
@@ -60340,11 +52451,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8511, 8656),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1751),
-=======
             id: DeclarationId(1752),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -60363,11 +52470,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1752),
-=======
             id: DeclarationId(1753),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -60386,11 +52489,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1753),
-=======
             id: DeclarationId(1754),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60404,19 +52503,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "document_title".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1751),
-                    },
-                    Field {
-                        label: "file_id".to_string(),
-                        ty: DeclarationId(1752),
-=======
                         ty: DeclarationId(1752),
                     },
                     Field {
                         label: "file_id".to_string(),
                         ty: DeclarationId(1753),
->>>>>>> origin/main
                     },
                     Field {
                         label: "start_block_index".to_string(),
@@ -60439,11 +52530,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8661, 8814),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1754),
-=======
             id: DeclarationId(1755),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -60462,11 +52549,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1755),
-=======
             id: DeclarationId(1756),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60480,11 +52563,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "title".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1754),
-=======
                         ty: DeclarationId(1755),
->>>>>>> origin/main
                     },
                     Field {
                         label: "url".to_string(),
@@ -60503,11 +52582,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8819, 8919),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1756),
-=======
             id: DeclarationId(1757),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -60526,11 +52601,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1757),
-=======
             id: DeclarationId(1758),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60544,11 +52615,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "title".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1756),
-=======
                         ty: DeclarationId(1757),
->>>>>>> origin/main
                     },
                     Field {
                         label: "search_result_index".to_string(),
@@ -60575,11 +52642,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8924, 9071),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1758),
-=======
             id: DeclarationId(1759),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -60599,19 +52662,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9729),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1759),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1758),
-=======
             id: DeclarationId(1760),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
                     DeclarationId(1759),
->>>>>>> origin/main
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -60626,11 +52681,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1760),
-=======
             id: DeclarationId(1761),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60640,11 +52691,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "citations".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1759),
-=======
                         ty: DeclarationId(1760),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -60659,11 +52706,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9650, 9732),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1761),
-=======
             id: DeclarationId(1762),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60688,11 +52731,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9737, 9798),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1762),
-=======
             id: DeclarationId(1763),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60711,11 +52750,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9803, 9858),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1763),
-=======
             id: DeclarationId(1764),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -60734,63 +52769,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1764),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "id".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "input".to_string(),
-                        ty: DeclarationId(130),
-                    },
-                    Field {
-                        label: "caller".to_string(),
-                        ty: DeclarationId(1763),
-                    },
-                ],
-            },
-            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/anthropic_schema.dag", 9863, 9940),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1765),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(130),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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/anthropic_schema.dag", 10038, 10043),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1766),
-=======
             id: DeclarationId(1765),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60808,7 +52787,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "caller".to_string(),
-                        ty: DeclarationId(1765),
+                        ty: DeclarationId(1764),
                     },
                 ],
             },
@@ -60823,7 +52802,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9863, 9940),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1767),
+            id: DeclarationId(1766),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -60842,7 +52821,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1768),
+            id: DeclarationId(1767),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60860,7 +52839,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "caller".to_string(),
-                        ty: DeclarationId(1767),
+                        ty: DeclarationId(1766),
                     },
                 ],
             },
@@ -60875,7 +52854,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9945, 10045),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1769),
+            id: DeclarationId(1768),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -60894,7 +52873,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1770),
+            id: DeclarationId(1769),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60923,7 +52902,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10050, 10136),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1771),
+            id: DeclarationId(1770),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60937,7 +52916,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10357, 10366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1772),
+            id: DeclarationId(1771),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60951,7 +52930,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10371, 10379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1773),
+            id: DeclarationId(1772),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60965,7 +52944,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10384, 10397),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1774),
+            id: DeclarationId(1773),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60979,7 +52958,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10402, 10419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1775),
+            id: DeclarationId(1774),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60993,7 +52972,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10424, 10447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1776),
+            id: DeclarationId(1775),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61007,9 +52986,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10452, 10471),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1777),
-=======
             id: DeclarationId(1776),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
@@ -61058,26 +53034,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(1779),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(93),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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/anthropic_schema.dag", 10756, 10760),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1780),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -61096,7 +53052,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1779),
+            id: DeclarationId(1780),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -61115,11 +53071,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1780),
-=======
             id: DeclarationId(1781),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61133,11 +53085,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11192, 11201),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1781),
-=======
             id: DeclarationId(1782),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -61157,11 +53105,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11687, 11725),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1782),
-=======
             id: DeclarationId(1783),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -61180,11 +53124,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1783),
-=======
             id: DeclarationId(1784),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -61203,11 +53143,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1784),
-=======
             id: DeclarationId(1785),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61221,11 +53157,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1013, 1025),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1785),
-=======
             id: DeclarationId(1786),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61239,11 +53171,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1030, 1044),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1786),
-=======
             id: DeclarationId(1787),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61257,11 +53185,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1049, 1064),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1787),
-=======
             id: DeclarationId(1788),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61275,11 +53199,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1069, 1086),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1788),
-=======
             id: DeclarationId(1789),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61293,11 +53213,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1091, 1114),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1789),
-=======
             id: DeclarationId(1790),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61311,11 +53227,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4719, 4726),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1790),
-=======
             id: DeclarationId(1791),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61329,11 +53241,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4731, 4735),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1791),
-=======
             id: DeclarationId(1792),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -61353,11 +53261,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6983, 7004),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1792),
-=======
             id: DeclarationId(1793),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61371,11 +53275,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1793),
-=======
             id: DeclarationId(1794),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61389,11 +53289,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1794),
-=======
             id: DeclarationId(1795),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61407,11 +53303,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1795),
-=======
             id: DeclarationId(1796),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61425,11 +53317,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1796),
-=======
             id: DeclarationId(1797),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61443,11 +53331,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1797),
-=======
             id: DeclarationId(1798),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61461,11 +53345,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1798),
-=======
             id: DeclarationId(1799),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61479,11 +53359,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1799),
-=======
             id: DeclarationId(1800),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61497,11 +53373,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1800),
-=======
             id: DeclarationId(1801),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61515,11 +53387,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1801),
-=======
             id: DeclarationId(1802),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61533,11 +53401,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1802),
-=======
             id: DeclarationId(1803),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61551,11 +53415,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1803),
-=======
             id: DeclarationId(1804),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61569,11 +53429,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1804),
-=======
             id: DeclarationId(1805),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61587,11 +53443,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1805),
-=======
             id: DeclarationId(1806),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61605,11 +53457,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1806),
-=======
             id: DeclarationId(1807),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61623,11 +53471,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1807),
-=======
             id: DeclarationId(1808),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61641,11 +53485,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1808),
-=======
             id: DeclarationId(1809),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61659,11 +53499,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1809),
-=======
             id: DeclarationId(1810),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61677,11 +53513,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1810),
-=======
             id: DeclarationId(1811),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61695,11 +53527,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1811),
-=======
             id: DeclarationId(1812),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61713,11 +53541,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1812),
-=======
             id: DeclarationId(1813),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61731,11 +53555,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1813),
-=======
             id: DeclarationId(1814),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -61755,11 +53575,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1814),
-=======
             id: DeclarationId(1815),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61773,11 +53589,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1815),
-=======
             id: DeclarationId(1816),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61791,11 +53603,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1816),
-=======
             id: DeclarationId(1817),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61809,11 +53617,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1817),
-=======
             id: DeclarationId(1818),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61827,11 +53631,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1818),
-=======
             id: DeclarationId(1819),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -61850,11 +53650,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1819),
-=======
             id: DeclarationId(1820),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -61873,11 +53669,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1820),
-=======
             id: DeclarationId(1821),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -61896,11 +53688,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1821),
-=======
             id: DeclarationId(1822),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -61919,11 +53707,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1822),
-=======
             id: DeclarationId(1823),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -61942,11 +53726,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1823),
-=======
             id: DeclarationId(1824),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -61965,11 +53745,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1824),
-=======
             id: DeclarationId(1825),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61988,11 +53764,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1430, 1462),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1825),
-=======
             id: DeclarationId(1826),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62011,11 +53783,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1467, 1503),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1826),
-=======
             id: DeclarationId(1827),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62034,11 +53802,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1508, 1545),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1827),
-=======
             id: DeclarationId(1828),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62057,11 +53821,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1550, 1576),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1828),
-=======
             id: DeclarationId(1829),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62080,11 +53840,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1581, 1614),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1829),
-=======
             id: DeclarationId(1830),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62098,11 +53854,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1619, 1636),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1830),
-=======
             id: DeclarationId(1831),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62121,11 +53873,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1641, 1695),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1831),
-=======
             id: DeclarationId(1832),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62139,11 +53887,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1700, 1707),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1832),
-=======
             id: DeclarationId(1833),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62162,11 +53906,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2059, 2097),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1833),
-=======
             id: DeclarationId(1834),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62191,11 +53931,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2102, 2176),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1834),
-=======
             id: DeclarationId(1835),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62220,11 +53956,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2181, 2256),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1835),
-=======
             id: DeclarationId(1836),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62249,11 +53981,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2261, 2334),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1836),
-=======
             id: DeclarationId(1837),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62272,11 +54000,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2339, 2376),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1837),
-=======
             id: DeclarationId(1838),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62295,11 +54019,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2381, 2418),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1838),
-=======
             id: DeclarationId(1839),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62318,11 +54038,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2423, 2464),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1839),
-=======
             id: DeclarationId(1840),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62336,11 +54052,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2469, 2485),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1840),
-=======
             id: DeclarationId(1841),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62354,11 +54066,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3221, 3231),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1841),
-=======
             id: DeclarationId(1842),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62377,11 +54085,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3236, 3283),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1842),
-=======
             id: DeclarationId(1843),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62400,11 +54104,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3288, 3339),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1843),
-=======
             id: DeclarationId(1844),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62418,11 +54118,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3529, 3533),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1844),
-=======
             id: DeclarationId(1845),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62436,11 +54132,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3538, 3545),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1845),
-=======
             id: DeclarationId(1846),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62454,11 +54146,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3550, 3556),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1846),
-=======
             id: DeclarationId(1847),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -62477,11 +54165,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1847),
-=======
             id: DeclarationId(1848),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62495,11 +54179,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7493, 7504),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1848),
-=======
             id: DeclarationId(1849),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62513,11 +54193,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7553, 7567),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1849),
-=======
             id: DeclarationId(1850),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62531,11 +54207,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7632, 7648),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1850),
-=======
             id: DeclarationId(1851),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62549,11 +54221,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1851),
-=======
             id: DeclarationId(1852),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62567,11 +54235,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1852),
-=======
             id: DeclarationId(1853),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62585,11 +54249,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1853),
-=======
             id: DeclarationId(1854),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62603,11 +54263,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1854),
-=======
             id: DeclarationId(1855),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62621,11 +54277,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1855),
-=======
             id: DeclarationId(1856),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62639,11 +54291,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1856),
-=======
             id: DeclarationId(1857),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62657,11 +54305,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1857),
-=======
             id: DeclarationId(1858),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62675,11 +54319,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1858),
-=======
             id: DeclarationId(1859),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62693,11 +54333,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1859),
-=======
             id: DeclarationId(1860),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62711,11 +54347,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1860),
-=======
             id: DeclarationId(1861),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62729,11 +54361,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1861),
-=======
             id: DeclarationId(1862),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62747,11 +54375,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1862),
-=======
             id: DeclarationId(1863),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62765,11 +54389,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1863),
-=======
             id: DeclarationId(1864),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62783,9 +54403,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2404, 2418),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1864),
-=======
             id: DeclarationId(1865),
             name: None,
             connective: TypeConnective::Instantiation {
@@ -62807,27 +54424,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(1866),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(230),
-                }],
-            },
-            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/computation_model.dag", 2818, 2830),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1867),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -62847,7 +54443,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(1868),
+            id: DeclarationId(1867),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62861,7 +54457,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(1869),
+            id: DeclarationId(1868),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62875,7 +54471,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(1868),
+            id: DeclarationId(1869),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62894,11 +54490,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 6759, 6786),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1869),
-=======
             id: DeclarationId(1870),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62912,11 +54504,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7611, 7616),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1870),
-=======
             id: DeclarationId(1871),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62930,11 +54518,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7621, 7630),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1871),
-=======
             id: DeclarationId(1872),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -62960,11 +54544,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 9513, 9555),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1872),
-=======
             id: DeclarationId(1873),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62978,11 +54558,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3853, 3857),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1873),
-=======
             id: DeclarationId(1874),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62996,11 +54572,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3860, 3864),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1874),
-=======
             id: DeclarationId(1875),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63014,11 +54586,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3867, 3871),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1875),
-=======
             id: DeclarationId(1876),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63032,11 +54600,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3874, 3879),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1876),
-=======
             id: DeclarationId(1877),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63050,11 +54614,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3882, 3893),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1877),
-=======
             id: DeclarationId(1878),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63068,11 +54628,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3896, 3909),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1878),
-=======
             id: DeclarationId(1879),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63086,11 +54642,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4489, 4494),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1879),
-=======
             id: DeclarationId(1880),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63104,11 +54656,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4497, 4506),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1880),
-=======
             id: DeclarationId(1881),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63122,11 +54670,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4509, 4515),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1881),
-=======
             id: DeclarationId(1882),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63140,11 +54684,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4518, 4522),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1882),
-=======
             id: DeclarationId(1883),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63158,11 +54698,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4525, 4529),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1883),
-=======
             id: DeclarationId(1884),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -63182,11 +54718,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5923, 5941),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1884),
-=======
             id: DeclarationId(1885),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -63206,11 +54738,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6396, 6424),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1885),
-=======
             id: DeclarationId(1886),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63224,11 +54752,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1099, 1113),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1886),
-=======
             id: DeclarationId(1887),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63242,11 +54766,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1118, 1128),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1887),
-=======
             id: DeclarationId(1888),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63260,11 +54780,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1133, 1145),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1888),
-=======
             id: DeclarationId(1889),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63278,11 +54794,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1150, 1163),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1889),
-=======
             id: DeclarationId(1890),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63296,11 +54808,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1168, 1180),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1890),
-=======
             id: DeclarationId(1891),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63314,11 +54822,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1185, 1197),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1891),
-=======
             id: DeclarationId(1892),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63332,11 +54836,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1202, 1224),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1892),
-=======
             id: DeclarationId(1893),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63350,11 +54850,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1229, 1248),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1893),
-=======
             id: DeclarationId(1894),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63368,11 +54864,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1253, 1278),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1894),
-=======
             id: DeclarationId(1895),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63386,11 +54878,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1283, 1306),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1895),
-=======
             id: DeclarationId(1896),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63409,11 +54897,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5506, 5542),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1896),
-=======
             id: DeclarationId(1897),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63432,11 +54916,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5547, 5588),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1897),
-=======
             id: DeclarationId(1898),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -63456,11 +54936,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 6047, 6063),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1898),
-=======
             id: DeclarationId(1899),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63479,11 +54955,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9175, 9216),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1899),
-=======
             id: DeclarationId(1900),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63497,11 +54969,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9513, 9525),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1900),
-=======
             id: DeclarationId(1901),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -63521,11 +54989,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9795, 9807),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1901),
-=======
             id: DeclarationId(1902),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -63535,11 +54999,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "sites".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1900),
-=======
                         ty: DeclarationId(1901),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -63554,11 +55014,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9752, 9809),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1902),
-=======
             id: DeclarationId(1903),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63577,11 +55033,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10119, 10153),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1903),
-=======
             id: DeclarationId(1904),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63600,11 +55052,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10556, 10607),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1904),
-=======
             id: DeclarationId(1905),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63618,11 +55066,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10950, 10968),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1905),
-=======
             id: DeclarationId(1906),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -63651,11 +55095,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 11357, 11469),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1906),
-=======
             id: DeclarationId(1907),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -63675,8 +55115,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4846, 4866),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1907),
+            id: DeclarationId(1908),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -63702,9 +55141,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4876, 4900),
         });
         declarations.push(Declaration {
-=======
->>>>>>> origin/main
-            id: DeclarationId(1908),
+            id: DeclarationId(1909),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -63727,46 +55164,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4911, 4935),
-=======
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4876, 4900),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
-            id: DeclarationId(1909),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(992),
-                        value: DeclarationId(1002),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(993),
-                        value: DeclarationId(1003),
-                    },
-                ],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: None,
-            specialization_parent: None,
-            inhabits: None,
-            value_body: None,
-            refinement: None,
-            nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4941, 4965),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1910),
-=======
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 4911, 4935),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1910),
+            id: DeclarationId(1910),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -63793,7 +55194,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(1911),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -63813,35 +55213,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5042, 5062),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1911),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(992),
-                        value: DeclarationId(1005),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(993),
-                        value: DeclarationId(1006),
-                    },
-                ],
-            },
-            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", 5072, 5096),
-        });
-        declarations.push(Declaration {
-=======
->>>>>>> origin/main
             id: DeclarationId(1912),
             name: None,
             connective: TypeConnective::Instantiation {
@@ -63865,11 +55236,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 5107, 5131),
-=======
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5072, 5096),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(1913),
@@ -63895,12 +55262,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/dimensions.dag", 5137, 5161),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1914),
-=======
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5107, 5131),
         });
         declarations.push(Declaration {
@@ -63931,7 +55292,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(1915),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -63951,9 +55311,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5245, 5265),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1915),
-=======
             id: DeclarationId(1916),
             name: None,
             connective: TypeConnective::Instantiation {
@@ -63981,33 +55338,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(1917),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(992),
-                        value: DeclarationId(1008),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(993),
-                        value: DeclarationId(1009),
-                    },
-                ],
-            },
-            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", 5276, 5300),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1918),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -64033,7 +55363,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(1917),
+            id: DeclarationId(1918),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -64053,9 +55383,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5440, 5460),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1918),
-=======
             id: DeclarationId(1919),
             name: None,
             connective: TypeConnective::Instantiation {
@@ -64083,33 +55410,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(1920),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(991),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(992),
-                        value: DeclarationId(1011),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(993),
-                        value: DeclarationId(1012),
-                    },
-                ],
-            },
-            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", 5471, 5495),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1921),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -64135,7 +55435,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(1920),
+            id: DeclarationId(1921),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -64154,11 +55454,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1634, 1651),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1921),
-=======
             id: DeclarationId(1922),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64183,11 +55479,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1656, 1697),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1922),
-=======
             id: DeclarationId(1923),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64201,11 +55493,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1879, 1891),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1923),
-=======
             id: DeclarationId(1924),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -64224,11 +55512,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1896, 1932),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1924),
-=======
             id: DeclarationId(1925),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -64248,21 +55532,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2414, 2430),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1925),
-=======
             id: DeclarationId(1926),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-<<<<<<< HEAD
-                    value: DeclarationId(1924),
-=======
                     value: DeclarationId(1925),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -64276,11 +55552,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2409, 2431),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1926),
-=======
             id: DeclarationId(1927),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64294,11 +55566,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "witnesses".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1925),
-=======
                         ty: DeclarationId(1926),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -64313,11 +55581,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2325, 2437),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1927),
-=======
             id: DeclarationId(1928),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -64337,11 +55601,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2505, 2521),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1928),
-=======
             id: DeclarationId(1929),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -64361,21 +55621,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2544, 2560),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1929),
-=======
             id: DeclarationId(1930),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-<<<<<<< HEAD
-                    value: DeclarationId(1928),
-=======
                     value: DeclarationId(1929),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -64389,11 +55641,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2539, 2561),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1930),
-=======
             id: DeclarationId(1931),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64403,19 +55651,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "violations".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1927),
-                    },
-                    Field {
-                        label: "witnesses".to_string(),
-                        ty: DeclarationId(1929),
-=======
                         ty: DeclarationId(1928),
                     },
                     Field {
                         label: "witnesses".to_string(),
                         ty: DeclarationId(1930),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -64430,11 +55670,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2442, 2567),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1931),
-=======
             id: DeclarationId(1932),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -64454,19 +55690,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3902, 3918),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1932),
-            name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(1931),
-=======
             id: DeclarationId(1933),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
                 output: DeclarationId(1932),
->>>>>>> origin/main
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -64480,11 +55708,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3881, 3918),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1933),
-=======
             id: DeclarationId(1934),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
@@ -64504,11 +55728,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3930, 3945),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1934),
-=======
             id: DeclarationId(1935),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(827), DeclarationId(990)],
@@ -64526,11 +55746,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3966, 4009),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1935),
-=======
             id: DeclarationId(1936),
->>>>>>> origin/main
             name: Some("DimensionUnitAbelianGroup".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(25),
@@ -64550,11 +55766,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1936),
-=======
             id: DeclarationId(1937),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64568,11 +55780,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3709, 3721),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1937),
-=======
             id: DeclarationId(1938),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -64591,11 +55799,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3726, 3762),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1938),
-=======
             id: DeclarationId(1939),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -64615,11 +55819,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 {
-<<<<<<< HEAD
-            id: DeclarationId(1939),
-=======
             id: DeclarationId(1940),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64633,11 +55833,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4373, 4389),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1940),
-=======
             id: DeclarationId(1941),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -64656,11 +55852,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4394, 4422),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1941),
-=======
             id: DeclarationId(1942),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64674,9 +55866,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4665, 4686),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1942),
-=======
             id: DeclarationId(1943),
             name: None,
             connective: TypeConnective::Conj {
@@ -64697,26 +55886,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(1944),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-            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/emit_model.dag", 5176, 5195),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1945),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -64735,7 +55904,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5200, 5222),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1944),
+            id: DeclarationId(1945),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -64755,11 +55924,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5591, 5614),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1945),
-=======
             id: DeclarationId(1946),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64773,11 +55938,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6611, 6619),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1946),
-=======
             id: DeclarationId(1947),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64791,11 +55952,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6624, 6632),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1947),
-=======
             id: DeclarationId(1948),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64809,11 +55966,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7073, 7078),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1948),
-=======
             id: DeclarationId(1949),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64827,11 +55980,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7083, 7091),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1949),
-=======
             id: DeclarationId(1950),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64845,11 +55994,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7427, 7440),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1950),
-=======
             id: DeclarationId(1951),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64863,11 +56008,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7445, 7451),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1951),
-=======
             id: DeclarationId(1952),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64881,11 +56022,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7709, 7717),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1952),
-=======
             id: DeclarationId(1953),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64899,11 +56036,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7722, 7727),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1953),
-=======
             id: DeclarationId(1954),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64917,11 +56050,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7732, 7745),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1954),
-=======
             id: DeclarationId(1955),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64935,11 +56064,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8082, 8100),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1955),
-=======
             id: DeclarationId(1956),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64953,11 +56078,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9475, 9484),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1956),
-=======
             id: DeclarationId(1957),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64971,11 +56092,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9489, 9502),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1957),
-=======
             id: DeclarationId(1958),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64989,11 +56106,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9507, 9515),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1958),
-=======
             id: DeclarationId(1959),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65007,11 +56120,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9520, 9530),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1959),
-=======
             id: DeclarationId(1960),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65025,11 +56134,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9535, 9545),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1960),
-=======
             id: DeclarationId(1961),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65043,11 +56148,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9550, 9561),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1961),
-=======
             id: DeclarationId(1962),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65061,11 +56162,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9566, 9574),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1962),
-=======
             id: DeclarationId(1963),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65079,11 +56176,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9579, 9586),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1963),
-=======
             id: DeclarationId(1964),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65097,11 +56190,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9591, 9601),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1964),
-=======
             id: DeclarationId(1965),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65115,11 +56204,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9606, 9618),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1965),
-=======
             id: DeclarationId(1966),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65133,11 +56218,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12311, 12337),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1966),
-=======
             id: DeclarationId(1967),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65151,11 +56232,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12342, 12352),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1967),
-=======
             id: DeclarationId(1968),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65169,11 +56246,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17117, 17123),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1968),
-=======
             id: DeclarationId(1969),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65187,11 +56260,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17128, 17139),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1969),
-=======
             id: DeclarationId(1970),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65205,11 +56274,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17459, 17470),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1970),
-=======
             id: DeclarationId(1971),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65223,11 +56288,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17475, 17486),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1971),
-=======
             id: DeclarationId(1972),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65241,11 +56302,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 19419, 19430),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1972),
-=======
             id: DeclarationId(1973),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65259,11 +56316,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 19435, 19443),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1973),
-=======
             id: DeclarationId(1974),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65282,11 +56335,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 20606, 20641),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1974),
-=======
             id: DeclarationId(1975),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65311,11 +56360,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 20646, 20734),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1975),
-=======
             id: DeclarationId(1976),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -65335,11 +56380,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6894, 6922),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1976),
-=======
             id: DeclarationId(1977),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -65358,11 +56399,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1977),
-=======
             id: DeclarationId(1978),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -65381,11 +56418,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1978),
-=======
             id: DeclarationId(1979),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -65405,11 +56438,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27850, 27865),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1979),
-=======
             id: DeclarationId(1980),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -65429,11 +56458,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 29879, 29895),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1980),
-=======
             id: DeclarationId(1981),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -65453,11 +56478,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 29988, 30004),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1981),
-=======
             id: DeclarationId(1982),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -65477,21 +56498,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 30102, 30118),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1982),
-=======
             id: DeclarationId(1983),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-<<<<<<< HEAD
-                    value: DeclarationId(1981),
-=======
                     value: DeclarationId(1982),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -65505,28 +56518,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 30097, 30119),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1983),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(93),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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/induction.dag", 33612, 33616),
-        });
-        declarations.push(Declaration {
-=======
->>>>>>> origin/main
             id: DeclarationId(1984),
             name: None,
             connective: TypeConnective::Cardinality(
@@ -65543,11 +56534,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
-=======
             span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(1985),
@@ -65566,11 +56553,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
-=======
             span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(1986),
@@ -65589,11 +56572,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
-=======
             span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(1987),
@@ -65612,11 +56591,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
-=======
             span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(1988),
@@ -65635,11 +56610,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
-=======
             span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(1989),
@@ -65658,11 +56629,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/induction.dag", 5629, 5644),
-=======
             span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(1990),
@@ -65676,11 +56643,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/induction.dag", 5684, 5697),
-=======
             span: SourceSpan::new("src/v3/std/induction.dag", 5629, 5644),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(1991),
@@ -65694,11 +56657,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/induction.dag", 5745, 5762),
-=======
             span: SourceSpan::new("src/v3/std/induction.dag", 5684, 5697),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(1992),
@@ -65712,11 +56671,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/induction.dag", 5801, 5813),
-=======
             span: SourceSpan::new("src/v3/std/induction.dag", 5745, 5762),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(1993),
@@ -65730,12 +56685,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/induction.dag", 5861, 5878),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1994),
-=======
             span: SourceSpan::new("src/v3/std/induction.dag", 5801, 5813),
         });
         declarations.push(Declaration {
@@ -65754,7 +56703,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(1995),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65779,11 +56727,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 9971, 10033),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1995),
-=======
             id: DeclarationId(1996),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65802,11 +56746,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10038, 10080),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1996),
-=======
             id: DeclarationId(1997),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65831,11 +56771,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10085, 10142),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1997),
-=======
             id: DeclarationId(1998),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65849,11 +56785,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10147, 10161),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1998),
-=======
             id: DeclarationId(1999),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65867,11 +56799,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10166, 10181),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(1999),
-=======
             id: DeclarationId(2000),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65885,11 +56813,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24135, 24149),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2000),
-=======
             id: DeclarationId(2001),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65908,11 +56832,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24154, 24201),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2001),
-=======
             id: DeclarationId(2002),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65937,11 +56857,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24206, 24283),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2002),
-=======
             id: DeclarationId(2003),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65966,11 +56882,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24288, 24362),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2003),
-=======
             id: DeclarationId(2004),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65995,11 +56907,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24982, 25038),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2004),
-=======
             id: DeclarationId(2005),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66018,11 +56926,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 25054, 25079),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2005),
-=======
             id: DeclarationId(2006),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66036,11 +56940,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26728, 26741),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2006),
-=======
             id: DeclarationId(2007),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66059,50 +56959,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26785, 26817),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2007),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1084),
-                }],
-            },
-            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/induction.dag", 26880, 26896),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2008),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "factors".to_string(),
-                    ty: DeclarationId(2007),
-                }],
-            },
-            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/induction.dag", 26856, 26898),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2009),
-=======
             id: DeclarationId(2008),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66122,7 +56979,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26880, 26896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2010),
+            id: DeclarationId(2009),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66147,9 +57004,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-<<<<<<< HEAD
-                    value: DeclarationId(2009),
-=======
                     value: DeclarationId(1084),
                 }],
             },
@@ -66171,7 +57025,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(2010),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -66185,20 +57038,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26955, 26977),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2011),
-=======
             id: DeclarationId(2012),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2010),
-=======
                     ty: DeclarationId(2011),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -66212,11 +57057,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26927, 26979),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2012),
-=======
             id: DeclarationId(2013),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66236,20 +57077,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27277, 27292),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2013),
-=======
             id: DeclarationId(2014),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2012),
-=======
                     ty: DeclarationId(2013),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -66263,11 +57096,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27259, 27294),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2014),
-=======
             id: DeclarationId(2015),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66281,11 +57110,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27377, 27389),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2015),
-=======
             id: DeclarationId(2016),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66299,9 +57124,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27459, 27469),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2016),
-=======
             id: DeclarationId(2017),
             name: None,
             connective: TypeConnective::Instantiation {
@@ -66323,7 +57145,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(2018),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66340,30 +57161,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/integer_diagnostic_order.dag", 1234, 1254),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2019),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1298),
-                }],
-            },
-            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/integer_diagnostic_order.dag", 1414, 1434),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2018),
+            id: DeclarationId(2019),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -66383,19 +57184,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4180, 4190),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2019),
-            name: None,
-            connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2018),
-=======
             id: DeclarationId(2020),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
                 output: DeclarationId(2019),
->>>>>>> origin/main
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -66409,11 +57202,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4159, 4190),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2020),
-=======
             id: DeclarationId(2021),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
@@ -66433,11 +57222,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4205, 4214),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2021),
-=======
             id: DeclarationId(2022),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1129), DeclarationId(1129)],
@@ -66455,11 +57240,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4225, 4238),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2022),
-=======
             id: DeclarationId(2023),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1129), DeclarationId(818)],
@@ -66477,11 +57258,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4250, 4271),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2023),
-=======
             id: DeclarationId(2024),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(1129)],
@@ -66499,11 +57276,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4284, 4316),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2024),
-=======
             id: DeclarationId(2025),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66522,11 +57295,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 3305, 3352),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2025),
-=======
             id: DeclarationId(2026),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -66551,11 +57320,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 3357, 3418),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2026),
-=======
             id: DeclarationId(2027),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66569,11 +57334,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 4297, 4302),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2027),
-=======
             id: DeclarationId(2028),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1133)],
@@ -66591,11 +57352,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 5301, 5321),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2028),
-=======
             id: DeclarationId(2029),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1134), DeclarationId(1134)],
@@ -66613,11 +57370,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 5334, 5360),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2029),
-=======
             id: DeclarationId(2030),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1128),
@@ -66637,11 +57390,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 7360, 7372),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2030),
-=======
             id: DeclarationId(2031),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1132),
@@ -66667,11 +57416,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 7388, 7419),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2031),
-=======
             id: DeclarationId(2032),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1135),
@@ -66697,11 +57442,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 9093, 9124),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2032),
-=======
             id: DeclarationId(2033),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1128),
@@ -66721,11 +57462,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 10144, 10156),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2033),
-=======
             id: DeclarationId(2034),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -66745,11 +57482,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4589, 4600),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2034),
-=======
             id: DeclarationId(2035),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -66769,11 +57502,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4642, 4653),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2035),
-=======
             id: DeclarationId(2036),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66787,11 +57516,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4544, 4548),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2036),
-=======
             id: DeclarationId(2037),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66810,11 +57535,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4553, 4563),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2037),
-=======
             id: DeclarationId(2038),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66838,11 +57559,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2038),
-=======
             id: DeclarationId(2039),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66862,11 +57579,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 11243, 11254),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2039),
-=======
             id: DeclarationId(2040),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66885,11 +57598,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2137, 2162),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2040),
-=======
             id: DeclarationId(2041),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66909,20 +57618,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2179, 2195),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2041),
-=======
             id: DeclarationId(2042),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2040),
-=======
                     ty: DeclarationId(2041),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -66936,11 +57637,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2167, 2196),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2042),
-=======
             id: DeclarationId(2043),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -66965,11 +57662,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2201, 2252),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2043),
-=======
             id: DeclarationId(2044),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66988,11 +57681,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2257, 2272),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2044),
-=======
             id: DeclarationId(2045),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67011,11 +57700,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2277, 2304),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2045),
-=======
             id: DeclarationId(2046),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -67041,11 +57726,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 3936, 3954),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2046),
-=======
             id: DeclarationId(2047),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67065,11 +57746,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 4542, 4557),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2047),
-=======
             id: DeclarationId(2048),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67088,11 +57765,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 5388, 5442),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2048),
-=======
             id: DeclarationId(2049),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67106,11 +57779,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 5682, 5691),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2049),
-=======
             id: DeclarationId(2050),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67124,11 +57793,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 5694, 5704),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2050),
-=======
             id: DeclarationId(2051),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67148,11 +57813,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5769, 5797),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2051),
-=======
             id: DeclarationId(2052),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -67175,9 +57836,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/services.dag", 6784, 6807),
-=======
             span: SourceSpan::new("src/v3/std/services.dag", 6785, 6808),
         });
         declarations.push(Declaration {
@@ -67199,7 +57857,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             refinement: None,
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2054),
@@ -67219,30 +57876,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/t_ci_workflow_as_data_demo.dag", 3054, 3080),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2055),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1222),
-                }],
-            },
-            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/t_ci_workflow_as_data_demo.dag", 4626, 4652),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2054),
+            id: DeclarationId(2055),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67262,11 +57899,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4920, 4937),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2055),
-=======
             id: DeclarationId(2056),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67286,11 +57919,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4988, 5002),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2056),
-=======
             id: DeclarationId(2057),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67310,11 +57939,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5052, 5065),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2057),
-=======
             id: DeclarationId(2058),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67334,11 +57959,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5115, 5128),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2058),
-=======
             id: DeclarationId(2059),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67358,51 +57979,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5176, 5192),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2059),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1222),
-                }],
-            },
-            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/t_ci_workflow_as_data_demo.dag", 5245, 5271),
-        });
-        declarations.push(Declaration {
             id: DeclarationId(2060),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(2059),
-                }],
-            },
-            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/t_ci_workflow_as_data_demo.dag", 5240, 5272),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2061),
-=======
-            id: DeclarationId(2060),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -67422,13 +57999,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5245, 5271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2062),
+            id: DeclarationId(2061),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2061),
+                    value: DeclarationId(2060),
                 }],
             },
             type_params: vec![],
@@ -67442,7 +58019,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5240, 5272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2063),
+            id: DeclarationId(2062),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -67502,29 +58079,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5498, 5514),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2064),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(987),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(988),
-                    value: DeclarationId(1222),
-                }],
-            },
-            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/t_ci_workflow_as_data_demo.dag", 5639, 5673),
-        });
-        declarations.push(Declaration {
-=======
->>>>>>> origin/main
             id: DeclarationId(2065),
             name: None,
             connective: TypeConnective::Instantiation {
@@ -67542,11 +58096,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5885, 5919),
-=======
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5639, 5673),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2066),
@@ -67566,11 +58116,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6404, 6438),
-=======
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5885, 5919),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2067),
@@ -67590,40 +58136,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6665, 6699),
-=======
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6404, 6438),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2068),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
-<<<<<<< HEAD
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(988),
-                    value: DeclarationId(1222),
-                }],
-            },
-            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/t_ci_workflow_as_data_demo.dag", 6955, 6989),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2069),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(984),
-=======
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(988),
                     value: DeclarationId(1222),
@@ -67640,7 +58159,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6665, 6699),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2070),
+            id: DeclarationId(2069),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -67660,7 +58179,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6955, 6989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2071),
+            id: DeclarationId(2070),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -67720,37 +58239,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8469, 8503),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2072),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1920),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1222),
-                }],
-            },
-            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/t_ci_workflow_as_data_demo.dag", 3054, 3080),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2073),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1920),
-=======
             id: DeclarationId(2073),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1921),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -67770,11 +58262,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(2074),
             name: None,
             connective: TypeConnective::Instantiation {
-<<<<<<< HEAD
-                template: DeclarationId(1920),
-=======
                 template: DeclarationId(1921),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -67794,11 +58282,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(2075),
             name: None,
             connective: TypeConnective::Instantiation {
-<<<<<<< HEAD
-                template: DeclarationId(1920),
-=======
                 template: DeclarationId(1921),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -67818,11 +58302,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(2076),
             name: None,
             connective: TypeConnective::Instantiation {
-<<<<<<< HEAD
-                template: DeclarationId(1920),
-=======
                 template: DeclarationId(1921),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -67842,11 +58322,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(2077),
             name: None,
             connective: TypeConnective::Instantiation {
-<<<<<<< HEAD
-                template: DeclarationId(1920),
-=======
                 template: DeclarationId(1921),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -67866,11 +58342,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(2078),
             name: None,
             connective: TypeConnective::Instantiation {
-<<<<<<< HEAD
-                template: DeclarationId(1920),
-=======
                 template: DeclarationId(1921),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -67890,11 +58362,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(2079),
             name: None,
             connective: TypeConnective::Instantiation {
-<<<<<<< HEAD
-                template: DeclarationId(1920),
-=======
                 template: DeclarationId(1921),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -67914,11 +58382,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(2080),
             name: None,
             connective: TypeConnective::Instantiation {
-<<<<<<< HEAD
-                template: DeclarationId(1920),
-=======
                 template: DeclarationId(1921),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -67938,11 +58402,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(2081),
             name: None,
             connective: TypeConnective::Instantiation {
-<<<<<<< HEAD
-                template: DeclarationId(1920),
-=======
                 template: DeclarationId(1921),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -67962,9 +58422,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(2082),
             name: None,
             connective: TypeConnective::Instantiation {
-<<<<<<< HEAD
-                template: DeclarationId(1432),
-=======
                 template: DeclarationId(1921),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
@@ -67986,7 +58443,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1433),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(799),
@@ -68003,17 +58459,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4920, 4937),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2083),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1432),
-=======
             id: DeclarationId(2084),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1433),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(827),
@@ -68030,17 +58479,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4988, 5002),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2084),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1432),
-=======
             id: DeclarationId(2085),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1433),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(781),
@@ -68057,17 +58499,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5052, 5065),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2085),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1432),
-=======
             id: DeclarationId(2086),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1433),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(817),
@@ -68084,17 +58519,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5115, 5128),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2086),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1432),
-=======
             id: DeclarationId(2087),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1433),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(982),
@@ -68111,36 +58539,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5176, 5192),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2087),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1432),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(2059),
-                }],
-            },
-            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/t_ci_workflow_as_data_demo.dag", 5240, 5272),
-        });
-        declarations.push(Declaration {
-=======
->>>>>>> origin/main
             id: DeclarationId(2088),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1434),
+                template: DeclarationId(1433),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2061),
+                    value: DeclarationId(2060),
                 }],
             },
             type_params: vec![],
@@ -68174,17 +58579,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5341, 5373),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2089),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1920),
-=======
             id: DeclarationId(2090),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1921),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -68201,17 +58599,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5346, 5372),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2090),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1434),
-=======
             id: DeclarationId(2091),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1435),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(982),
@@ -68228,17 +58619,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5498, 5514),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2091),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1926),
-=======
             id: DeclarationId(2092),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1927),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(988),
                     value: DeclarationId(1222),
@@ -68255,17 +58639,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5639, 5673),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2092),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1930),
-=======
             id: DeclarationId(2093),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1931),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(988),
                     value: DeclarationId(1222),
@@ -68282,28 +58659,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5885, 5919),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2093),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1197),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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/termination.dag", 2429, 2445),
-        });
-        declarations.push(Declaration {
-=======
->>>>>>> origin/main
             id: DeclarationId(2094),
             name: None,
             connective: TypeConnective::Cardinality(
@@ -68320,11 +58675,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
-=======
             span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2095),
@@ -68335,8 +58686,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     CardinalityBound::AtMostOne,
                 ),
             ),
-<<<<<<< HEAD
-=======
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -68382,33 +58731,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                 ],
             },
->>>>>>> origin/main
-            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/termination.dag", 2471, 2487),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2098),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(137),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(138),
-                        value: DeclarationId(230),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(139),
-                        value: DeclarationId(1197),
-                    },
-                ],
-            },
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -68420,7 +58742,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2732, 2760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2099),
+            id: DeclarationId(2098),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -68446,7 +58768,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2804, 2832),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2098),
+            id: DeclarationId(2099),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68465,11 +58787,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2099),
-=======
             id: DeclarationId(2100),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68488,11 +58806,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2100),
-=======
             id: DeclarationId(2101),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(11),
@@ -68518,11 +58832,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 12353, 12399),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2101),
-=======
             id: DeclarationId(2102),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68536,11 +58846,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 767, 773),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2102),
-=======
             id: DeclarationId(2103),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68554,11 +58860,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 778, 791),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2103),
-=======
             id: DeclarationId(2104),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68572,28 +58874,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 796, 810),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2104),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "param".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-            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/termination.dag", 3332, 3358),
-        });
-        declarations.push(Declaration {
-=======
->>>>>>> origin/main
             id: DeclarationId(2105),
             name: None,
             connective: TypeConnective::Conj {
@@ -68610,11 +58890,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/termination.dag", 3363, 3391),
-=======
             span: SourceSpan::new("src/v3/std/termination.dag", 3332, 3358),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2106),
@@ -68633,11 +58909,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/termination.dag", 3396, 3429),
-=======
             span: SourceSpan::new("src/v3/std/termination.dag", 3363, 3391),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2107),
@@ -68656,11 +58928,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/termination.dag", 3434, 3465),
-=======
             span: SourceSpan::new("src/v3/std/termination.dag", 3396, 3429),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2108),
@@ -68679,12 +58947,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/termination.dag", 3470, 3502),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2109),
-=======
             span: SourceSpan::new("src/v3/std/termination.dag", 3434, 3465),
         });
         declarations.push(Declaration {
@@ -68708,7 +58970,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(2110),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68722,11 +58983,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 4509, 4516),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2110),
-=======
             id: DeclarationId(2111),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68745,11 +59002,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 4521, 4571),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2111),
-=======
             id: DeclarationId(2112),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68763,11 +59016,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 5484, 5495),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2112),
-=======
             id: DeclarationId(2113),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68786,11 +59035,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 5500, 5545),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2113),
-=======
             id: DeclarationId(2114),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68809,11 +59054,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7649, 7683),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2114),
-=======
             id: DeclarationId(2115),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68832,11 +59073,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7688, 7732),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2115),
-=======
             id: DeclarationId(2116),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68855,11 +59092,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7737, 7795),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2116),
-=======
             id: DeclarationId(2117),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68878,11 +59111,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7800, 7856),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2117),
-=======
             id: DeclarationId(2118),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68901,11 +59130,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7861, 7894),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2118),
-=======
             id: DeclarationId(2119),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68924,11 +59149,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7899, 7929),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2119),
-=======
             id: DeclarationId(2120),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68942,11 +59163,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7934, 7947),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2120),
-=======
             id: DeclarationId(2121),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -68966,11 +59183,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7987, 8009),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2121),
-=======
             id: DeclarationId(2122),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -68990,11 +59203,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 8219, 8240),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2122),
-=======
             id: DeclarationId(2123),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69008,11 +59217,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 8740, 8746),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2123),
-=======
             id: DeclarationId(2124),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69026,11 +59231,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 9139, 9152),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2124),
-=======
             id: DeclarationId(2125),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69044,11 +59245,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 9157, 9171),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2125),
-=======
             id: DeclarationId(2126),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69067,11 +59264,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 10263, 10297),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2126),
-=======
             id: DeclarationId(2127),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69085,11 +59278,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 10302, 10320),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2127),
-=======
             id: DeclarationId(2128),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -69115,11 +59304,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 11234, 11261),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2128),
-=======
             id: DeclarationId(2129),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69139,11 +59324,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9931, 9947),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2129),
-=======
             id: DeclarationId(2130),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -69163,11 +59344,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2130),
-=======
             id: DeclarationId(2131),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69186,11 +59363,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4032, 4066),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2131),
-=======
             id: DeclarationId(2132),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69204,11 +59377,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4071, 4081),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2132),
-=======
             id: DeclarationId(2133),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69222,11 +59391,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4086, 4095),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2133),
-=======
             id: DeclarationId(2134),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69240,11 +59405,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4100, 4105),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2134),
-=======
             id: DeclarationId(2135),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69264,17 +59425,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7603, 7631),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2135),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1432),
-=======
             id: DeclarationId(2136),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1433),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(978),
@@ -69288,41 +59442,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 8271, 8287),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2136),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1920),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1222),
-                }],
-            },
-            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/timing_lens.dag", 12180, 12206),
-=======
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9931, 9947),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2137),
             name: None,
             connective: TypeConnective::Instantiation {
-<<<<<<< HEAD
-                template: DeclarationId(1920),
-=======
                 template: DeclarationId(1921),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -69342,11 +59468,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(2138),
             name: None,
             connective: TypeConnective::Instantiation {
-<<<<<<< HEAD
-                template: DeclarationId(1920),
-=======
                 template: DeclarationId(1921),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -69366,11 +59488,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(2139),
             name: None,
             connective: TypeConnective::Instantiation {
-<<<<<<< HEAD
-                template: DeclarationId(1920),
-=======
                 template: DeclarationId(1921),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -69390,11 +59508,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(2140),
             name: None,
             connective: TypeConnective::Instantiation {
-<<<<<<< HEAD
-                template: DeclarationId(1920),
-=======
                 template: DeclarationId(1921),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -69414,11 +59528,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(2141),
             name: None,
             connective: TypeConnective::Instantiation {
-<<<<<<< HEAD
-                template: DeclarationId(1920),
-=======
                 template: DeclarationId(1921),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -69438,11 +59548,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(2142),
             name: None,
             connective: TypeConnective::Instantiation {
-<<<<<<< HEAD
-                template: DeclarationId(1920),
-=======
                 template: DeclarationId(1921),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -69462,11 +59568,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(2143),
             name: None,
             connective: TypeConnective::Instantiation {
-<<<<<<< HEAD
-                template: DeclarationId(1920),
-=======
                 template: DeclarationId(1921),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -69486,11 +59588,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(2144),
             name: None,
             connective: TypeConnective::Instantiation {
-<<<<<<< HEAD
-                template: DeclarationId(1920),
-=======
                 template: DeclarationId(1921),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -69510,11 +59608,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(2145),
             name: None,
             connective: TypeConnective::Instantiation {
-<<<<<<< HEAD
-                template: DeclarationId(1920),
-=======
                 template: DeclarationId(1921),
->>>>>>> origin/main
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -69528,11 +59622,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/timing_lens.dag", 12180, 12206),
-=======
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2146),
@@ -69552,11 +59642,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 646, 651),
-=======
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2147),
@@ -69570,11 +59656,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 656, 660),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 646, 651),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2148),
@@ -69588,11 +59670,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 665, 671),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 656, 660),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2149),
@@ -69606,11 +59684,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 676, 682),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 665, 671),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2150),
@@ -69624,11 +59698,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 687, 691),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 676, 682),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2151),
@@ -69642,11 +59712,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 696, 702),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 687, 691),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2152),
@@ -69660,11 +59726,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 707, 715),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 696, 702),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2153),
@@ -69678,11 +59740,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 720, 728),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 707, 715),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2154),
@@ -69696,11 +59754,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 733, 740),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 720, 728),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2155),
@@ -69714,11 +59768,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 745, 751),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 733, 740),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2156),
@@ -69732,11 +59782,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 756, 763),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 745, 751),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2157),
@@ -69750,11 +59796,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 768, 774),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 756, 763),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2158),
@@ -69768,11 +59810,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 779, 786),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 768, 774),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2159),
@@ -69786,11 +59824,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 791, 804),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 779, 786),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2160),
@@ -69809,11 +59843,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 889, 903),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 791, 804),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2161),
@@ -69832,11 +59862,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 908, 925),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 889, 903),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2162),
@@ -69855,11 +59881,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 930, 932),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 908, 925),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2163),
@@ -69873,11 +59895,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 937, 941),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 930, 932),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2164),
@@ -69891,11 +59909,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 946, 951),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 937, 941),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2165),
@@ -69909,11 +59923,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 956, 958),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 946, 951),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2166),
@@ -69927,11 +59937,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 963, 965),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 956, 958),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2167),
@@ -69945,11 +59951,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 970, 972),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 963, 965),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2168),
@@ -69963,11 +59965,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 977, 979),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 970, 972),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2169),
@@ -69981,11 +59979,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 984, 988),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 977, 979),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2170),
@@ -69999,11 +59993,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 993, 998),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 984, 988),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2171),
@@ -70017,11 +60007,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1003, 1007),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 993, 998),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2172),
@@ -70035,11 +60021,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1012, 1017),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1003, 1007),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2173),
@@ -70053,11 +60035,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1022, 1028),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1012, 1017),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2174),
@@ -70071,11 +60049,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1033, 1041),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1022, 1028),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2175),
@@ -70089,11 +60063,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1046, 1051),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1033, 1041),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2176),
@@ -70107,11 +60077,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1056, 1061),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1046, 1051),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2177),
@@ -70125,11 +60091,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1066, 1074),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1056, 1061),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2178),
@@ -70143,11 +60105,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1079, 1088),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1066, 1074),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2179),
@@ -70161,11 +60119,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1093, 1096),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1079, 1088),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2180),
@@ -70179,11 +60133,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1101, 1107),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1093, 1096),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2181),
@@ -70197,11 +60147,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1112, 1118),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1101, 1107),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2182),
@@ -70215,11 +60161,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1123, 1129),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1112, 1118),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2183),
@@ -70233,11 +60175,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1134, 1140),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1123, 1129),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2184),
@@ -70251,11 +60189,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1145, 1153),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1134, 1140),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2185),
@@ -70269,11 +60203,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1158, 1166),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1145, 1153),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2186),
@@ -70287,11 +60217,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1171, 1176),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1158, 1166),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2187),
@@ -70305,11 +60231,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1181, 1190),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1171, 1176),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2188),
@@ -70323,11 +60245,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1195, 1199),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1181, 1190),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2189),
@@ -70341,11 +60259,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1204, 1212),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1195, 1199),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2190),
@@ -70359,11 +60273,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1217, 1220),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1204, 1212),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2191),
@@ -70377,11 +60287,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1791, 1796),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1217, 1220),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2192),
@@ -70395,11 +60301,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1801, 1805),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1791, 1796),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2193),
@@ -70413,11 +60315,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1810, 1816),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1801, 1805),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2194),
@@ -70431,11 +60329,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1821, 1827),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1810, 1816),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2195),
@@ -70449,11 +60343,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1832, 1836),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1821, 1827),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2196),
@@ -70467,11 +60357,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1841, 1847),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1832, 1836),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2197),
@@ -70485,11 +60371,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1852, 1860),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1841, 1847),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2198),
@@ -70503,11 +60385,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1865, 1873),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1852, 1860),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2199),
@@ -70521,11 +60399,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1878, 1885),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1865, 1873),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2200),
@@ -70539,11 +60413,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1890, 1896),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1878, 1885),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2201),
@@ -70557,11 +60427,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1901, 1908),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1890, 1896),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2202),
@@ -70575,11 +60441,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1913, 1919),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1901, 1908),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2203),
@@ -70593,11 +60455,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 1924, 1931),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1913, 1919),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2204),
@@ -70611,11 +60469,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2371, 2373),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1924, 1931),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2205),
@@ -70629,11 +60483,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2378, 2382),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2371, 2373),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2206),
@@ -70647,11 +60497,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2387, 2392),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2378, 2382),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2207),
@@ -70665,11 +60511,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2397, 2399),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2387, 2392),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2208),
@@ -70683,11 +60525,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2404, 2406),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2397, 2399),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2209),
@@ -70701,11 +60539,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2411, 2413),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2404, 2406),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2210),
@@ -70719,11 +60553,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2418, 2420),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2411, 2413),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2211),
@@ -70737,11 +60567,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2425, 2429),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2418, 2420),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2212),
@@ -70755,11 +60581,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2434, 2439),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2425, 2429),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2213),
@@ -70773,11 +60595,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2444, 2448),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2434, 2439),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2214),
@@ -70791,11 +60609,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2453, 2458),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2444, 2448),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2215),
@@ -70809,11 +60623,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2463, 2469),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2453, 2458),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2216),
@@ -70827,11 +60637,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2474, 2482),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2463, 2469),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2217),
@@ -70845,11 +60651,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2487, 2492),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2474, 2482),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2218),
@@ -70863,11 +60665,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2497, 2502),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2487, 2492),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2219),
@@ -70881,11 +60679,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2507, 2515),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2497, 2502),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2220),
@@ -70899,11 +60693,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2520, 2529),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2507, 2515),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2221),
@@ -70917,11 +60707,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2534, 2537),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2520, 2529),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2222),
@@ -70935,11 +60721,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2542, 2548),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2534, 2537),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2223),
@@ -70953,11 +60735,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2553, 2559),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2542, 2548),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2224),
@@ -70971,11 +60749,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2564, 2570),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2553, 2559),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2225),
@@ -70989,11 +60763,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2575, 2581),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2564, 2570),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2226),
@@ -71007,11 +60777,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2586, 2594),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2575, 2581),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2227),
@@ -71025,11 +60791,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2599, 2607),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2586, 2594),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2228),
@@ -71043,11 +60805,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2612, 2617),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2599, 2607),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2229),
@@ -71061,11 +60819,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2622, 2631),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2612, 2617),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2230),
@@ -71079,11 +60833,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2636, 2640),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2622, 2631),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2231),
@@ -71097,12 +60847,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/tokenize.dag", 2645, 2653),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2232),
-=======
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2636, 2640),
         });
         declarations.push(Declaration {
@@ -71121,7 +60865,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(2233),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -71138,32 +60881,9 @@ 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", 27585, 27608),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2233),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1283),
-                }],
-            },
-            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", 28677, 28693),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27581, 27604),
         });
         declarations.push(Declaration {
-=======
->>>>>>> origin/main
             id: DeclarationId(2234),
             name: None,
             connective: TypeConnective::Instantiation {
@@ -71181,11 +60901,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/verification.dag", 28698, 28718),
-=======
             span: SourceSpan::new("src/v3/std/verification.dag", 28673, 28689),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2235),
@@ -71205,11 +60921,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/verification.dag", 2826, 2840),
-=======
             span: SourceSpan::new("src/v3/std/verification.dag", 28694, 28714),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2236),
@@ -71223,11 +60935,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/verification.dag", 2845, 2855),
-=======
             span: SourceSpan::new("src/v3/std/verification.dag", 2826, 2840),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2237),
@@ -71241,11 +60949,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/verification.dag", 2860, 2872),
-=======
             span: SourceSpan::new("src/v3/std/verification.dag", 2845, 2855),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2238),
@@ -71259,11 +60963,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/verification.dag", 2877, 2890),
-=======
             span: SourceSpan::new("src/v3/std/verification.dag", 2860, 2872),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2239),
@@ -71277,11 +60977,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/verification.dag", 2895, 2907),
-=======
             span: SourceSpan::new("src/v3/std/verification.dag", 2877, 2890),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2240),
@@ -71295,11 +60991,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/verification.dag", 2912, 2924),
-=======
             span: SourceSpan::new("src/v3/std/verification.dag", 2895, 2907),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2241),
@@ -71313,11 +61005,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/verification.dag", 2929, 2951),
-=======
             span: SourceSpan::new("src/v3/std/verification.dag", 2912, 2924),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2242),
@@ -71331,11 +61019,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/verification.dag", 2956, 2975),
-=======
             span: SourceSpan::new("src/v3/std/verification.dag", 2929, 2951),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2243),
@@ -71349,11 +61033,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/verification.dag", 2980, 3005),
-=======
             span: SourceSpan::new("src/v3/std/verification.dag", 2956, 2975),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2244),
@@ -71367,11 +61047,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/verification.dag", 3010, 3033),
-=======
             span: SourceSpan::new("src/v3/std/verification.dag", 2980, 3005),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2245),
@@ -71385,12 +61061,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/verification.dag", 3439, 3448),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2246),
-=======
             span: SourceSpan::new("src/v3/std/verification.dag", 3010, 3033),
         });
         declarations.push(Declaration {
@@ -71409,7 +61079,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(2247),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71428,11 +61097,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 3453, 3469),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2247),
-=======
             id: DeclarationId(2248),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71446,11 +61111,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4128, 4136),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2248),
-=======
             id: DeclarationId(2249),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71464,11 +61125,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4141, 4151),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2249),
-=======
             id: DeclarationId(2250),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71482,11 +61139,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4376, 4388),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2250),
-=======
             id: DeclarationId(2251),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71500,11 +61153,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5203, 5216),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2251),
-=======
             id: DeclarationId(2252),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71518,11 +61167,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5221, 5234),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2252),
-=======
             id: DeclarationId(2253),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71536,11 +61181,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5239, 5247),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2253),
-=======
             id: DeclarationId(2254),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -71565,11 +61206,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5792, 5859),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2254),
-=======
             id: DeclarationId(2255),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71588,11 +61225,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5900, 5953),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2255),
-=======
             id: DeclarationId(2256),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71606,11 +61239,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5986, 6015),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2256),
-=======
             id: DeclarationId(2257),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71624,11 +61253,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6617, 6649),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2257),
-=======
             id: DeclarationId(2258),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71642,11 +61267,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6654, 6685),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2258),
-=======
             id: DeclarationId(2259),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71660,11 +61281,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6727, 6759),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2259),
-=======
             id: DeclarationId(2260),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71678,11 +61295,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6764, 6795),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2260),
-=======
             id: DeclarationId(2261),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71696,11 +61309,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6800, 6828),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2261),
-=======
             id: DeclarationId(2262),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71714,11 +61323,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6833, 6859),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2262),
-=======
             id: DeclarationId(2263),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71732,11 +61337,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6898, 6920),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2263),
-=======
             id: DeclarationId(2264),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71750,11 +61351,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6925, 6953),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2264),
-=======
             id: DeclarationId(2265),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71768,11 +61365,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6958, 6987),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2265),
-=======
             id: DeclarationId(2266),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71783,14 +61376,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", 9797, 9805),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9793, 9801),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2266),
-=======
             id: DeclarationId(2267),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71806,14 +61395,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", 9810, 9850),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9806, 9846),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2267),
-=======
             id: DeclarationId(2268),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71829,14 +61414,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", 9855, 9888),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9851, 9884),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2268),
-=======
             id: DeclarationId(2269),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -71858,14 +61439,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", 9893, 9971),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9889, 9967),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2269),
-=======
             id: DeclarationId(2270),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71881,14 +61458,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", 10137, 10200),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10133, 10196),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2270),
-=======
             id: DeclarationId(2271),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -71914,14 +61487,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", 10205, 10296),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10201, 10292),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2271),
-=======
             id: DeclarationId(2272),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -71947,14 +61516,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", 10301, 10433),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10297, 10429),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2272),
-=======
             id: DeclarationId(2273),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -71976,63 +61541,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", 10648, 10737),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2273),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(230),
-                }],
-            },
-            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", 11537, 11549),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2274),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "command".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "args".to_string(),
-                        ty: DeclarationId(2273),
-                    },
-                    Field {
-                        label: "expect_exit_code".to_string(),
-                        ty: DeclarationId(93),
-                    },
-                ],
-            },
-            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", 11486, 11583),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10644, 10733),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2275),
-=======
             id: DeclarationId(2274),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -72049,14 +61561,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/verification.dag", 12298, 12310),
-=======
             span: SourceSpan::new("src/v3/std/verification.dag", 11533, 11545),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
-            id: DeclarationId(2276),
+            id: DeclarationId(2275),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72066,7 +61574,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2275),
+                        ty: DeclarationId(2274),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -72135,14 +61643,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", 12248, 12376),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12244, 12372),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2277),
-=======
             id: DeclarationId(2278),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72168,14 +61672,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", 12674, 12796),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12670, 12792),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2278),
-=======
             id: DeclarationId(2279),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72201,14 +61701,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", 13058, 13183),
+            span: SourceSpan::new("src/v3/std/verification.dag", 13054, 13179),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2279),
-=======
             id: DeclarationId(2280),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72224,14 +61720,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", 15236, 15297),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15232, 15293),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2280),
-=======
             id: DeclarationId(2281),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72253,14 +61745,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", 15302, 15401),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15298, 15397),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2281),
-=======
             id: DeclarationId(2282),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72286,14 +61774,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", 15755, 15887),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15751, 15883),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2282),
-=======
             id: DeclarationId(2283),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72315,14 +61799,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", 16454, 16566),
+            span: SourceSpan::new("src/v3/std/verification.dag", 16450, 16562),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2283),
-=======
             id: DeclarationId(2284),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72344,14 +61824,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", 17263, 17342),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17259, 17338),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2284),
-=======
             id: DeclarationId(2285),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72377,14 +61853,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", 17562, 17675),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17558, 17671),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2285),
-=======
             id: DeclarationId(2286),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72410,14 +61882,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", 17680, 17816),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17676, 17812),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2286),
-=======
             id: DeclarationId(2287),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72439,14 +61907,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", 18302, 18384),
+            span: SourceSpan::new("src/v3/std/verification.dag", 18298, 18380),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2287),
-=======
             id: DeclarationId(2288),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72468,14 +61932,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", 18389, 18475),
+            span: SourceSpan::new("src/v3/std/verification.dag", 18385, 18471),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2288),
-=======
             id: DeclarationId(2289),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -72492,14 +61952,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", 18554, 18564),
+            span: SourceSpan::new("src/v3/std/verification.dag", 18550, 18560),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2289),
-=======
             id: DeclarationId(2290),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72509,11 +61965,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "generated_paths".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2288),
-=======
                         ty: DeclarationId(2289),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -72525,14 +61977,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", 18480, 18570),
+            span: SourceSpan::new("src/v3/std/verification.dag", 18476, 18566),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2290),
-=======
             id: DeclarationId(2291),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72554,9 +62002,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/verification.dag", 19784, 19909),
-=======
             span: SourceSpan::new("src/v3/std/verification.dag", 19780, 19905),
         });
         declarations.push(Declaration {
@@ -72587,7 +62032,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             refinement: None,
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/verification.dag", 20847, 20981),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2293),
@@ -72616,40 +62060,11 @@ 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", 20851, 20985),
+            span: SourceSpan::new("src/v3/std/verification.dag", 21620, 21764),
         });
         declarations.push(Declaration {
             id: DeclarationId(2294),
             name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "deferred_gate".to_string(),
-                        ty: DeclarationId(1298),
-                    },
-                    Field {
-                        label: "target_lane".to_string(),
-                        ty: DeclarationId(1298),
-                    },
-                    Field {
-                        label: "authority_doc".to_string(),
-                        ty: DeclarationId(1298),
-                    },
-                ],
-            },
-            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", 21624, 21768),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2293),
-            name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "ledger".to_string(),
@@ -72664,14 +62079,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", 22613, 22667),
+            span: SourceSpan::new("src/v3/std/verification.dag", 22609, 22663),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2294),
-=======
             id: DeclarationId(2295),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -72688,9 +62099,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/verification.dag", 23711, 23734),
-=======
             span: SourceSpan::new("src/v3/std/verification.dag", 23707, 23730),
         });
         declarations.push(Declaration {
@@ -72706,7 +62114,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             refinement: None,
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/verification.dag", 23933, 23939),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2297),
@@ -72720,25 +62127,11 @@ 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", 23937, 23943),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23944, 23950),
         });
         declarations.push(Declaration {
             id: DeclarationId(2298),
             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", 23948, 23954),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2297),
-            name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
@@ -72754,9 +62147,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/verification.dag", 24092, 24115),
-=======
             span: SourceSpan::new("src/v3/std/verification.dag", 24088, 24111),
         });
         declarations.push(Declaration {
@@ -72777,7 +62167,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             refinement: None,
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/verification.dag", 25834, 25863),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2300),
@@ -72785,50 +62174,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1278),
-                }],
-            },
-            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", 25838, 25867),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2299),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1280),
-=======
                     ty: DeclarationId(1282),
->>>>>>> origin/main
-                }],
-            },
-            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", 25872, 25911),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2300),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1278),
                 }],
             },
             type_params: vec![],
@@ -72839,11 +62185,9 @@ 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", 26769, 26790),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25868, 25907),
         });
         declarations.push(Declaration {
-=======
->>>>>>> origin/main
             id: DeclarationId(2301),
             name: None,
             connective: TypeConnective::Conj {
@@ -72860,12 +62204,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/verification.dag", 26795, 26826),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2302),
-=======
             span: SourceSpan::new("src/v3/std/verification.dag", 26765, 26786),
         });
         declarations.push(Declaration {
@@ -72889,7 +62227,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(2303),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -72906,14 +62243,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", 26870, 26886),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26866, 26882),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2303),
-=======
             id: DeclarationId(2304),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -72930,14 +62263,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", 27142, 27165),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27138, 27161),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2304),
-=======
             id: DeclarationId(2305),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -72957,11 +62286,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 7221, 7252),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2305),
-=======
             id: DeclarationId(2306),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -72981,11 +62306,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/workflows.dag", 992, 1006),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2306),
-=======
             id: DeclarationId(2307),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72999,11 +62320,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 532, 547),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2307),
-=======
             id: DeclarationId(2308),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73017,11 +62334,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 550, 561),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2308),
-=======
             id: DeclarationId(2309),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73035,11 +62348,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 564, 576),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2309),
-=======
             id: DeclarationId(2310),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73058,11 +62367,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2310),
-=======
             id: DeclarationId(2311),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73076,11 +62381,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6428, 6446),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2311),
-=======
             id: DeclarationId(2312),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73094,11 +62395,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6451, 6466),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2312),
-=======
             id: DeclarationId(2313),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73112,11 +62409,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6495, 6518),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2313),
-=======
             id: DeclarationId(2314),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73130,11 +62423,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6523, 6544),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2314),
-=======
             id: DeclarationId(2315),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73148,11 +62437,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6549, 6564),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2315),
-=======
             id: DeclarationId(2316),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73166,11 +62451,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8177, 8187),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2316),
-=======
             id: DeclarationId(2317),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73184,11 +62465,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8192, 8203),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2317),
-=======
             id: DeclarationId(2318),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73202,11 +62479,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8208, 8221),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2318),
-=======
             id: DeclarationId(2319),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73220,11 +62493,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8226, 8239),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2319),
-=======
             id: DeclarationId(2320),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73238,11 +62507,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8244, 8257),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2320),
-=======
             id: DeclarationId(2321),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73256,11 +62521,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8262, 8276),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2321),
-=======
             id: DeclarationId(2322),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73274,11 +62535,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8281, 8296),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2322),
-=======
             id: DeclarationId(2323),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73292,11 +62549,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9038, 9055),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2323),
-=======
             id: DeclarationId(2324),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73310,11 +62563,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9060, 9070),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2324),
-=======
             id: DeclarationId(2325),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73328,9 +62577,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9075, 9079),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2325),
-=======
             id: DeclarationId(2326),
             name: None,
             connective: TypeConnective::Conj {
@@ -73377,7 +62623,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(2327),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73391,57 +62636,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "carrier".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1338),
-                    },
-                    Field {
-                        label: "range_min_inclusive".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "range_max_inclusive".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "is_copy".to_string(),
-                        ty: DeclarationId(128),
-                    },
-                    Field {
-                        label: "overflow".to_string(),
                         ty: DeclarationId(1339),
                     },
-                ],
-            },
-            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("dsl/extdeps/languages/rust/primitives.dag", 9857, 10429),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2326),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "target_name".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "algebra".to_string(),
-                        ty: DeclarationId(1337),
-=======
-                        ty: DeclarationId(1339),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "carrier".to_string(),
-                        ty: DeclarationId(1338),
-                    },
                     Field {
                         label: "is_copy".to_string(),
                         ty: DeclarationId(128),
@@ -73459,21 +62655,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10434, 10616),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2327),
-=======
             id: DeclarationId(2328),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-<<<<<<< HEAD
-                    value: DeclarationId(1340),
-=======
                     value: DeclarationId(1341),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -73487,11 +62675,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10965, 10984),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2328),
-=======
             id: DeclarationId(2329),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73505,11 +62689,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4233, 4241),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2329),
-=======
             id: DeclarationId(2330),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -73528,11 +62708,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4246, 4277),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2330),
-=======
             id: DeclarationId(2331),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -73552,20 +62728,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4299, 4319),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2331),
-=======
             id: DeclarationId(2332),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "values".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2330),
-=======
                     ty: DeclarationId(2331),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -73579,11 +62747,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4282, 4321),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2332),
-=======
             id: DeclarationId(2333),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73608,11 +62772,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4326, 4379),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2333),
-=======
             id: DeclarationId(2334),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73637,11 +62797,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4384, 4433),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2334),
-=======
             id: DeclarationId(2335),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73655,11 +62811,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 847, 851),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2335),
-=======
             id: DeclarationId(2336),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73673,11 +62825,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 854, 857),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2336),
-=======
             id: DeclarationId(2337),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73691,21 +62839,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 860, 872),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2337),
-=======
             id: DeclarationId(2338),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-<<<<<<< HEAD
-                    value: DeclarationId(1352),
-=======
                     value: DeclarationId(1353),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -73719,11 +62859,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1242, 1259),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2338),
-=======
             id: DeclarationId(2339),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73742,11 +62878,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2339),
-=======
             id: DeclarationId(2340),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73760,11 +62892,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1309, 1318),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2340),
-=======
             id: DeclarationId(2341),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73778,11 +62906,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1323, 1332),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2341),
-=======
             id: DeclarationId(2342),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73796,11 +62920,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1337, 1350),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2342),
-=======
             id: DeclarationId(2343),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73814,11 +62934,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1355, 1367),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2343),
-=======
             id: DeclarationId(2344),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73832,11 +62948,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1372, 1385),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2344),
-=======
             id: DeclarationId(2345),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73855,11 +62967,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2345),
-=======
             id: DeclarationId(2346),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73873,11 +62981,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1677, 1685),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2346),
-=======
             id: DeclarationId(2347),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73891,11 +62995,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1688, 1697),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2347),
-=======
             id: DeclarationId(2348),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73909,21 +63009,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1700, 1709),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2348),
-=======
             id: DeclarationId(2349),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-<<<<<<< HEAD
-                    value: DeclarationId(1361),
-=======
                     value: DeclarationId(1362),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -73937,19 +63029,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1521, 1542),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2349),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1370),
-=======
             id: DeclarationId(2350),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
                     DeclarationId(1371),
->>>>>>> origin/main
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -73964,21 +63048,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2350),
-=======
             id: DeclarationId(2351),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-<<<<<<< HEAD
-                    value: DeclarationId(1367),
-=======
                     value: DeclarationId(1368),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -73992,11 +63068,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1583, 1592),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2351),
-=======
             id: DeclarationId(2352),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -74022,19 +63094,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1709),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2352),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2351),
-=======
             id: DeclarationId(2353),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
                     DeclarationId(2352),
->>>>>>> origin/main
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -74049,19 +63113,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2353),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1359),
-=======
             id: DeclarationId(2354),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
                     DeclarationId(1360),
->>>>>>> origin/main
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -74076,11 +63132,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2354),
-=======
             id: DeclarationId(2355),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74094,11 +63146,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1917, 1925),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2355),
-=======
             id: DeclarationId(2356),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74112,11 +63160,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1928, 1937),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2356),
-=======
             id: DeclarationId(2357),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74130,9 +63174,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1940, 1948),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2357),
-=======
             id: DeclarationId(2358),
             name: None,
             connective: TypeConnective::Instantiation {
@@ -74154,27 +63195,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(2359),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(230),
-                }],
-            },
-            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("dsl/extdeps/github/actions.dag", 2106, 2118),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2360),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -74194,25 +63214,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2127, 2139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2359),
+            id: DeclarationId(2360),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "branches".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2357),
-                    },
-                    Field {
-                        label: "paths".to_string(),
-                        ty: DeclarationId(2358),
-=======
                         ty: DeclarationId(2358),
                     },
                     Field {
                         label: "paths".to_string(),
                         ty: DeclarationId(2359),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -74227,11 +63239,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2089, 2141),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2360),
-=======
             id: DeclarationId(2361),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -74251,21 +63259,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2170, 2182),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2361),
-=======
             id: DeclarationId(2362),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-<<<<<<< HEAD
-                    value: DeclarationId(1362),
-=======
                     value: DeclarationId(1363),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -74279,29 +63279,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2191, 2216),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2362),
-=======
             id: DeclarationId(2363),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "branches".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2360),
-                    },
-                    Field {
-                        label: "types".to_string(),
-                        ty: DeclarationId(2361),
-=======
                         ty: DeclarationId(2361),
                     },
                     Field {
                         label: "types".to_string(),
                         ty: DeclarationId(2362),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -74316,20 +63304,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2146, 2218),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2363),
-=======
             id: DeclarationId(2364),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "cron".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1343),
-=======
                     ty: DeclarationId(1344),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -74343,21 +63323,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2223, 2254),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2364),
-=======
             id: DeclarationId(2365),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-<<<<<<< HEAD
-                    value: DeclarationId(1363),
-=======
                     value: DeclarationId(1364),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -74371,55 +63343,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2286, 2305),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2365),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "inputs".to_string(),
-                    ty: DeclarationId(2364),
-                }],
-            },
-            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("dsl/extdeps/github/actions.dag", 2259, 2307),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2366),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(1363),
-                }],
-            },
-            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("dsl/extdeps/github/actions.dag", 2335, 2354),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2367),
-=======
             id: DeclarationId(2366),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "inputs".to_string(),
-                    ty: DeclarationId(2366),
+                    ty: DeclarationId(2365),
                 }],
             },
             type_params: vec![],
@@ -74433,7 +63362,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2259, 2307),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2368),
+            id: DeclarationId(2367),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -74453,7 +63382,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2335, 2354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2369),
+            id: DeclarationId(2368),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74472,7 +63401,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2312, 2356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2370),
+            id: DeclarationId(2369),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74486,7 +63415,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2387, 2393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2371),
+            id: DeclarationId(2370),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74500,7 +63429,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2398, 2409),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2372),
+            id: DeclarationId(2371),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74514,9 +63443,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2414, 2422),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2373),
-=======
             id: DeclarationId(2372),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
@@ -74565,26 +63491,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(2375),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 2505, 2512),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2376),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -74603,7 +63509,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2377),
+            id: DeclarationId(2376),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74617,7 +63523,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2603, 2614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2378),
+            id: DeclarationId(2377),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74631,7 +63537,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2617, 2629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2379),
+            id: DeclarationId(2378),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74645,7 +63551,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2632, 2643),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2380),
+            id: DeclarationId(2379),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74659,7 +63565,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2646, 2662),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2381),
+            id: DeclarationId(2380),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74673,7 +63579,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4784, 4793),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2382),
+            id: DeclarationId(2381),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74687,7 +63593,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4796, 4804),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2383),
+            id: DeclarationId(2382),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74701,7 +63607,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4807, 4820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2382),
+            id: DeclarationId(2383),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -74720,21 +63626,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2383),
-=======
             id: DeclarationId(2384),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-<<<<<<< HEAD
-                    value: DeclarationId(1373),
-=======
                     value: DeclarationId(1374),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -74748,11 +63646,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5372, 5382),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2384),
-=======
             id: DeclarationId(2385),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -74772,56 +63666,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5392, 5404),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2385),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(137),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(138),
-                        value: DeclarationId(230),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(139),
-                        value: DeclarationId(230),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/actions.dag", 5492, 5511),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2386),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2385),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 5492, 5512),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2387),
-=======
             id: DeclarationId(2386),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -74847,11 +63692,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2388),
+            id: DeclarationId(2387),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2387),
+                    DeclarationId(2386),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -74866,7 +63711,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2389),
+            id: DeclarationId(2388),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -74930,19 +63775,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2390),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1389),
-=======
             id: DeclarationId(2391),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
                     DeclarationId(1390),
->>>>>>> origin/main
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -74957,11 +63794,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2391),
-=======
             id: DeclarationId(2392),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -74980,19 +63813,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2392),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1370),
-=======
             id: DeclarationId(2393),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
                     DeclarationId(1371),
->>>>>>> origin/main
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -75007,11 +63832,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2393),
-=======
             id: DeclarationId(2394),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -75030,11 +63851,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6619, 6655),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2394),
-=======
             id: DeclarationId(2395),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -75053,11 +63870,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6660, 6709),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2395),
-=======
             id: DeclarationId(2396),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75071,11 +63884,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7555, 7584),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2396),
-=======
             id: DeclarationId(2397),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -75094,11 +63903,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7589, 7646),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2397),
-=======
             id: DeclarationId(2398),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -75117,55 +63922,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8224, 8259),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2398),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1369),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 8418, 8447),
-        });
-        declarations.push(Declaration {
             id: DeclarationId(2399),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "group".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "cancel_in_progress".to_string(),
-                        ty: DeclarationId(2398),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/actions.dag", 8264, 8453),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2400),
-=======
-            id: DeclarationId(2399),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -75181,12 +63938,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2401),
-=======
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
@@ -75235,7 +63986,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(2402),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -75254,11 +64004,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2402),
-=======
             id: DeclarationId(2403),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -75268,19 +64014,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "cancel_in_progress".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2400),
-                    },
-                    Field {
-                        label: "explicit_single".to_string(),
-                        ty: DeclarationId(2401),
-=======
                         ty: DeclarationId(2401),
                     },
                     Field {
                         label: "explicit_single".to_string(),
                         ty: DeclarationId(2402),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -75295,20 +64033,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8458, 8845),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2403),
-=======
             id: DeclarationId(2404),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "label".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1372),
-=======
                     ty: DeclarationId(1373),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -75322,11 +64052,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10037, 10072),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2404),
-=======
             id: DeclarationId(2405),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75346,20 +64072,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10098, 10110),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2405),
-=======
             id: DeclarationId(2406),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "labels".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(2404),
-=======
                     ty: DeclarationId(2405),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -75373,11 +64091,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10077, 10112),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2406),
-=======
             id: DeclarationId(2407),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -75396,11 +64110,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10201, 10240),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2407),
-=======
             id: DeclarationId(2408),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75414,11 +64124,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10263, 10275),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2408),
-=======
             id: DeclarationId(2409),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75432,11 +64138,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10280, 10290),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2409),
-=======
             id: DeclarationId(2410),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75450,11 +64152,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10295, 10305),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2410),
-=======
             id: DeclarationId(2411),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75468,11 +64166,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10310, 10321),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2411),
-=======
             id: DeclarationId(2412),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75486,11 +64180,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10326, 10333),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2412),
-=======
             id: DeclarationId(2413),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75504,9 +64194,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10338, 10351),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2413),
-=======
             id: DeclarationId(2414),
             name: None,
             connective: TypeConnective::Cardinality(
@@ -75527,26 +64214,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(2415),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 10532, 10539),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2416),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -75565,7 +64232,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2415),
+            id: DeclarationId(2416),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -75591,19 +64258,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10633),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2416),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2415),
-=======
             id: DeclarationId(2417),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
                     DeclarationId(2416),
->>>>>>> origin/main
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -75618,9 +64277,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2417),
-=======
             id: DeclarationId(2418),
             name: None,
             connective: TypeConnective::Cardinality(
@@ -75641,26 +64297,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(2419),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 10661, 10668),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2420),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -75679,7 +64315,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2419),
+            id: DeclarationId(2420),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -75698,29 +64334,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2420),
-=======
             id: DeclarationId(2421),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2413),
-                    },
-                    Field {
-                        label: "id".to_string(),
-                        ty: DeclarationId(2414),
-=======
                         ty: DeclarationId(2414),
                     },
                     Field {
                         label: "id".to_string(),
                         ty: DeclarationId(2415),
->>>>>>> origin/main
                     },
                     Field {
                         label: "run".to_string(),
@@ -75728,17 +64352,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "shell".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(1374),
-                    },
-                    Field {
-                        label: "env".to_string(),
-                        ty: DeclarationId(2416),
-                    },
-                    Field {
-                        label: "working_directory".to_string(),
-                        ty: DeclarationId(2417),
-=======
                         ty: DeclarationId(1375),
                     },
                     Field {
@@ -75752,11 +64365,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "if_condition".to_string(),
                         ty: DeclarationId(2419),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "if_condition".to_string(),
-                        ty: DeclarationId(2418),
                     },
                     Field {
                         label: "continue_on_error".to_string(),
@@ -75764,11 +64372,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "timeout_minutes".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2419),
-=======
                         ty: DeclarationId(2420),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -75783,9 +64387,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10510, 10763),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2421),
-=======
             id: DeclarationId(2422),
             name: None,
             connective: TypeConnective::Cardinality(
@@ -75806,27 +64407,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(2423),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 10791, 10798),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2422),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -75845,7 +64425,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2423),
+            id: DeclarationId(2424),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -75871,11 +64451,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2424),
+            id: DeclarationId(2425),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2423),
+                    DeclarationId(2424),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -75890,55 +64470,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2425),
-=======
-            id: DeclarationId(2424),
->>>>>>> origin/main
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(137),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(138),
-                        value: DeclarationId(230),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(139),
-                        value: DeclarationId(230),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/actions.dag", 10943, 10962),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2426),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2425),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 10943, 10963),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2427),
+            id: DeclarationId(2426),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -76002,11 +64534,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2428),
-=======
             id: DeclarationId(2429),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -76025,35 +64553,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2429),
-=======
             id: DeclarationId(2430),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2421),
-                    },
-                    Field {
-                        label: "id".to_string(),
-                        ty: DeclarationId(2422),
-                    },
-                    Field {
-                        label: "uses".to_string(),
-                        ty: DeclarationId(1375),
-                    },
-                    Field {
-                        label: "with".to_string(),
-                        ty: DeclarationId(2424),
-                    },
-                    Field {
-                        label: "env".to_string(),
-                        ty: DeclarationId(2426),
-=======
                         ty: DeclarationId(2422),
                     },
                     Field {
@@ -76067,7 +64572,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "with".to_string(),
                         ty: DeclarationId(2425),
->>>>>>> origin/main
                     },
                     Field {
                         label: "env".to_string(),
@@ -76075,11 +64579,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "if_condition".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2427),
-=======
                         ty: DeclarationId(2428),
->>>>>>> origin/main
                     },
                     Field {
                         label: "continue_on_error".to_string(),
@@ -76087,11 +64587,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "timeout_minutes".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2428),
-=======
                         ty: DeclarationId(2429),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -76106,11 +64602,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10768, 11091),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2430),
-=======
             id: DeclarationId(2431),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76124,11 +64616,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11110, 11114),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2431),
-=======
             id: DeclarationId(2432),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76142,11 +64630,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11117, 11119),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2432),
-=======
             id: DeclarationId(2433),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76160,11 +64644,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11122, 11126),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2433),
-=======
             id: DeclarationId(2434),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76178,11 +64658,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11129, 11135),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2434),
-=======
             id: DeclarationId(2435),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76196,11 +64672,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11138, 11141),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2435),
-=======
             id: DeclarationId(2436),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -76219,11 +64691,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2436),
-=======
             id: DeclarationId(2437),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -76242,11 +64710,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2437),
-=======
             id: DeclarationId(2438),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -76265,11 +64729,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11530, 11534),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2438),
-=======
             id: DeclarationId(2439),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -76279,13 +64739,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "file".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2435),
-                    },
-                    Field {
-                        label: "line".to_string(),
-                        ty: DeclarationId(2436),
-=======
                         ty: DeclarationId(2436),
                     },
                     Field {
@@ -76295,11 +64748,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "col".to_string(),
                         ty: DeclarationId(2438),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "col".to_string(),
-                        ty: DeclarationId(2437),
                     },
                 ],
             },
@@ -76314,11 +64762,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11463, 11536),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2439),
-=======
             id: DeclarationId(2440),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -76337,11 +64781,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11584, 11591),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2440),
-=======
             id: DeclarationId(2441),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -76360,11 +64800,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2441),
-=======
             id: DeclarationId(2442),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -76383,11 +64819,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11610, 11614),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2442),
-=======
             id: DeclarationId(2443),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -76397,13 +64829,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "file".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2439),
-                    },
-                    Field {
-                        label: "line".to_string(),
-                        ty: DeclarationId(2440),
-=======
                         ty: DeclarationId(2440),
                     },
                     Field {
@@ -76413,11 +64838,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "col".to_string(),
                         ty: DeclarationId(2442),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "col".to_string(),
-                        ty: DeclarationId(2441),
                     },
                 ],
             },
@@ -76432,11 +64852,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11541, 11616),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2443),
-=======
             id: DeclarationId(2444),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -76455,11 +64871,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11663, 11670),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2444),
-=======
             id: DeclarationId(2445),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -76478,11 +64890,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11678, 11682),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2445),
-=======
             id: DeclarationId(2446),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -76501,11 +64909,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11689, 11693),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2446),
-=======
             id: DeclarationId(2447),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -76515,13 +64919,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "file".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2443),
-                    },
-                    Field {
-                        label: "line".to_string(),
-                        ty: DeclarationId(2444),
-=======
                         ty: DeclarationId(2444),
                     },
                     Field {
@@ -76531,11 +64928,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     Field {
                         label: "col".to_string(),
                         ty: DeclarationId(2446),
->>>>>>> origin/main
-                    },
-                    Field {
-                        label: "col".to_string(),
-                        ty: DeclarationId(2445),
                     },
                 ],
             },
@@ -76550,11 +64942,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11621, 11695),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2447),
-=======
             id: DeclarationId(2448),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -76573,11 +64961,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11700, 11733),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2448),
-=======
             id: DeclarationId(2449),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76591,11 +64975,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11738, 11756),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2449),
-=======
             id: DeclarationId(2450),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -76620,11 +65000,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11761, 11802),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2450),
-=======
             id: DeclarationId(2451),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -76643,11 +65019,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11807, 11832),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2451),
-=======
             id: DeclarationId(2452),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -76666,11 +65038,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11837, 11867),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2452),
-=======
             id: DeclarationId(2453),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -76689,11 +65057,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12673, 12677),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2453),
-=======
             id: DeclarationId(2454),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -76707,19 +65071,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "retention_days".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2452),
-                    },
-                    Field {
-                        label: "if_no_files_found".to_string(),
-                        ty: DeclarationId(1386),
-=======
                         ty: DeclarationId(2453),
                     },
                     Field {
                         label: "if_no_files_found".to_string(),
                         ty: DeclarationId(1387),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -76734,11 +65090,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12620, 12720),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2454),
-=======
             id: DeclarationId(2455),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -76757,11 +65109,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12756, 12763),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2455),
-=======
             id: DeclarationId(2456),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -76771,11 +65119,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "path".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2454),
-=======
                         ty: DeclarationId(2455),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -76790,11 +65134,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12725, 12765),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2456),
-=======
             id: DeclarationId(2457),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76808,11 +65148,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12795, 12799),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2457),
-=======
             id: DeclarationId(2458),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76826,11 +65162,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12802, 12810),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2458),
-=======
             id: DeclarationId(2459),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76844,11 +65176,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12813, 12819),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2459),
-=======
             id: DeclarationId(2460),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -76868,11 +65196,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13281, 13293),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2460),
-=======
             id: DeclarationId(2461),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -76883,11 +65207,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     TemplateArgument {
                         parameter: DeclarationId(139),
-<<<<<<< HEAD
-                        value: DeclarationId(2459),
-=======
                         value: DeclarationId(2460),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -76902,57 +65222,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13269, 13294),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2461),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(137),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(138),
-                        value: DeclarationId(230),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(139),
-                        value: DeclarationId(230),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/actions.dag", 13311, 13330),
-        });
-        declarations.push(Declaration {
             id: DeclarationId(2462),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(685),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(686),
-                    value: DeclarationId(2461),
-                }],
-            },
-            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("dsl/extdeps/github/actions.dag", 13306, 13331),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2463),
-=======
-            id: DeclarationId(2462),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -76978,13 +65248,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13311, 13330),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2464),
+            id: DeclarationId(2463),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2463),
+                    value: DeclarationId(2462),
                 }],
             },
             type_params: vec![],
@@ -76998,7 +65268,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13306, 13331),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2465),
+            id: DeclarationId(2464),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -77063,11 +65333,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13403, 13407),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2466),
-=======
             id: DeclarationId(2467),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77081,11 +65347,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13563, 13570),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2467),
-=======
             id: DeclarationId(2468),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77099,11 +65361,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13575, 13582),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2468),
-=======
             id: DeclarationId(2469),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77117,11 +65375,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13587, 13596),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2469),
-=======
             id: DeclarationId(2470),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77135,11 +65389,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13601, 13608),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2470),
-=======
             id: DeclarationId(2471),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77153,11 +65403,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13613, 13621),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2471),
-=======
             id: DeclarationId(2472),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77171,11 +65417,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13626, 13640),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2472),
-=======
             id: DeclarationId(2473),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77189,11 +65431,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1935, 1959),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2473),
-=======
             id: DeclarationId(2474),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77207,11 +65445,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1964, 1989),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2474),
-=======
             id: DeclarationId(2475),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(151)],
@@ -77229,11 +65463,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2673, 2714),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2475),
-=======
             id: DeclarationId(2476),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77252,50 +65482,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2476),
-            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("dsl/std/algebra.dag", 17832, 17834),
-        });
-        declarations.push(Declaration {
             id: DeclarationId(2477),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2475),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2476),
-                    },
-                ],
-            },
-            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("dsl/std/algebra.dag", 17832, 17834),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2478),
-=======
-            id: DeclarationId(2477),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77353,11 +65540,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2479),
-            name: None,
-            connective: TypeConnective::Conj { children: vec![] },
-=======
             id: DeclarationId(2480),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
@@ -77386,7 +65568,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                 ],
             },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -77400,32 +65581,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         declarations.push(Declaration {
             id: DeclarationId(2482),
             name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2478),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2479),
-                    },
-                ],
-            },
-            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("dsl/std/algebra.dag", 17851, 17853),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2481),
-            name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
@@ -77443,49 +65598,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2482),
-            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("dsl/std/algebra.dag", 18997, 18999),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2483),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2481),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2482),
-                    },
-                ],
-            },
-            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("dsl/std/algebra.dag", 18997, 18999),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2484),
-=======
             id: DeclarationId(2483),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77543,11 +65656,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2485),
-=======
             id: DeclarationId(2486),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77561,29 +65670,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2486),
-=======
             id: DeclarationId(2487),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2484),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2485),
-=======
                         ty: DeclarationId(2485),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2486),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -77598,11 +65695,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2487),
-=======
             id: DeclarationId(2488),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77621,11 +65714,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2488),
-=======
             id: DeclarationId(2489),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77639,29 +65728,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2489),
-=======
             id: DeclarationId(2490),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2487),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2488),
-=======
                         ty: DeclarationId(2488),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2489),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -77676,11 +65753,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2490),
-=======
             id: DeclarationId(2491),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77699,11 +65772,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2491),
-            name: None,
-            connective: TypeConnective::Conj { children: vec![] },
-=======
             id: DeclarationId(2492),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
@@ -77732,7 +65800,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                 ],
             },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -77746,32 +65813,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         declarations.push(Declaration {
             id: DeclarationId(2494),
             name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2490),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2491),
-                    },
-                ],
-            },
-            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("dsl/std/algebra.dag", 23580, 23590),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2493),
-            name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
@@ -77789,49 +65830,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2494),
-            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("dsl/std/algebra.dag", 23835, 23839),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2495),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2493),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2494),
-                    },
-                ],
-            },
-            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("dsl/std/algebra.dag", 23835, 23839),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2496),
-=======
             id: DeclarationId(2495),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77889,11 +65888,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 3781, 3785),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2497),
-            name: None,
-            connective: TypeConnective::Conj { children: vec![] },
-=======
             id: DeclarationId(2498),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
@@ -77922,7 +65916,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                 ],
             },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -77936,32 +65929,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         declarations.push(Declaration {
             id: DeclarationId(2500),
             name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2496),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2497),
-                    },
-                ],
-            },
-            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("dsl/std/types.dag", 3781, 3785),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2499),
-            name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
@@ -77979,49 +65946,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 4264, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2500),
-            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("dsl/std/types.dag", 4264, 4271),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2501),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2499),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2500),
-                    },
-                ],
-            },
-            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("dsl/std/types.dag", 4264, 4271),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2502),
-=======
             id: DeclarationId(2501),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -78079,11 +66004,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 6172, 6179),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2503),
-=======
             id: DeclarationId(2504),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -78097,29 +66018,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 6172, 6179),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2504),
-=======
             id: DeclarationId(2505),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2502),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2503),
-=======
                         ty: DeclarationId(2503),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2504),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -78134,11 +66043,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 6172, 6179),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2505),
-=======
             id: DeclarationId(2506),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -78157,11 +66062,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16964, 16984),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2506),
-=======
             id: DeclarationId(2507),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -78175,29 +66076,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16964, 16984),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2507),
-=======
             id: DeclarationId(2508),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2505),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2506),
-=======
                         ty: DeclarationId(2506),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2507),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -78212,11 +66101,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16964, 16984),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2508),
-=======
             id: DeclarationId(2509),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -78235,11 +66120,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17620, 17627),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2509),
-=======
             id: DeclarationId(2510),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -78253,29 +66134,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17620, 17627),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2510),
-=======
             id: DeclarationId(2511),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2508),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2509),
-=======
                         ty: DeclarationId(2509),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2510),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -78290,11 +66159,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17620, 17627),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2511),
-=======
             id: DeclarationId(2512),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -78313,11 +66178,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21380, 21390),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2512),
-=======
             id: DeclarationId(2513),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -78331,29 +66192,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21380, 21390),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2513),
-=======
             id: DeclarationId(2514),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2511),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2512),
-=======
                         ty: DeclarationId(2512),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2513),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -78368,11 +66217,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21380, 21390),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2514),
-=======
             id: DeclarationId(2515),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -78391,11 +66236,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21515, 21522),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2515),
-=======
             id: DeclarationId(2516),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -78409,29 +66250,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21515, 21522),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2516),
-=======
             id: DeclarationId(2517),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2514),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2515),
-=======
                         ty: DeclarationId(2515),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2516),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -78446,11 +66275,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21515, 21522),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2517),
-=======
             id: DeclarationId(2518),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -78469,11 +66294,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21589, 21593),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2518),
-            name: None,
-            connective: TypeConnective::Conj { children: vec![] },
-=======
             id: DeclarationId(2519),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
@@ -78502,7 +66322,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                 ],
             },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -78516,32 +66335,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         declarations.push(Declaration {
             id: DeclarationId(2521),
             name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2517),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2518),
-                    },
-                ],
-            },
-            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("dsl/std/types.dag", 21589, 21593),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2520),
-            name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
@@ -78558,59 +66351,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 23360, 23367),
         });
-        declarations.push(Declaration {
-            id: DeclarationId(2521),
-            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("dsl/std/types.dag", 23360, 23367),
-        });
         declarations.push(Declaration {
-            id: DeclarationId(2522),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2520),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2521),
-                    },
-                ],
-            },
-            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("dsl/std/types.dag", 23360, 23367),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2523),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-=======
             id: DeclarationId(2522),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -78619,49 +66363,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/std/types.dag", 23872, 23879),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2524),
-=======
             span: SourceSpan::new("dsl/std/types.dag", 23360, 23367),
         });
         declarations.push(Declaration {
             id: DeclarationId(2523),
->>>>>>> origin/main
-            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("dsl/std/types.dag", 23872, 23879),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2525),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2523),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2524),
-=======
                         ty: DeclarationId(2521),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2522),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -78695,7 +66410,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23872, 23879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2526),
+            id: DeclarationId(2525),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -78753,11 +66468,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23966, 23973),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2527),
-=======
             id: DeclarationId(2528),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -78771,29 +66482,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23966, 23973),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2528),
-=======
             id: DeclarationId(2529),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2526),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2527),
-=======
                         ty: DeclarationId(2527),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2528),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -78808,11 +66507,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23966, 23973),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2529),
-=======
             id: DeclarationId(2530),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -78831,11 +66526,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24196, 24211),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2530),
-=======
             id: DeclarationId(2531),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -78849,29 +66540,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24196, 24211),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2531),
-=======
             id: DeclarationId(2532),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2529),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2530),
-=======
                         ty: DeclarationId(2530),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2531),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -78886,11 +66565,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24196, 24211),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2532),
-=======
             id: DeclarationId(2533),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -78909,11 +66584,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24222, 24235),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2533),
-=======
             id: DeclarationId(2534),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -78927,29 +66598,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24222, 24235),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2534),
-=======
             id: DeclarationId(2535),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2532),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2533),
-=======
                         ty: DeclarationId(2533),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2534),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -78964,11 +66623,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24222, 24235),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2535),
-=======
             id: DeclarationId(2536),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -78987,11 +66642,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24251, 24264),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2536),
-            name: None,
-            connective: TypeConnective::Conj { children: vec![] },
-=======
             id: DeclarationId(2537),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
@@ -79020,7 +66670,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                 ],
             },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -79034,32 +66683,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         declarations.push(Declaration {
             id: DeclarationId(2539),
             name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2535),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2536),
-                    },
-                ],
-            },
-            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("dsl/std/types.dag", 24251, 24264),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2538),
-            name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
@@ -79076,50 +66699,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("dsl/std/types.dag", 24374, 24381),
         });
-        declarations.push(Declaration {
-            id: DeclarationId(2539),
-            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("dsl/std/types.dag", 24374, 24381),
-        });
         declarations.push(Declaration {
             id: DeclarationId(2540),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2538),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2539),
-                    },
-                ],
-            },
-            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("dsl/std/types.dag", 24374, 24381),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2541),
-=======
-            id: DeclarationId(2540),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -79177,11 +66758,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2542),
-=======
             id: DeclarationId(2543),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -79195,39 +66772,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2543),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2541),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2542),
-                    },
-                ],
-            },
-            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/effects.dag", 11753, 11760),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2544),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1440),
-=======
             id: DeclarationId(2544),
             name: None,
             connective: TypeConnective::Disj {
@@ -79317,7 +66861,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![Field {
                     label: "_0".to_string(),
                     ty: DeclarationId(1444),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -79328,14 +66871,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/effects.dag", 21029, 21057),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2545),
-=======
             id: DeclarationId(2549),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -79346,32 +66885,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2546),
-=======
             id: DeclarationId(2550),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2544),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2545),
-=======
                         ty: DeclarationId(2548),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2549),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -79383,69 +66910,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2547),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1443),
-                }],
-            },
-            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/effects.dag", 21209, 21237),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2548),
-            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/effects.dag", 21209, 21237),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239),
         });
         declarations.push(Declaration {
             id: DeclarationId(2551),
             name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2547),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2548),
-                    },
-                ],
-            },
-            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/effects.dag", 21209, 21237),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2550),
-            name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
@@ -79460,9 +66929,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
-=======
             span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706),
         });
         declarations.push(Declaration {
@@ -79478,14 +66944,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             refinement: None,
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706),
->>>>>>> origin/main
         });
         declarations.push(Declaration {
             id: DeclarationId(2553),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj { children: vec![] },
-=======
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
@@ -79498,7 +66960,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                 ],
             },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -79507,37 +66968,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
+            span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706),
         });
         declarations.push(Declaration {
             id: DeclarationId(2554),
             name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2550),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2551),
-                    },
-                ],
-            },
-            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/effects.dag", 29693, 29704),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2553),
-            name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
@@ -79552,52 +66987,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/effects.dag", 30430, 30437),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2554),
-            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/effects.dag", 30430, 30437),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2555),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2553),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2554),
-                    },
-                ],
-            },
-            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/effects.dag", 30430, 30437),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2556),
-=======
             id: DeclarationId(2555),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -79652,14 +67045,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/effects.dag", 30660, 30667),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2557),
-=======
             id: DeclarationId(2558),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -79670,32 +67059,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30660, 30667),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2558),
-=======
             id: DeclarationId(2559),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2556),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2557),
-=======
                         ty: DeclarationId(2557),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2558),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -79707,14 +67084,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/effects.dag", 30660, 30667),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2559),
-=======
             id: DeclarationId(2560),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -79733,11 +67106,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2560),
-            name: None,
-            connective: TypeConnective::Conj { children: vec![] },
-=======
             id: DeclarationId(2561),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
@@ -79766,7 +67134,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                 ],
             },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -79780,32 +67147,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         declarations.push(Declaration {
             id: DeclarationId(2563),
             name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2559),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2560),
-                    },
-                ],
-            },
-            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/substrate.dag", 22288, 22296),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2562),
-            name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
@@ -79823,49 +67164,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2563),
-            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/substrate.dag", 22345, 22354),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2564),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2562),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2563),
-                    },
-                ],
-            },
-            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/substrate.dag", 22345, 22354),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2565),
-=======
             id: DeclarationId(2564),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -79923,11 +67222,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2566),
-            name: None,
-            connective: TypeConnective::Conj { children: vec![] },
-=======
             id: DeclarationId(2567),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
@@ -79956,7 +67250,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                 ],
             },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -79970,32 +67263,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         declarations.push(Declaration {
             id: DeclarationId(2569),
             name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2565),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2566),
-                    },
-                ],
-            },
-            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/substrate.dag", 22420, 22429),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2568),
-            name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
@@ -80013,49 +67280,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2569),
-            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/substrate.dag", 22806, 22818),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2570),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2568),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2569),
-                    },
-                ],
-            },
-            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/substrate.dag", 22806, 22818),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2571),
-=======
             id: DeclarationId(2570),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -80113,11 +67338,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2572),
-=======
             id: DeclarationId(2573),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -80131,29 +67352,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2573),
-=======
             id: DeclarationId(2574),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2571),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2572),
-=======
                         ty: DeclarationId(2572),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2573),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -80168,11 +67377,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2574),
-=======
             id: DeclarationId(2575),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -80191,11 +67396,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2575),
-=======
             id: DeclarationId(2576),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -80209,29 +67410,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2576),
-=======
             id: DeclarationId(2577),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2574),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2575),
-=======
                         ty: DeclarationId(2575),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2576),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -80246,11 +67435,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2577),
-=======
             id: DeclarationId(2578),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -80269,11 +67454,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2578),
-=======
             id: DeclarationId(2579),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -80287,29 +67468,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2579),
-=======
             id: DeclarationId(2580),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2577),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2578),
-=======
                         ty: DeclarationId(2578),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2579),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -80324,11 +67493,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2580),
-=======
             id: DeclarationId(2581),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -80347,11 +67512,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2581),
-            name: None,
-            connective: TypeConnective::Conj { children: vec![] },
-=======
             id: DeclarationId(2582),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
@@ -80380,7 +67540,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                 ],
             },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -80394,32 +67553,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         declarations.push(Declaration {
             id: DeclarationId(2584),
             name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2580),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2581),
-                    },
-                ],
-            },
-            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/substrate.dag", 11800, 11807),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2583),
-            name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
@@ -80436,50 +67569,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
         });
-        declarations.push(Declaration {
-            id: DeclarationId(2584),
-            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/substrate.dag", 11925, 11939),
-        });
         declarations.push(Declaration {
             id: DeclarationId(2585),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2583),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2584),
-                    },
-                ],
-            },
-            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/substrate.dag", 11925, 11939),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2586),
-=======
-            id: DeclarationId(2585),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -80537,11 +67628,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2587),
-=======
             id: DeclarationId(2588),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -80555,29 +67642,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2588),
-=======
             id: DeclarationId(2589),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2586),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2587),
-=======
                         ty: DeclarationId(2587),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2588),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -80592,11 +67667,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2589),
-=======
             id: DeclarationId(2590),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -80615,11 +67686,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2590),
-=======
             id: DeclarationId(2591),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -80633,29 +67700,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2591),
-=======
             id: DeclarationId(2592),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2589),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2590),
-=======
                         ty: DeclarationId(2590),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2591),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -80670,11 +67725,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2592),
-=======
             id: DeclarationId(2593),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -80693,11 +67744,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2593),
-=======
             id: DeclarationId(2594),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -80711,29 +67758,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2594),
-=======
             id: DeclarationId(2595),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2592),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2593),
-=======
                         ty: DeclarationId(2593),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2594),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -80748,11 +67783,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2595),
-=======
             id: DeclarationId(2596),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -80771,11 +67802,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2596),
-=======
             id: DeclarationId(2597),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -80789,29 +67816,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2597),
-=======
             id: DeclarationId(2598),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2595),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2596),
-=======
                         ty: DeclarationId(2596),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2597),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -80826,11 +67841,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2598),
-=======
             id: DeclarationId(2599),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -80849,11 +67860,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2599),
-=======
             id: DeclarationId(2600),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -80867,29 +67874,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2600),
-=======
             id: DeclarationId(2601),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2598),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2599),
-=======
                         ty: DeclarationId(2599),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2600),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -80904,11 +67899,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2601),
-=======
             id: DeclarationId(2602),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -80927,11 +67918,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2602),
-=======
             id: DeclarationId(2603),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -80945,29 +67932,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2603),
-=======
             id: DeclarationId(2604),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2601),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2602),
-=======
                         ty: DeclarationId(2602),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2603),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -80982,11 +67957,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2604),
-=======
             id: DeclarationId(2605),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81005,11 +67976,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2605),
-=======
             id: DeclarationId(2606),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81023,29 +67990,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2606),
-=======
             id: DeclarationId(2607),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2604),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2605),
-=======
                         ty: DeclarationId(2605),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2606),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -81060,11 +68015,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2607),
-=======
             id: DeclarationId(2608),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81083,11 +68034,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2608),
-=======
             id: DeclarationId(2609),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81101,29 +68048,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2609),
-=======
             id: DeclarationId(2610),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2607),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2608),
-=======
                         ty: DeclarationId(2608),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2609),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -81138,11 +68073,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2610),
-=======
             id: DeclarationId(2611),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81161,11 +68092,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2611),
-=======
             id: DeclarationId(2612),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81179,29 +68106,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2612),
-=======
             id: DeclarationId(2613),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2610),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2611),
-=======
                         ty: DeclarationId(2611),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2612),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -81216,11 +68131,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2613),
-=======
             id: DeclarationId(2614),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81239,11 +68150,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2614),
-=======
             id: DeclarationId(2615),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81257,29 +68164,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2615),
-=======
             id: DeclarationId(2616),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2613),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2614),
-=======
                         ty: DeclarationId(2614),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2615),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -81294,11 +68189,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2616),
-=======
             id: DeclarationId(2617),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81317,11 +68208,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2617),
-=======
             id: DeclarationId(2618),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81335,29 +68222,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2618),
-=======
             id: DeclarationId(2619),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2616),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2617),
-=======
                         ty: DeclarationId(2617),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2618),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -81372,11 +68247,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2619),
-=======
             id: DeclarationId(2620),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81395,11 +68266,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2620),
-=======
             id: DeclarationId(2621),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81413,29 +68280,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2621),
-=======
             id: DeclarationId(2622),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2619),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2620),
-=======
                         ty: DeclarationId(2620),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2621),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -81450,11 +68305,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2622),
-=======
             id: DeclarationId(2623),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81473,11 +68324,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 {
-<<<<<<< HEAD
-            id: DeclarationId(2623),
-=======
             id: DeclarationId(2624),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81491,29 +68338,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2624),
-=======
             id: DeclarationId(2625),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2622),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2623),
-=======
                         ty: DeclarationId(2623),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2624),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -81528,11 +68363,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 {
-<<<<<<< HEAD
-            id: DeclarationId(2625),
-=======
             id: DeclarationId(2626),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81551,11 +68382,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2626),
-=======
             id: DeclarationId(2627),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81569,29 +68396,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2627),
-=======
             id: DeclarationId(2628),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2625),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2626),
-=======
                         ty: DeclarationId(2626),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2627),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -81606,11 +68421,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2628),
-=======
             id: DeclarationId(2629),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81629,11 +68440,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2629),
-=======
             id: DeclarationId(2630),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81647,29 +68454,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2630),
-=======
             id: DeclarationId(2631),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2628),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2629),
-=======
                         ty: DeclarationId(2629),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2630),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -81684,11 +68479,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2631),
-=======
             id: DeclarationId(2632),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81707,11 +68498,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2632),
-=======
             id: DeclarationId(2633),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81725,29 +68512,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2633),
-=======
             id: DeclarationId(2634),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2631),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2632),
-=======
                         ty: DeclarationId(2632),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2633),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -81762,11 +68537,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2634),
-=======
             id: DeclarationId(2635),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81785,11 +68556,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2635),
-=======
             id: DeclarationId(2636),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81803,29 +68570,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2636),
-=======
             id: DeclarationId(2637),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2634),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2635),
-=======
                         ty: DeclarationId(2635),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2636),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -81840,11 +68595,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2637),
-=======
             id: DeclarationId(2638),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81863,11 +68614,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2638),
-            name: None,
-            connective: TypeConnective::Conj { children: vec![] },
-=======
             id: DeclarationId(2639),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
@@ -81896,7 +68642,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                 ],
             },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -81910,32 +68655,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         declarations.push(Declaration {
             id: DeclarationId(2641),
             name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2637),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2638),
-                    },
-                ],
-            },
-            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/anthropic_schema.dag", 7074, 7079),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2640),
-            name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
@@ -81952,59 +68671,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
         });
-        declarations.push(Declaration {
-            id: DeclarationId(2641),
-            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/anthropic_schema.dag", 8435, 8442),
-        });
         declarations.push(Declaration {
-            id: DeclarationId(2642),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2640),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2641),
-                    },
-                ],
-            },
-            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/anthropic_schema.dag", 8435, 8442),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2643),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-=======
             id: DeclarationId(2642),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82013,49 +68683,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2644),
-=======
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
         });
         declarations.push(Declaration {
             id: DeclarationId(2643),
->>>>>>> origin/main
-            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/anthropic_schema.dag", 8453, 8460),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2645),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2643),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2644),
-=======
                         ty: DeclarationId(2641),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2642),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -82089,18 +68730,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2646),
+            id: DeclarationId(2645),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-=======
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82109,49 +68741,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2647),
-=======
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
             id: DeclarationId(2646),
->>>>>>> origin/main
-            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/anthropic_schema.dag", 8583, 8590),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2648),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2646),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2647),
-=======
                         ty: DeclarationId(2644),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2645),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -82185,18 +68788,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2649),
+            id: DeclarationId(2648),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-=======
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82205,49 +68799,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2650),
-=======
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
             id: DeclarationId(2649),
->>>>>>> origin/main
-            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/anthropic_schema.dag", 8601, 8608),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2651),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2649),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2650),
-=======
                         ty: DeclarationId(2647),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2648),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -82281,18 +68846,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2652),
+            id: DeclarationId(2651),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-=======
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82301,49 +68857,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2653),
-=======
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
             id: DeclarationId(2652),
->>>>>>> origin/main
-            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/anthropic_schema.dag", 8741, 8748),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2654),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2652),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2653),
-=======
                         ty: DeclarationId(2650),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2651),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -82377,18 +68904,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2655),
+            id: DeclarationId(2654),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-=======
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82397,49 +68915,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2656),
-=======
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
             id: DeclarationId(2655),
->>>>>>> origin/main
-            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/anthropic_schema.dag", 8759, 8766),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2657),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2655),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2656),
-=======
                         ty: DeclarationId(2653),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2654),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -82473,18 +68962,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2658),
+            id: DeclarationId(2657),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-=======
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82493,49 +68973,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2659),
-=======
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
             id: DeclarationId(2658),
->>>>>>> origin/main
-            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/anthropic_schema.dag", 8897, 8904),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2660),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2658),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2659),
-=======
                         ty: DeclarationId(2656),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2657),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -82569,18 +69020,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2661),
+            id: DeclarationId(2660),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-=======
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82589,49 +69031,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2662),
-=======
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
             id: DeclarationId(2661),
->>>>>>> origin/main
-            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/anthropic_schema.dag", 8990, 8997),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2663),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2661),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2662),
-=======
                         ty: DeclarationId(2659),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2660),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -82665,18 +69078,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2664),
+            id: DeclarationId(2663),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1758),
-                }],
-            },
-=======
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82685,49 +69089,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2665),
-=======
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
             id: DeclarationId(2664),
->>>>>>> origin/main
-            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/anthropic_schema.dag", 9695, 9730),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2666),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2664),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2665),
-=======
                         ty: DeclarationId(2662),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2663),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -82761,18 +69136,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2667),
+            id: DeclarationId(2666),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(130),
-                }],
-            },
-=======
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82781,49 +69147,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2668),
-=======
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
             id: DeclarationId(2667),
->>>>>>> origin/main
-            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/anthropic_schema.dag", 9933, 9938),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2669),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2667),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2668),
-=======
                         ty: DeclarationId(2665),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2666),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -82857,18 +69194,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2670),
+            id: DeclarationId(2669),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(130),
-                }],
-            },
-=======
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82877,49 +69205,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2671),
-=======
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
             id: DeclarationId(2670),
->>>>>>> origin/main
-            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/anthropic_schema.dag", 10038, 10043),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2672),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2670),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2671),
-=======
                         ty: DeclarationId(2668),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2669),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -82953,18 +69252,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2673),
+            id: DeclarationId(2672),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(130),
-                }],
-            },
-=======
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -82973,49 +69263,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2674),
-=======
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
             id: DeclarationId(2673),
->>>>>>> origin/main
-            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/anthropic_schema.dag", 10129, 10134),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2675),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2673),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2674),
-=======
                         ty: DeclarationId(2671),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2672),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -83049,18 +69310,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2676),
+            id: DeclarationId(2675),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(93),
-                }],
-            },
-=======
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -83069,49 +69321,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2677),
-=======
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
             id: DeclarationId(2676),
->>>>>>> origin/main
-            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/anthropic_schema.dag", 10756, 10760),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2678),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2676),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2677),
-=======
                         ty: DeclarationId(2674),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2675),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -83145,7 +69368,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2679),
+            id: DeclarationId(2678),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83203,11 +69426,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2680),
-            name: None,
-            connective: TypeConnective::Conj { children: vec![] },
-=======
             id: DeclarationId(2681),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
@@ -83236,7 +69454,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                 ],
             },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -83250,32 +69467,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         declarations.push(Declaration {
             id: DeclarationId(2683),
             name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2679),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2680),
-                    },
-                ],
-            },
-            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/anthropic_schema.dag", 10792, 10796),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2682),
-            name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
@@ -83292,50 +69483,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
-        declarations.push(Declaration {
-            id: DeclarationId(2683),
-            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/anthropic_schema.dag", 10828, 10835),
-        });
         declarations.push(Declaration {
             id: DeclarationId(2684),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2682),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2683),
-                    },
-                ],
-            },
-            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/anthropic_schema.dag", 10828, 10835),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2685),
-=======
-            id: DeclarationId(2684),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83393,11 +69542,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2686),
-=======
             id: DeclarationId(2687),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83411,29 +69556,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2687),
-=======
             id: DeclarationId(2688),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2685),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2686),
-=======
                         ty: DeclarationId(2686),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2687),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -83448,11 +69581,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2688),
-=======
             id: DeclarationId(2689),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -83471,11 +69600,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2689),
-=======
             id: DeclarationId(2690),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83489,29 +69614,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2690),
-=======
             id: DeclarationId(2691),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2688),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2689),
-=======
                         ty: DeclarationId(2689),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2690),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -83526,11 +69639,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2691),
-=======
             id: DeclarationId(2692),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -83549,11 +69658,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2692),
-=======
             id: DeclarationId(2693),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83567,29 +69672,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2693),
-=======
             id: DeclarationId(2694),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2691),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2692),
-=======
                         ty: DeclarationId(2692),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2693),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -83604,11 +69697,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2694),
-=======
             id: DeclarationId(2695),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -83627,11 +69716,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2695),
-=======
             id: DeclarationId(2696),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83645,29 +69730,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2696),
-=======
             id: DeclarationId(2697),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2694),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2695),
-=======
                         ty: DeclarationId(2695),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2696),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -83682,11 +69755,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2697),
-=======
             id: DeclarationId(2698),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -83705,11 +69774,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2698),
-=======
             id: DeclarationId(2699),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83723,29 +69788,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2699),
-=======
             id: DeclarationId(2700),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2697),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2698),
-=======
                         ty: DeclarationId(2698),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2699),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -83760,11 +69813,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2700),
-=======
             id: DeclarationId(2701),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -83783,11 +69832,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2701),
-            name: None,
-            connective: TypeConnective::Conj { children: vec![] },
-=======
             id: DeclarationId(2702),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
@@ -83816,7 +69860,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                 ],
             },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -83830,32 +69873,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         declarations.push(Declaration {
             id: DeclarationId(2704),
             name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2700),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2701),
-                    },
-                ],
-            },
-            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/computation.dag", 6710, 6714),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2703),
-            name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
@@ -83873,49 +69890,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2704),
-            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/computation.dag", 7761, 7780),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2705),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2703),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2704),
-                    },
-                ],
-            },
-            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/computation.dag", 7761, 7780),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2706),
-=======
             id: DeclarationId(2705),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83973,11 +69948,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2707),
-=======
             id: DeclarationId(2708),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83991,29 +69962,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2708),
-=======
             id: DeclarationId(2709),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2706),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2707),
-=======
                         ty: DeclarationId(2707),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2708),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -84028,11 +69987,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2709),
-=======
             id: DeclarationId(2710),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -84051,11 +70006,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2710),
-=======
             id: DeclarationId(2711),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84069,29 +70020,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2711),
-=======
             id: DeclarationId(2712),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2709),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2710),
-=======
                         ty: DeclarationId(2710),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2711),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -84106,11 +70045,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2712),
-=======
             id: DeclarationId(2713),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -84129,11 +70064,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2713),
-=======
             id: DeclarationId(2714),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84147,29 +70078,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2714),
-=======
             id: DeclarationId(2715),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2712),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2713),
-=======
                         ty: DeclarationId(2713),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2714),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -84184,11 +70103,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2715),
-=======
             id: DeclarationId(2716),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -84207,11 +70122,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2716),
-            name: None,
-            connective: TypeConnective::Conj { children: vec![] },
-=======
             id: DeclarationId(2717),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
@@ -84240,7 +70150,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                 ],
             },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -84254,32 +70163,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         declarations.push(Declaration {
             id: DeclarationId(2719),
             name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2715),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2716),
-                    },
-                ],
-            },
-            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/induction.dag", 21943, 21958),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2718),
-            name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
@@ -84296,59 +70179,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
-        declarations.push(Declaration {
-            id: DeclarationId(2719),
-            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/induction.dag", 33612, 33616),
-        });
         declarations.push(Declaration {
-            id: DeclarationId(2720),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2718),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2719),
-                    },
-                ],
-            },
-            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/induction.dag", 33612, 33616),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2721),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(93),
-                }],
-            },
-=======
             id: DeclarationId(2720),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -84357,49 +70191,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2722),
-=======
             span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
             id: DeclarationId(2721),
->>>>>>> origin/main
-            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/induction.dag", 33908, 33912),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2723),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2721),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2722),
-=======
                         ty: DeclarationId(2719),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2720),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -84433,18 +70238,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2724),
+            id: DeclarationId(2723),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(93),
-                }],
-            },
-=======
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -84453,49 +70249,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2725),
-=======
             span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
             id: DeclarationId(2724),
->>>>>>> origin/main
-            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/induction.dag", 35157, 35161),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2726),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2724),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2725),
-=======
                         ty: DeclarationId(2722),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2723),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -84529,18 +70296,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2727),
+            id: DeclarationId(2726),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(93),
-                }],
-            },
-=======
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -84549,49 +70307,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2728),
-=======
             span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
             id: DeclarationId(2727),
->>>>>>> origin/main
-            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/induction.dag", 35632, 35636),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2729),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2727),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2728),
-=======
                         ty: DeclarationId(2725),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2726),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -84625,18 +70354,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2730),
+            id: DeclarationId(2729),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(93),
-                }],
-            },
-=======
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -84645,49 +70365,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2731),
-=======
             span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
             id: DeclarationId(2730),
->>>>>>> origin/main
-            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/induction.dag", 36895, 36899),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2732),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2730),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2731),
-=======
                         ty: DeclarationId(2728),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2729),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -84721,7 +70412,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2733),
+            id: DeclarationId(2732),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84779,11 +70470,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2734),
-            name: None,
-            connective: TypeConnective::Conj { children: vec![] },
-=======
             id: DeclarationId(2735),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
@@ -84812,7 +70498,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                 ],
             },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -84826,32 +70511,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         declarations.push(Declaration {
             id: DeclarationId(2737),
             name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2733),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2734),
-                    },
-                ],
-            },
-            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/induction.dag", 37167, 37171),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2736),
-            name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
@@ -84869,58 +70528,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2737),
-            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/termination.dag", 2429, 2445),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2738),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2736),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2737),
-                    },
-                ],
-            },
-            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/termination.dag", 2429, 2445),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2739),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1197),
-                }],
-            },
-=======
             id: DeclarationId(2738),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -84929,49 +70539,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2740),
-=======
             span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
             id: DeclarationId(2739),
->>>>>>> origin/main
-            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/termination.dag", 2450, 2466),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2741),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2739),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2740),
-=======
                         ty: DeclarationId(2737),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2738),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -85005,7 +70586,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2742),
+            id: DeclarationId(2741),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85063,11 +70644,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2743),
-=======
             id: DeclarationId(2744),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85081,29 +70658,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2744),
-=======
             id: DeclarationId(2745),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2742),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2743),
-=======
                         ty: DeclarationId(2743),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2744),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -85118,11 +70683,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2745),
-=======
             id: DeclarationId(2746),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -85141,11 +70702,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2746),
-=======
             id: DeclarationId(2747),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85159,29 +70716,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2747),
-=======
             id: DeclarationId(2748),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2745),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2746),
-=======
                         ty: DeclarationId(2746),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2747),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -85196,11 +70741,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2748),
-=======
             id: DeclarationId(2749),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -85219,11 +70760,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2749),
-=======
             id: DeclarationId(2750),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85237,29 +70774,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2750),
-=======
             id: DeclarationId(2751),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2748),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2749),
-=======
                         ty: DeclarationId(2749),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2750),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -85274,11 +70799,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2751),
-=======
             id: DeclarationId(2752),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -85297,11 +70818,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2752),
-=======
             id: DeclarationId(2753),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85315,29 +70832,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2753),
-=======
             id: DeclarationId(2754),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2751),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2752),
-=======
                         ty: DeclarationId(2752),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2753),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -85352,11 +70857,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2754),
-=======
             id: DeclarationId(2755),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -85375,11 +70876,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2755),
-            name: None,
-            connective: TypeConnective::Conj { children: vec![] },
-=======
             id: DeclarationId(2756),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
@@ -85408,7 +70904,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                 ],
             },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -85422,32 +70917,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         declarations.push(Declaration {
             id: DeclarationId(2758),
             name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2754),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2755),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/github.dag", 1274, 1284),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2757),
-            name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
@@ -85464,59 +70933,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
-        declarations.push(Declaration {
-            id: DeclarationId(2758),
-            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("dsl/extdeps/github/github.dag", 1554, 1561),
-        });
         declarations.push(Declaration {
-            id: DeclarationId(2759),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2757),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2758),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/github.dag", 1554, 1561),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2760),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1370),
-                }],
-            },
-=======
             id: DeclarationId(2759),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -85525,49 +70945,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2761),
-=======
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
         declarations.push(Declaration {
             id: DeclarationId(2760),
->>>>>>> origin/main
-            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("dsl/extdeps/github/actions.dag", 1558, 1574),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2762),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2760),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2761),
-=======
                         ty: DeclarationId(2758),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2759),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -85601,18 +70992,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2763),
+            id: DeclarationId(2762),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(2351),
-                }],
-            },
-=======
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -85621,49 +71003,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2764),
-=======
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
             id: DeclarationId(2763),
->>>>>>> origin/main
-            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("dsl/extdeps/github/actions.dag", 1690, 1710),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2765),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2763),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2764),
-=======
                         ty: DeclarationId(2761),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2762),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -85697,18 +71050,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2766),
+            id: DeclarationId(2765),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1359),
-                }],
-            },
-=======
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -85717,49 +71061,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2767),
-=======
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
             id: DeclarationId(2766),
->>>>>>> origin/main
-            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("dsl/extdeps/github/actions.dag", 1726, 1746),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2768),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2766),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2767),
-=======
                         ty: DeclarationId(2764),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2765),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -85793,18 +71108,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2769),
+            id: DeclarationId(2768),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-=======
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -85813,49 +71119,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2770),
-=======
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
             id: DeclarationId(2769),
->>>>>>> origin/main
-            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("dsl/extdeps/github/actions.dag", 2505, 2512),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2771),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2769),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2770),
-=======
                         ty: DeclarationId(2767),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2768),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -85889,18 +71166,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2772),
+            id: DeclarationId(2771),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-=======
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -85909,49 +71177,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2773),
-=======
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
         });
         declarations.push(Declaration {
             id: DeclarationId(2772),
->>>>>>> origin/main
-            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("dsl/extdeps/github/actions.dag", 2541, 2548),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2774),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2772),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2773),
-=======
                         ty: DeclarationId(2770),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2771),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -85985,7 +71224,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2775),
+            id: DeclarationId(2774),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86043,40 +71282,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2776),
-            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("dsl/extdeps/github/actions.dag", 5334, 5341),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2777),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2775),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2776),
-                    },
-                ],
-            },
-=======
             id: DeclarationId(2777),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -86090,59 +71298,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         declarations.push(Declaration {
             id: DeclarationId(2778),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(2385),
-                }],
-            },
-            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("dsl/extdeps/github/actions.dag", 5492, 5512),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2779),
-            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("dsl/extdeps/github/actions.dag", 5492, 5512),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2780),
-            name: None,
-=======
->>>>>>> origin/main
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2778),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2779),
-=======
                         ty: DeclarationId(2776),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2777),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -86157,16 +71321,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2781),
-=======
             id: DeclarationId(2779),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2387),
+                    ty: DeclarationId(2386),
                 }],
             },
             type_params: vec![],
@@ -86194,7 +71354,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2782),
+            id: DeclarationId(2781),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
@@ -86252,29 +71412,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2783),
-=======
             id: DeclarationId(2784),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2781),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2782),
-=======
                         ty: DeclarationId(2782),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2783),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -86289,11 +71437,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2784),
-=======
             id: DeclarationId(2785),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -86312,11 +71456,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2785),
-            name: None,
-            connective: TypeConnective::Conj { children: vec![] },
-=======
             id: DeclarationId(2786),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
@@ -86345,7 +71484,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                 ],
             },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -86359,39 +71497,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         declarations.push(Declaration {
             id: DeclarationId(2788),
             name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2784),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2785),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/actions.dag", 5652, 5659),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2787),
-            name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-<<<<<<< HEAD
-                    ty: DeclarationId(1389),
-=======
                     ty: DeclarationId(1390),
->>>>>>> origin/main
                 }],
             },
             type_params: vec![],
@@ -86405,11 +71514,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2788),
-=======
             id: DeclarationId(2789),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86423,29 +71528,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2789),
-=======
             id: DeclarationId(2790),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2787),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2788),
-=======
                         ty: DeclarationId(2788),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2789),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -86460,11 +71553,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2790),
-=======
             id: DeclarationId(2791),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -86483,11 +71572,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2791),
-=======
             id: DeclarationId(2792),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86501,29 +71586,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2792),
-=======
             id: DeclarationId(2793),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2790),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2791),
-=======
                         ty: DeclarationId(2791),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2792),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -86538,9 +71611,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2793),
-=======
             id: DeclarationId(2794),
             name: None,
             connective: TypeConnective::Conj {
@@ -86600,7 +71670,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(2797),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -86616,17 +71685,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2794),
-=======
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
             id: DeclarationId(2798),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86637,35 +71699,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2795),
-=======
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
             id: DeclarationId(2799),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2793),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2794),
-=======
                         ty: DeclarationId(2797),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2798),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -86677,17 +71724,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2796),
-=======
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
             id: DeclarationId(2800),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -86703,88 +71743,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2797),
-            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("dsl/extdeps/github/actions.dag", 8418, 8447),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2798),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2796),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2797),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/actions.dag", 8418, 8447),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2799),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(1368),
-                }],
-            },
-            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("dsl/extdeps/github/actions.dag", 8615, 8636),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2800),
-            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,
-=======
->>>>>>> origin/main
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
         });
         declarations.push(Declaration {
             id: DeclarationId(2801),
             name: None,
-<<<<<<< HEAD
-=======
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -86799,24 +71762,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         declarations.push(Declaration {
             id: DeclarationId(2802),
             name: None,
->>>>>>> origin/main
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2799),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2800),
-=======
                         ty: DeclarationId(2800),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2801),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -86831,11 +71785,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2802),
-=======
             id: DeclarationId(2803),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -86854,11 +71804,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2803),
-            name: None,
-            connective: TypeConnective::Conj { children: vec![] },
-=======
             id: DeclarationId(2804),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
@@ -86887,7 +71832,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                 ],
             },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -86901,32 +71845,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         declarations.push(Declaration {
             id: DeclarationId(2806),
             name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2802),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2803),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/actions.dag", 8834, 8839),
-        });
-        declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2805),
-            name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
@@ -86943,59 +71861,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
         });
-        declarations.push(Declaration {
-            id: DeclarationId(2806),
-            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("dsl/extdeps/github/actions.dag", 10532, 10539),
-        });
         declarations.push(Declaration {
-            id: DeclarationId(2807),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2805),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2806),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/actions.dag", 10532, 10539),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2808),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-=======
             id: DeclarationId(2807),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -87004,49 +71873,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2809),
-=======
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
         });
         declarations.push(Declaration {
             id: DeclarationId(2808),
->>>>>>> origin/main
-            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("dsl/extdeps/github/actions.dag", 10551, 10558),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2810),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2808),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2809),
-=======
                         ty: DeclarationId(2806),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2807),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -87080,18 +71920,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2811),
+            id: DeclarationId(2810),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(2415),
-                }],
-            },
-=======
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -87100,49 +71931,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2812),
-=======
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
         declarations.push(Declaration {
             id: DeclarationId(2811),
->>>>>>> origin/main
-            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("dsl/extdeps/github/actions.dag", 10614, 10634),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2813),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2811),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2812),
-=======
                         ty: DeclarationId(2809),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2810),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -87176,18 +71978,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2814),
+            id: DeclarationId(2813),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-=======
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -87196,49 +71989,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2815),
-=======
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
         });
         declarations.push(Declaration {
             id: DeclarationId(2814),
->>>>>>> origin/main
-            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("dsl/extdeps/github/actions.dag", 10661, 10668),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2816),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2814),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2815),
-=======
                         ty: DeclarationId(2812),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2813),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -87272,7 +72036,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2817),
+            id: DeclarationId(2816),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87330,9 +72094,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2818),
-=======
             id: DeclarationId(2819),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
@@ -87348,39 +72109,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(2820),
->>>>>>> origin/main
-            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("dsl/extdeps/github/actions.dag", 10690, 10697),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2819),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2817),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2818),
-=======
                         ty: DeclarationId(2818),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2819),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -87395,11 +72133,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2820),
-=======
             id: DeclarationId(2821),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87418,9 +72152,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2821),
-=======
             id: DeclarationId(2822),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
@@ -87436,39 +72167,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(2823),
->>>>>>> origin/main
-            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("dsl/extdeps/github/actions.dag", 10753, 10757),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2822),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2820),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2821),
-=======
                         ty: DeclarationId(2821),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2822),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -87483,11 +72191,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2823),
-=======
             id: DeclarationId(2824),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87506,50 +72210,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2824),
-            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("dsl/extdeps/github/actions.dag", 10791, 10798),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2825),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2823),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2824),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/actions.dag", 10791, 10798),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2826),
-=======
             id: DeclarationId(2825),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87607,40 +72268,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2827),
-            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("dsl/extdeps/github/actions.dag", 10810, 10817),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2828),
-            name: None,
-            connective: TypeConnective::Disj {
-                variants: vec![
-                    Field {
-                        label: "Some".to_string(),
-                        ty: DeclarationId(2826),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2827),
-                    },
-                ],
-            },
-=======
             id: DeclarationId(2828),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -87654,59 +72284,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         declarations.push(Declaration {
             id: DeclarationId(2829),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(2423),
-                }],
-            },
-            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("dsl/extdeps/github/actions.dag", 10943, 10963),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2830),
-            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("dsl/extdeps/github/actions.dag", 10943, 10963),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2831),
-            name: None,
-=======
->>>>>>> origin/main
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2829),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2830),
-=======
                         ty: DeclarationId(2827),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2828),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -87721,16 +72307,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2832),
-=======
             id: DeclarationId(2830),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2425),
+                    ty: DeclarationId(2424),
                 }],
             },
             type_params: vec![],
@@ -87744,9 +72326,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2833),
-=======
             id: DeclarationId(2831),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
@@ -87762,39 +72341,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(2832),
->>>>>>> origin/main
-            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("dsl/extdeps/github/actions.dag", 10976, 10996),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2834),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2832),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2833),
-=======
                         ty: DeclarationId(2830),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2831),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -87828,18 +72384,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10996),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2835),
+            id: DeclarationId(2834),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-=======
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -87848,49 +72395,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2836),
-=======
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10996),
         });
         declarations.push(Declaration {
             id: DeclarationId(2835),
->>>>>>> origin/main
-            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("dsl/extdeps/github/actions.dag", 11018, 11025),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2837),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2835),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2836),
-=======
                         ty: DeclarationId(2833),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2834),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -87924,18 +72442,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2838),
+            id: DeclarationId(2837),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(93),
-                }],
-            },
-=======
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -87944,49 +72453,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2839),
-=======
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025),
         });
         declarations.push(Declaration {
             id: DeclarationId(2838),
->>>>>>> origin/main
-            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("dsl/extdeps/github/actions.dag", 11081, 11085),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2840),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2838),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2839),
-=======
                         ty: DeclarationId(2836),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2837),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -88020,18 +72500,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2841),
+            id: DeclarationId(2840),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-=======
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -88040,49 +72511,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2842),
-=======
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085),
         });
         declarations.push(Declaration {
             id: DeclarationId(2841),
->>>>>>> origin/main
-            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("dsl/extdeps/github/actions.dag", 11504, 11511),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2843),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2841),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2842),
-=======
                         ty: DeclarationId(2839),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2840),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -88116,18 +72558,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2844),
+            id: DeclarationId(2843),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(93),
-                }],
-            },
-=======
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -88136,49 +72569,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2845),
-=======
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511),
         });
         declarations.push(Declaration {
             id: DeclarationId(2844),
->>>>>>> origin/main
-            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("dsl/extdeps/github/actions.dag", 11519, 11523),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2846),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2844),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2845),
-=======
                         ty: DeclarationId(2842),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2843),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -88212,18 +72616,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2847),
+            id: DeclarationId(2846),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(93),
-                }],
-            },
-=======
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -88232,49 +72627,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11530, 11534),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2848),
-=======
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523),
         });
         declarations.push(Declaration {
             id: DeclarationId(2847),
->>>>>>> origin/main
-            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("dsl/extdeps/github/actions.dag", 11530, 11534),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2849),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2847),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2848),
-=======
                         ty: DeclarationId(2845),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2846),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -88308,18 +72674,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11530, 11534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2850),
+            id: DeclarationId(2849),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-=======
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -88328,49 +72685,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11584, 11591),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2851),
-=======
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11530, 11534),
         });
         declarations.push(Declaration {
             id: DeclarationId(2850),
->>>>>>> origin/main
-            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("dsl/extdeps/github/actions.dag", 11584, 11591),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2852),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2850),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2851),
-=======
                         ty: DeclarationId(2848),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2849),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -88404,18 +72732,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11584, 11591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2853),
+            id: DeclarationId(2852),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(93),
-                }],
-            },
-=======
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -88424,49 +72743,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2854),
-=======
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11584, 11591),
         });
         declarations.push(Declaration {
             id: DeclarationId(2853),
->>>>>>> origin/main
-            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("dsl/extdeps/github/actions.dag", 11599, 11603),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2855),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2853),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2854),
-=======
                         ty: DeclarationId(2851),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2852),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -88500,18 +72790,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2856),
+            id: DeclarationId(2855),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(93),
-                }],
-            },
-=======
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -88520,49 +72801,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11610, 11614),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2857),
-=======
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603),
         });
         declarations.push(Declaration {
             id: DeclarationId(2856),
->>>>>>> origin/main
-            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("dsl/extdeps/github/actions.dag", 11610, 11614),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2858),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2856),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2857),
-=======
                         ty: DeclarationId(2854),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2855),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -88596,18 +72848,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11610, 11614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2859),
+            id: DeclarationId(2858),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(230),
-                }],
-            },
-=======
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -88616,49 +72859,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11663, 11670),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2860),
-=======
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11610, 11614),
         });
         declarations.push(Declaration {
             id: DeclarationId(2859),
->>>>>>> origin/main
-            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("dsl/extdeps/github/actions.dag", 11663, 11670),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2861),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2859),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2860),
-=======
                         ty: DeclarationId(2857),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2858),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -88692,18 +72906,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11663, 11670),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2862),
+            id: DeclarationId(2861),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(93),
-                }],
-            },
-=======
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -88712,49 +72917,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11678, 11682),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2863),
-=======
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11663, 11670),
         });
         declarations.push(Declaration {
             id: DeclarationId(2862),
->>>>>>> origin/main
-            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("dsl/extdeps/github/actions.dag", 11678, 11682),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2864),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2862),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2863),
-=======
                         ty: DeclarationId(2860),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2861),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -88788,18 +72964,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11678, 11682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2865),
+            id: DeclarationId(2864),
             name: None,
-<<<<<<< HEAD
-            connective: TypeConnective::Conj {
-                children: vec![Field {
-                    label: "_0".to_string(),
-                    ty: DeclarationId(93),
-                }],
-            },
-=======
             connective: TypeConnective::Conj { children: vec![] },
->>>>>>> origin/main
             type_params: vec![],
             phantom_params: Vec::new(),
             meta_tag: None,
@@ -88808,49 +72975,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-<<<<<<< HEAD
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11689, 11693),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2866),
-=======
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11678, 11682),
         });
         declarations.push(Declaration {
             id: DeclarationId(2865),
->>>>>>> origin/main
-            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("dsl/extdeps/github/actions.dag", 11689, 11693),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2867),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2865),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2866),
-=======
                         ty: DeclarationId(2863),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2864),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -88884,7 +73022,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11689, 11693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2868),
+            id: DeclarationId(2867),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88942,11 +73080,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12673, 12677),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2869),
-=======
             id: DeclarationId(2870),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88960,29 +73094,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12673, 12677),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2870),
-=======
             id: DeclarationId(2871),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2868),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2869),
-=======
                         ty: DeclarationId(2869),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2870),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -88997,11 +73119,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12673, 12677),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2871),
-=======
             id: DeclarationId(2872),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89020,11 +73138,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12756, 12763),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2872),
-=======
             id: DeclarationId(2873),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89038,29 +73152,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12756, 12763),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2873),
-=======
             id: DeclarationId(2874),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2871),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2872),
-=======
                         ty: DeclarationId(2872),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2873),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -89075,11 +73177,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12756, 12763),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2874),
-=======
             id: DeclarationId(2875),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89098,11 +73196,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13403, 13407),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2875),
-=======
             id: DeclarationId(2876),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89116,29 +73210,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13403, 13407),
         });
         declarations.push(Declaration {
-<<<<<<< HEAD
-            id: DeclarationId(2876),
-=======
             id: DeclarationId(2877),
->>>>>>> origin/main
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-<<<<<<< HEAD
-                        ty: DeclarationId(2874),
-                    },
-                    Field {
-                        label: "None".to_string(),
-                        ty: DeclarationId(2875),
-=======
                         ty: DeclarationId(2875),
                     },
                     Field {
                         label: "None".to_string(),
                         ty: DeclarationId(2876),
->>>>>>> origin/main
                     },
                 ],
             },
@@ -90675,11 +74757,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(189),
             Port {
                 id: PortId(189),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1626))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(1627))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(184)),
             },
         );
@@ -90703,11 +74781,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(192),
             Port {
                 id: PortId(192),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1627))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(1628))),
->>>>>>> origin/main
                 produced_by: None,
             },
         );
@@ -90715,11 +74789,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(193),
             Port {
                 id: PortId(193),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1628))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(1629))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(186)),
             },
         );
@@ -91007,11 +75077,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(229),
             Port {
                 id: PortId(229),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1629))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(1630))),
->>>>>>> origin/main
                 produced_by: None,
             },
         );
@@ -92563,11 +76629,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(423),
             Port {
                 id: PortId(423),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1630))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(1631))),
->>>>>>> origin/main
                 produced_by: None,
             },
         );
@@ -92591,11 +76653,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(426),
             Port {
                 id: PortId(426),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1627))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(1628))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(363)),
             },
         );
@@ -92611,11 +76669,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(428),
             Port {
                 id: PortId(428),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1631))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(1632))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(365)),
             },
         );
@@ -92623,11 +76677,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(429),
             Port {
                 id: PortId(429),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1632))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(1633))),
->>>>>>> origin/main
                 produced_by: None,
             },
         );
@@ -92731,11 +76781,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(442),
             Port {
                 id: PortId(442),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1633))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(1634))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(378)),
             },
         );
@@ -92743,11 +76789,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(443),
             Port {
                 id: PortId(443),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1634))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(1635))),
->>>>>>> origin/main
                 produced_by: None,
             },
         );
@@ -92795,11 +76837,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(449),
             Port {
                 id: PortId(449),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1635))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(1636))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(385)),
             },
         );
@@ -92807,11 +76845,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(450),
             Port {
                 id: PortId(450),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1636))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(1637))),
->>>>>>> origin/main
                 produced_by: None,
             },
         );
@@ -92891,11 +76925,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(460),
             Port {
                 id: PortId(460),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1637))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(1638))),
->>>>>>> origin/main
                 produced_by: None,
             },
         );
@@ -92999,11 +77029,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(473),
             Port {
                 id: PortId(473),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1638))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(1639))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(407)),
             },
         );
@@ -93283,11 +77309,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(508),
             Port {
                 id: PortId(508),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1639))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(1640))),
->>>>>>> origin/main
                 produced_by: None,
             },
         );
@@ -93399,11 +77421,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(522),
             Port {
                 id: PortId(522),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1640))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(1641))),
->>>>>>> origin/main
                 produced_by: None,
             },
         );
@@ -93515,11 +77533,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(536),
             Port {
                 id: PortId(536),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1641))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(1642))),
->>>>>>> origin/main
                 produced_by: None,
             },
         );
@@ -94135,11 +78149,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(613),
             Port {
                 id: PortId(613),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1642))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(1643))),
->>>>>>> origin/main
                 produced_by: None,
             },
         );
@@ -94251,11 +78261,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(627),
             Port {
                 id: PortId(627),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1643))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(1644))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(516)),
             },
         );
@@ -94263,11 +78269,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(628),
             Port {
                 id: PortId(628),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1644))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(1645))),
->>>>>>> origin/main
                 produced_by: None,
             },
         );
@@ -94323,11 +78325,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(635),
             Port {
                 id: PortId(635),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1645))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(1646))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(523)),
             },
         );
@@ -94335,11 +78333,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(636),
             Port {
                 id: PortId(636),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1646))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(1647))),
->>>>>>> origin/main
                 produced_by: None,
             },
         );
@@ -94355,11 +78349,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(638),
             Port {
                 id: PortId(638),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1647))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(1648))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(526)),
             },
         );
@@ -94623,11 +78613,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(671),
             Port {
                 id: PortId(671),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1980))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(1981))),
->>>>>>> origin/main
                 produced_by: None,
             },
         );
@@ -95059,11 +79045,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(725),
             Port {
                 id: PortId(725),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2052))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2053))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(596)),
             },
         );
@@ -95087,11 +79069,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(728),
             Port {
                 id: PortId(728),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2053))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2054))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(598)),
             },
         );
@@ -95099,11 +79077,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(729),
             Port {
                 id: PortId(729),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2054))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2055))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(600)),
             },
         );
@@ -95111,11 +79085,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(730),
             Port {
                 id: PortId(730),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2055))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2056))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(602)),
             },
         );
@@ -95123,11 +79093,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(731),
             Port {
                 id: PortId(731),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2056))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2057))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(604)),
             },
         );
@@ -95135,11 +79101,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(732),
             Port {
                 id: PortId(732),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2057))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2058))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(606)),
             },
         );
@@ -95147,11 +79109,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(733),
             Port {
                 id: PortId(733),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2058))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2059))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(608)),
             },
         );
@@ -95159,11 +79117,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(734),
             Port {
                 id: PortId(734),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2060))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2061))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(610)),
             },
         );
@@ -95195,11 +79149,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(738),
             Port {
                 id: PortId(738),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2062))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2063))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(614)),
             },
         );
@@ -95223,11 +79173,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(741),
             Port {
                 id: PortId(741),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2063))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2064))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(617)),
             },
         );
@@ -95259,11 +79205,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(745),
             Port {
                 id: PortId(745),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2064))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2065))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(621)),
             },
         );
@@ -95311,11 +79253,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(751),
             Port {
                 id: PortId(751),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2065))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2066))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(626)),
             },
         );
@@ -95387,11 +79325,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(760),
             Port {
                 id: PortId(760),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2066))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2067))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(633)),
             },
         );
@@ -95471,11 +79405,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(770),
             Port {
                 id: PortId(770),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2067))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2068))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(640)),
             },
         );
@@ -95539,11 +79469,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(778),
             Port {
                 id: PortId(778),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2068))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2069))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(645)),
             },
         );
@@ -95559,11 +79485,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(780),
             Port {
                 id: PortId(780),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2069))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2070))),
->>>>>>> origin/main
                 produced_by: None,
             },
         );
@@ -95651,11 +79573,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(791),
             Port {
                 id: PortId(791),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2070))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2071))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(655)),
             },
         );
@@ -95727,11 +79645,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(800),
             Port {
                 id: PortId(800),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2071))),
-=======
                 state: PortState::Resolved(TypeShape::new(DeclarationId(2072))),
->>>>>>> origin/main
                 produced_by: Some(NodeId(663)),
             },
         );
@@ -96155,13 +80069,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(853),
             Port {
                 id: PortId(853),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2128))),
-                produced_by: Some(NodeId(713)),
-=======
                 state: PortState::Uninferred,
                 produced_by: Some(NodeId(709)),
->>>>>>> origin/main
             },
         );
         ports.insert(
@@ -96368,13 +80277,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(879),
             Port {
                 id: PortId(879),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1616))),
-                produced_by: Some(NodeId(733)),
-=======
                 state: PortState::Uninferred,
                 produced_by: Some(NodeId(730)),
->>>>>>> origin/main
             },
         );
         ports.insert(
@@ -96941,13 +80845,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(950),
             Port {
                 id: PortId(950),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2129))),
-                produced_by: Some(NodeId(792)),
-=======
                 state: PortState::Uninferred,
                 produced_by: Some(NodeId(788)),
->>>>>>> origin/main
             },
         );
         ports.insert(
@@ -97138,13 +81037,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(974),
             Port {
                 id: PortId(974),
-<<<<<<< HEAD
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2305))),
-                produced_by: Some(NodeId(812)),
-=======
                 state: PortState::Uninferred,
                 produced_by: None,
->>>>>>> origin/main
             },
         );
         ports.insert(
@@ -97579,142 +81473,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_optional_match_disjs(
 ) -> HashMap<DeclarationId, DeclarationId> {
     {
         let mut map = HashMap::new();
-<<<<<<< HEAD
-        map.insert(DeclarationId(389), DeclarationId(2477));
-        map.insert(DeclarationId(391), DeclarationId(2480));
-        map.insert(DeclarationId(423), DeclarationId(2483));
-        map.insert(DeclarationId(426), DeclarationId(2486));
-        map.insert(DeclarationId(471), DeclarationId(2489));
-        map.insert(DeclarationId(472), DeclarationId(2492));
-        map.insert(DeclarationId(473), DeclarationId(2495));
-        map.insert(DeclarationId(513), DeclarationId(2498));
-        map.insert(DeclarationId(515), DeclarationId(2501));
-        map.insert(DeclarationId(516), DeclarationId(2504));
-        map.insert(DeclarationId(539), DeclarationId(2507));
-        map.insert(DeclarationId(582), DeclarationId(2510));
-        map.insert(DeclarationId(602), DeclarationId(2513));
-        map.insert(DeclarationId(603), DeclarationId(2516));
-        map.insert(DeclarationId(605), DeclarationId(2519));
-        map.insert(DeclarationId(608), DeclarationId(2522));
-        map.insert(DeclarationId(613), DeclarationId(2525));
-        map.insert(DeclarationId(614), DeclarationId(2528));
-        map.insert(DeclarationId(618), DeclarationId(2531));
-        map.insert(DeclarationId(619), DeclarationId(2534));
-        map.insert(DeclarationId(620), DeclarationId(2537));
-        map.insert(DeclarationId(625), DeclarationId(2540));
-        map.insert(DeclarationId(1437), DeclarationId(2543));
-        map.insert(DeclarationId(1441), DeclarationId(2546));
-        map.insert(DeclarationId(1444), DeclarationId(2549));
-        map.insert(DeclarationId(1446), DeclarationId(2552));
-        map.insert(DeclarationId(1447), DeclarationId(2555));
-        map.insert(DeclarationId(1448), DeclarationId(2558));
-        map.insert(DeclarationId(1502), DeclarationId(2561));
-        map.insert(DeclarationId(1503), DeclarationId(2564));
-        map.insert(DeclarationId(1504), DeclarationId(2567));
-        map.insert(DeclarationId(1505), DeclarationId(2570));
-        map.insert(DeclarationId(1506), DeclarationId(2573));
-        map.insert(DeclarationId(1507), DeclarationId(2576));
-        map.insert(DeclarationId(1513), DeclarationId(2579));
-        map.insert(DeclarationId(1568), DeclarationId(2582));
-        map.insert(DeclarationId(1571), DeclarationId(2585));
-        map.insert(DeclarationId(1572), DeclarationId(2588));
-        map.insert(DeclarationId(1573), DeclarationId(2591));
-        map.insert(DeclarationId(1574), DeclarationId(2594));
-        map.insert(DeclarationId(1597), DeclarationId(2597));
-        map.insert(DeclarationId(1602), DeclarationId(2600));
-        map.insert(DeclarationId(1606), DeclarationId(2603));
-        map.insert(DeclarationId(1609), DeclarationId(2606));
-        map.insert(DeclarationId(1610), DeclarationId(2609));
-        map.insert(DeclarationId(1655), DeclarationId(2612));
-        map.insert(DeclarationId(1656), DeclarationId(2615));
-        map.insert(DeclarationId(1657), DeclarationId(2618));
-        map.insert(DeclarationId(1658), DeclarationId(2621));
-        map.insert(DeclarationId(1708), DeclarationId(2624));
-        map.insert(DeclarationId(1709), DeclarationId(2627));
-        map.insert(DeclarationId(1728), DeclarationId(2630));
-        map.insert(DeclarationId(1729), DeclarationId(2633));
-        map.insert(DeclarationId(1733), DeclarationId(2636));
-        map.insert(DeclarationId(1734), DeclarationId(2639));
-        map.insert(DeclarationId(1745), DeclarationId(2642));
-        map.insert(DeclarationId(1746), DeclarationId(2645));
-        map.insert(DeclarationId(1748), DeclarationId(2648));
-        map.insert(DeclarationId(1749), DeclarationId(2651));
-        map.insert(DeclarationId(1751), DeclarationId(2654));
-        map.insert(DeclarationId(1752), DeclarationId(2657));
-        map.insert(DeclarationId(1754), DeclarationId(2660));
-        map.insert(DeclarationId(1756), DeclarationId(2663));
-        map.insert(DeclarationId(1759), DeclarationId(2666));
-        map.insert(DeclarationId(1763), DeclarationId(2669));
-        map.insert(DeclarationId(1765), DeclarationId(2672));
-        map.insert(DeclarationId(1767), DeclarationId(2675));
-        map.insert(DeclarationId(1777), DeclarationId(2678));
-        map.insert(DeclarationId(1778), DeclarationId(2681));
-        map.insert(DeclarationId(1779), DeclarationId(2684));
-        map.insert(DeclarationId(1782), DeclarationId(2687));
-        map.insert(DeclarationId(1783), DeclarationId(2690));
-        map.insert(DeclarationId(1818), DeclarationId(2693));
-        map.insert(DeclarationId(1819), DeclarationId(2696));
-        map.insert(DeclarationId(1820), DeclarationId(2699));
-        map.insert(DeclarationId(1821), DeclarationId(2702));
-        map.insert(DeclarationId(1822), DeclarationId(2705));
-        map.insert(DeclarationId(1823), DeclarationId(2708));
-        map.insert(DeclarationId(1846), DeclarationId(2711));
-        map.insert(DeclarationId(1976), DeclarationId(2714));
-        map.insert(DeclarationId(1977), DeclarationId(2717));
-        map.insert(DeclarationId(1983), DeclarationId(2720));
-        map.insert(DeclarationId(1984), DeclarationId(2723));
-        map.insert(DeclarationId(1985), DeclarationId(2726));
-        map.insert(DeclarationId(1986), DeclarationId(2729));
-        map.insert(DeclarationId(1987), DeclarationId(2732));
-        map.insert(DeclarationId(1988), DeclarationId(2735));
-        map.insert(DeclarationId(2093), DeclarationId(2738));
-        map.insert(DeclarationId(2094), DeclarationId(2741));
-        map.insert(DeclarationId(2095), DeclarationId(2744));
-        map.insert(DeclarationId(2098), DeclarationId(2747));
-        map.insert(DeclarationId(2099), DeclarationId(2750));
-        map.insert(DeclarationId(2309), DeclarationId(2753));
-        map.insert(DeclarationId(2338), DeclarationId(2756));
-        map.insert(DeclarationId(2344), DeclarationId(2759));
-        map.insert(DeclarationId(2349), DeclarationId(2762));
-        map.insert(DeclarationId(2352), DeclarationId(2765));
-        map.insert(DeclarationId(2353), DeclarationId(2768));
-        map.insert(DeclarationId(2373), DeclarationId(2771));
-        map.insert(DeclarationId(2374), DeclarationId(2774));
-        map.insert(DeclarationId(2382), DeclarationId(2777));
-        map.insert(DeclarationId(2386), DeclarationId(2780));
-        map.insert(DeclarationId(2388), DeclarationId(2783));
-        map.insert(DeclarationId(2389), DeclarationId(2786));
-        map.insert(DeclarationId(2390), DeclarationId(2789));
-        map.insert(DeclarationId(2391), DeclarationId(2792));
-        map.insert(DeclarationId(2392), DeclarationId(2795));
-        map.insert(DeclarationId(2398), DeclarationId(2798));
-        map.insert(DeclarationId(2400), DeclarationId(2801));
-        map.insert(DeclarationId(2401), DeclarationId(2804));
-        map.insert(DeclarationId(2413), DeclarationId(2807));
-        map.insert(DeclarationId(2414), DeclarationId(2810));
-        map.insert(DeclarationId(2416), DeclarationId(2813));
-        map.insert(DeclarationId(2417), DeclarationId(2816));
-        map.insert(DeclarationId(2418), DeclarationId(2819));
-        map.insert(DeclarationId(2419), DeclarationId(2822));
-        map.insert(DeclarationId(2421), DeclarationId(2825));
-        map.insert(DeclarationId(2422), DeclarationId(2828));
-        map.insert(DeclarationId(2424), DeclarationId(2831));
-        map.insert(DeclarationId(2426), DeclarationId(2834));
-        map.insert(DeclarationId(2427), DeclarationId(2837));
-        map.insert(DeclarationId(2428), DeclarationId(2840));
-        map.insert(DeclarationId(2435), DeclarationId(2843));
-        map.insert(DeclarationId(2436), DeclarationId(2846));
-        map.insert(DeclarationId(2437), DeclarationId(2849));
-        map.insert(DeclarationId(2439), DeclarationId(2852));
-        map.insert(DeclarationId(2440), DeclarationId(2855));
-        map.insert(DeclarationId(2441), DeclarationId(2858));
-        map.insert(DeclarationId(2443), DeclarationId(2861));
-        map.insert(DeclarationId(2444), DeclarationId(2864));
-        map.insert(DeclarationId(2445), DeclarationId(2867));
-        map.insert(DeclarationId(2452), DeclarationId(2870));
-        map.insert(DeclarationId(2454), DeclarationId(2873));
-        map.insert(DeclarationId(2465), DeclarationId(2876));
-=======
         map.insert(DeclarationId(389), DeclarationId(2478));
         map.insert(DeclarationId(391), DeclarationId(2481));
         map.insert(DeclarationId(423), DeclarationId(2484));
@@ -97849,7 +81607,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_optional_match_disjs(
         map.insert(DeclarationId(2453), DeclarationId(2871));
         map.insert(DeclarationId(2455), DeclarationId(2874));
         map.insert(DeclarationId(2466), DeclarationId(2877));
->>>>>>> origin/main
         map
     }
 }

From ace164597ad03fab9d49cb0cfd2a62f42a0ac7c8 Mon Sep 17 00:00:00 2001
From: Brian Searls <briansrls@gmail.com>
Date: Wed, 13 May 2026 00:23:20 -0400
Subject: [PATCH 17/17] =?UTF-8?q?WIP:=20T-Cluster-F-=CE=B1=20S1=20#81=20pa?=
 =?UTF-8?q?rallelism=20walker=20port=20(src/v3/compiler/src/workfl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/v3/compiler/src/bootstrap_generated.rs    | 9406 +++++++++--------
 ...otstrap_generated_without_parse_surface.rs | 7946 +++++++-------
 2 files changed, 8712 insertions(+), 8640 deletions(-)

diff --git a/src/v3/compiler/src/bootstrap_generated.rs b/src/v3/compiler/src/bootstrap_generated.rs
index 6293dd08bee..e875f7ead36 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: 856,
-        next_declaration_id: 3352,
+        next_declaration_id: 3353,
         next_port_id: 1027,
         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: 3352,
+        declaration_append_begin_after_bootstrap: 3353,
     }
 }
 
@@ -1402,21 +1402,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(182),
-            target: TransformTarget::Callable(DeclarationId(2066)),
+            target: TransformTarget::Callable(DeclarationId(2067)),
             inputs: vec![PortId(185)],
             output: PortId(187),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11495, 11507),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(183),
-            target: TransformTarget::Callable(DeclarationId(2068)),
+            target: TransformTarget::Callable(DeclarationId(2069)),
             inputs: vec![PortId(187)],
             output: PortId(188),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11488, 11535),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(184),
-            target: TransformTarget::Callable(DeclarationId(2012)),
+            target: TransformTarget::Callable(DeclarationId(2013)),
             inputs: vec![PortId(185), PortId(186), PortId(188)],
             output: PortId(189),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11149, 11539),
@@ -1432,7 +1432,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(186),
-            target: TransformTarget::Callable(DeclarationId(2014)),
+            target: TransformTarget::Callable(DeclarationId(2015)),
             inputs: vec![PortId(190), PortId(191), PortId(192)],
             output: PortId(193),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11670, 11726),
@@ -1448,7 +1448,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(188),
-            target: TransformTarget::Callable(DeclarationId(2069)),
+            target: TransformTarget::Callable(DeclarationId(2070)),
             inputs: vec![PortId(194)],
             output: PortId(195),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11795, 11810),
@@ -1600,7 +1600,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(202),
-            target: TransformTarget::Callable(DeclarationId(2053)),
+            target: TransformTarget::Callable(DeclarationId(2054)),
             inputs: vec![PortId(211)],
             output: PortId(212),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12325, 12349),
@@ -1630,7 +1630,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(206),
-            target: TransformTarget::Callable(DeclarationId(2051)),
+            target: TransformTarget::Callable(DeclarationId(2052)),
             inputs: vec![PortId(216)],
             output: PortId(217),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12618, 12653),
@@ -1760,14 +1760,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(218),
-            target: TransformTarget::Callable(DeclarationId(2047)),
+            target: TransformTarget::Callable(DeclarationId(2048)),
             inputs: vec![PortId(230)],
             output: PortId(231),
             span: SourceSpan::new("src/v3/std/algebra.dag", 14214, 14229),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(219),
-            target: TransformTarget::Callable(DeclarationId(2071)),
+            target: TransformTarget::Callable(DeclarationId(2072)),
             inputs: vec![PortId(229), PortId(231)],
             output: PortId(232),
             span: SourceSpan::new("src/v3/std/algebra.dag", 14202, 14245),
@@ -2472,7 +2472,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(266),
-            target: TransformTarget::Callable(DeclarationId(2073)),
+            target: TransformTarget::Callable(DeclarationId(2074)),
             inputs: vec![PortId(312), PortId(313)],
             output: PortId(314),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16911, 17021),
@@ -2500,7 +2500,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(270),
-            target: TransformTarget::Callable(DeclarationId(2075)),
+            target: TransformTarget::Callable(DeclarationId(2076)),
             inputs: vec![PortId(317), PortId(318)],
             output: PortId(319),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17076, 17186),
@@ -3993,14 +3993,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(364),
-            target: TransformTarget::Callable(DeclarationId(2076)),
+            target: TransformTarget::Callable(DeclarationId(2077)),
             inputs: vec![PortId(425), PortId(426)],
             output: PortId(427),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22293, 22323),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(365),
-            target: TransformTarget::Callable(DeclarationId(2077)),
+            target: TransformTarget::Callable(DeclarationId(2078)),
             inputs: vec![PortId(424), PortId(427)],
             output: PortId(428),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22275, 22324),
@@ -4016,7 +4016,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(367),
-            target: TransformTarget::Callable(DeclarationId(2078)),
+            target: TransformTarget::Callable(DeclarationId(2079)),
             inputs: vec![],
             output: PortId(430),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22603, 22610),
@@ -4080,7 +4080,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(375),
-            target: TransformTarget::Callable(DeclarationId(2079)),
+            target: TransformTarget::Callable(DeclarationId(2080)),
             inputs: vec![PortId(436), PortId(438)],
             output: PortId(439),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22737, 22789),
@@ -4176,21 +4176,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(382),
-            target: TransformTarget::Callable(DeclarationId(2047)),
+            target: TransformTarget::Callable(DeclarationId(2048)),
             inputs: vec![PortId(445)],
             output: PortId(446),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23123, 23138),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(383),
-            target: TransformTarget::Callable(DeclarationId(2080)),
+            target: TransformTarget::Callable(DeclarationId(2081)),
             inputs: vec![],
             output: PortId(447),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23140, 23147),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(384),
-            target: TransformTarget::Callable(DeclarationId(2081)),
+            target: TransformTarget::Callable(DeclarationId(2082)),
             inputs: vec![PortId(446), PortId(447)],
             output: PortId(448),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23118, 23148),
@@ -4327,7 +4327,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(396),
-            target: TransformTarget::Callable(DeclarationId(2082)),
+            target: TransformTarget::Callable(DeclarationId(2083)),
             inputs: vec![],
             output: PortId(461),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23597, 23604),
@@ -4391,7 +4391,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(404),
-            target: TransformTarget::Callable(DeclarationId(2083)),
+            target: TransformTarget::Callable(DeclarationId(2084)),
             inputs: vec![PortId(467), PortId(469)],
             output: PortId(470),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23735, 23792),
@@ -4796,7 +4796,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(430),
-            target: TransformTarget::Callable(DeclarationId(2047)),
+            target: TransformTarget::Callable(DeclarationId(2048)),
             inputs: vec![PortId(509)],
             output: PortId(510),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25180, 25195),
@@ -4839,7 +4839,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(435),
-            target: TransformTarget::Callable(DeclarationId(2084)),
+            target: TransformTarget::Callable(DeclarationId(2085)),
             inputs: vec![PortId(515), PortId(516)],
             output: PortId(517),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25317, 25349),
@@ -4936,7 +4936,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(442),
-            target: TransformTarget::Callable(DeclarationId(2047)),
+            target: TransformTarget::Callable(DeclarationId(2048)),
             inputs: vec![PortId(523)],
             output: PortId(524),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25451, 25466),
@@ -4995,7 +4995,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(449),
-            target: TransformTarget::Callable(DeclarationId(2053)),
+            target: TransformTarget::Callable(DeclarationId(2054)),
             inputs: vec![PortId(532)],
             output: PortId(533),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25569, 25628),
@@ -5078,7 +5078,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(454),
-            target: TransformTarget::Callable(DeclarationId(2047)),
+            target: TransformTarget::Callable(DeclarationId(2048)),
             inputs: vec![PortId(537)],
             output: PortId(538),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25917, 25932),
@@ -5171,7 +5171,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(465),
-            target: TransformTarget::Callable(DeclarationId(2051)),
+            target: TransformTarget::Callable(DeclarationId(2052)),
             inputs: vec![PortId(551)],
             output: PortId(552),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26159, 26222),
@@ -5643,7 +5643,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(494),
-            target: TransformTarget::Callable(DeclarationId(2051)),
+            target: TransformTarget::Callable(DeclarationId(2052)),
             inputs: vec![PortId(601)],
             output: PortId(602),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27605, 27633),
@@ -5734,7 +5734,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(505),
-            target: TransformTarget::Callable(DeclarationId(2085)),
+            target: TransformTarget::Callable(DeclarationId(2086)),
             inputs: vec![],
             output: PortId(615),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27988, 27995),
@@ -5798,7 +5798,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(513),
-            target: TransformTarget::Callable(DeclarationId(2086)),
+            target: TransformTarget::Callable(DeclarationId(2087)),
             inputs: vec![PortId(621), PortId(623)],
             output: PortId(624),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28136, 28201),
@@ -5887,7 +5887,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(519),
-            target: TransformTarget::Callable(DeclarationId(2088)),
+            target: TransformTarget::Callable(DeclarationId(2089)),
             inputs: vec![PortId(628), PortId(630)],
             output: PortId(631),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28319, 28377),
@@ -5908,7 +5908,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(522),
-            target: TransformTarget::Callable(DeclarationId(2089)),
+            target: TransformTarget::Callable(DeclarationId(2090)),
             inputs: vec![PortId(629), PortId(633)],
             output: PortId(634),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28403, 28449),
@@ -5951,14 +5951,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(525),
-            target: TransformTarget::Callable(DeclarationId(2090)),
+            target: TransformTarget::Callable(DeclarationId(2091)),
             inputs: vec![],
             output: PortId(637),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28720, 28727),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(526),
-            target: TransformTarget::Callable(DeclarationId(2092)),
+            target: TransformTarget::Callable(DeclarationId(2093)),
             inputs: vec![PortId(636), PortId(637)],
             output: PortId(638),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28708, 28749),
@@ -5981,7 +5981,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(529),
-            target: TransformTarget::Callable(DeclarationId(2047)),
+            target: TransformTarget::Callable(DeclarationId(2048)),
             inputs: vec![PortId(640)],
             output: PortId(641),
             span: SourceSpan::new("src/v3/std/induction.dag", 29099, 29114),
@@ -6054,7 +6054,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(538),
-            target: TransformTarget::Callable(DeclarationId(2055)),
+            target: TransformTarget::Callable(DeclarationId(2056)),
             inputs: vec![PortId(653)],
             output: PortId(654),
             span: SourceSpan::new("src/v3/std/induction.dag", 29338, 29412),
@@ -6068,7 +6068,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(540),
-            target: TransformTarget::Callable(DeclarationId(2055)),
+            target: TransformTarget::Callable(DeclarationId(2056)),
             inputs: vec![PortId(655)],
             output: PortId(656),
             span: SourceSpan::new("src/v3/std/induction.dag", 29433, 29461),
@@ -6082,7 +6082,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(542),
-            target: TransformTarget::Callable(DeclarationId(2055)),
+            target: TransformTarget::Callable(DeclarationId(2056)),
             inputs: vec![PortId(657)],
             output: PortId(658),
             span: SourceSpan::new("src/v3/std/induction.dag", 29480, 29513),
@@ -6209,7 +6209,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(548),
-            target: TransformTarget::Callable(DeclarationId(2055)),
+            target: TransformTarget::Callable(DeclarationId(2056)),
             inputs: vec![PortId(664)],
             output: PortId(665),
             span: SourceSpan::new("src/v3/std/induction.dag", 29645, 29726),
@@ -6234,7 +6234,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(551),
-            target: TransformTarget::Callable(DeclarationId(2055)),
+            target: TransformTarget::Callable(DeclarationId(2056)),
             inputs: vec![PortId(668)],
             output: PortId(669),
             span: SourceSpan::new("src/v3/std/induction.dag", 29761, 29835),
@@ -6320,7 +6320,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(559),
-            target: TransformTarget::Callable(DeclarationId(2532)),
+            target: TransformTarget::Callable(DeclarationId(2533)),
             inputs: vec![PortId(678)],
             output: PortId(679),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3203, 3241),
@@ -6343,7 +6343,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(562),
-            target: TransformTarget::Callable(DeclarationId(2533)),
+            target: TransformTarget::Callable(DeclarationId(2534)),
             inputs: vec![PortId(682)],
             output: PortId(683),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3281, 3319),
@@ -6409,7 +6409,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(567),
-            target: TransformTarget::Callable(DeclarationId(2534)),
+            target: TransformTarget::Callable(DeclarationId(2535)),
             inputs: vec![PortId(688)],
             output: PortId(689),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3440, 3478),
@@ -6432,7 +6432,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(570),
-            target: TransformTarget::Callable(DeclarationId(2535)),
+            target: TransformTarget::Callable(DeclarationId(2536)),
             inputs: vec![PortId(692)],
             output: PortId(693),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3518, 3556),
@@ -6498,7 +6498,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(575),
-            target: TransformTarget::Callable(DeclarationId(2536)),
+            target: TransformTarget::Callable(DeclarationId(2537)),
             inputs: vec![PortId(698)],
             output: PortId(699),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3674, 3712),
@@ -6521,7 +6521,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(578),
-            target: TransformTarget::Callable(DeclarationId(2537)),
+            target: TransformTarget::Callable(DeclarationId(2538)),
             inputs: vec![PortId(702)],
             output: PortId(703),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3752, 3790),
@@ -6587,7 +6587,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(583),
-            target: TransformTarget::Callable(DeclarationId(2538)),
+            target: TransformTarget::Callable(DeclarationId(2539)),
             inputs: vec![PortId(708)],
             output: PortId(709),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3906, 3944),
@@ -6610,7 +6610,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(586),
-            target: TransformTarget::Callable(DeclarationId(2539)),
+            target: TransformTarget::Callable(DeclarationId(2540)),
             inputs: vec![PortId(712)],
             output: PortId(713),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3984, 4022),
@@ -6676,7 +6676,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(591),
-            target: TransformTarget::Callable(DeclarationId(2540)),
+            target: TransformTarget::Callable(DeclarationId(2541)),
             inputs: vec![PortId(718)],
             output: PortId(719),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4138, 4176),
@@ -6699,7 +6699,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(594),
-            target: TransformTarget::Callable(DeclarationId(2541)),
+            target: TransformTarget::Callable(DeclarationId(2542)),
             inputs: vec![PortId(722)],
             output: PortId(723),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4216, 4254),
@@ -6858,7 +6858,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(600),
-            target: TransformTarget::Callable(DeclarationId(2542)),
+            target: TransformTarget::Callable(DeclarationId(2543)),
             inputs: vec![],
             output: PortId(729),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4940, 4945),
@@ -6874,7 +6874,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(602),
-            target: TransformTarget::Callable(DeclarationId(2543)),
+            target: TransformTarget::Callable(DeclarationId(2544)),
             inputs: vec![],
             output: PortId(730),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5005, 5010),
@@ -6890,7 +6890,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(604),
-            target: TransformTarget::Callable(DeclarationId(2544)),
+            target: TransformTarget::Callable(DeclarationId(2545)),
             inputs: vec![],
             output: PortId(731),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5068, 5073),
@@ -6906,7 +6906,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(606),
-            target: TransformTarget::Callable(DeclarationId(2545)),
+            target: TransformTarget::Callable(DeclarationId(2546)),
             inputs: vec![],
             output: PortId(732),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5131, 5136),
@@ -6922,7 +6922,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(608),
-            target: TransformTarget::Callable(DeclarationId(2546)),
+            target: TransformTarget::Callable(DeclarationId(2547)),
             inputs: vec![],
             output: PortId(733),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5195, 5200),
@@ -6938,7 +6938,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(610),
-            target: TransformTarget::Callable(DeclarationId(2547)),
+            target: TransformTarget::Callable(DeclarationId(2548)),
             inputs: vec![],
             output: PortId(734),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5275, 5280),
@@ -6954,7 +6954,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(612),
-            target: TransformTarget::Callable(DeclarationId(2549)),
+            target: TransformTarget::Callable(DeclarationId(2550)),
             inputs: vec![PortId(735)],
             output: PortId(736),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5391, 5402),
@@ -6968,7 +6968,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(614),
-            target: TransformTarget::Callable(DeclarationId(2548)),
+            target: TransformTarget::Callable(DeclarationId(2549)),
             inputs: vec![PortId(736), PortId(737)],
             output: PortId(738),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5378, 5443),
@@ -6991,7 +6991,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(617),
-            target: TransformTarget::Callable(DeclarationId(2550)),
+            target: TransformTarget::Callable(DeclarationId(2551)),
             inputs: vec![PortId(739), PortId(740)],
             output: PortId(741),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5519, 5577),
@@ -7021,7 +7021,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(621),
-            target: TransformTarget::Callable(DeclarationId(2551)),
+            target: TransformTarget::Callable(DeclarationId(2552)),
             inputs: vec![PortId(743), PortId(742), PortId(744)],
             output: PortId(745),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5678, 5803),
@@ -7058,7 +7058,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(626),
-            target: TransformTarget::Callable(DeclarationId(2552)),
+            target: TransformTarget::Callable(DeclarationId(2553)),
             inputs: vec![PortId(748), PortId(749), PortId(750)],
             output: PortId(751),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5924, 6086),
@@ -7556,7 +7556,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(669),
-            target: TransformTarget::Callable(DeclarationId(2591)),
+            target: TransformTarget::Callable(DeclarationId(2592)),
             inputs: vec![],
             output: PortId(808),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8272, 8282),
@@ -7572,28 +7572,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(671),
-            target: TransformTarget::Callable(DeclarationId(2591)),
+            target: TransformTarget::Callable(DeclarationId(2592)),
             inputs: vec![],
             output: PortId(812),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8590, 8600),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(672),
-            target: TransformTarget::Callable(DeclarationId(2591)),
+            target: TransformTarget::Callable(DeclarationId(2592)),
             inputs: vec![],
             output: PortId(813),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8652, 8662),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(673),
-            target: TransformTarget::Callable(DeclarationId(2593)),
+            target: TransformTarget::Callable(DeclarationId(2594)),
             inputs: vec![],
             output: PortId(814),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8680, 8685),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(674),
-            target: TransformTarget::Callable(DeclarationId(2593)),
+            target: TransformTarget::Callable(DeclarationId(2594)),
             inputs: vec![],
             output: PortId(815),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8707, 8712),
@@ -7609,7 +7609,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(676),
-            target: TransformTarget::Callable(DeclarationId(2593)),
+            target: TransformTarget::Callable(DeclarationId(2594)),
             inputs: vec![],
             output: PortId(818),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8749, 8754),
@@ -7664,21 +7664,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(678),
-            target: TransformTarget::Callable(DeclarationId(2591)),
+            target: TransformTarget::Callable(DeclarationId(2592)),
             inputs: vec![],
             output: PortId(820),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8818, 8828),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(679),
-            target: TransformTarget::Callable(DeclarationId(2593)),
+            target: TransformTarget::Callable(DeclarationId(2594)),
             inputs: vec![],
             output: PortId(821),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8846, 8851),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(680),
-            target: TransformTarget::Callable(DeclarationId(2592)),
+            target: TransformTarget::Callable(DeclarationId(2593)),
             inputs: vec![],
             output: PortId(822),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8873, 8882),
@@ -7694,7 +7694,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(682),
-            target: TransformTarget::Callable(DeclarationId(2592)),
+            target: TransformTarget::Callable(DeclarationId(2593)),
             inputs: vec![],
             output: PortId(825),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8919, 8928),
@@ -7758,21 +7758,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(685),
-            target: TransformTarget::Callable(DeclarationId(2591)),
+            target: TransformTarget::Callable(DeclarationId(2592)),
             inputs: vec![],
             output: PortId(829),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9008, 9018),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(686),
-            target: TransformTarget::Callable(DeclarationId(2593)),
+            target: TransformTarget::Callable(DeclarationId(2594)),
             inputs: vec![],
             output: PortId(830),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9036, 9041),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(687),
-            target: TransformTarget::Callable(DeclarationId(2592)),
+            target: TransformTarget::Callable(DeclarationId(2593)),
             inputs: vec![],
             output: PortId(831),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9063, 9072),
@@ -7820,7 +7820,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(693),
-            target: TransformTarget::Callable(DeclarationId(2590)),
+            target: TransformTarget::Callable(DeclarationId(2591)),
             inputs: vec![PortId(837)],
             output: PortId(838),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9151, 9204),
@@ -7879,7 +7879,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(698),
-            target: TransformTarget::Callable(DeclarationId(2590)),
+            target: TransformTarget::Callable(DeclarationId(2591)),
             inputs: vec![PortId(842)],
             output: PortId(843),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9232, 9320),
@@ -8071,7 +8071,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(710),
-            target: TransformTarget::Callable(DeclarationId(2590)),
+            target: TransformTarget::Callable(DeclarationId(2591)),
             inputs: vec![PortId(853)],
             output: PortId(854),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9657, 9698),
@@ -8110,7 +8110,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(715),
-            target: TransformTarget::Callable(DeclarationId(2595)),
+            target: TransformTarget::Callable(DeclarationId(2596)),
             inputs: vec![],
             output: PortId(859),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9952, 9957),
@@ -8249,14 +8249,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(724),
-            target: TransformTarget::Callable(DeclarationId(2275)),
+            target: TransformTarget::Callable(DeclarationId(2276)),
             inputs: vec![],
             output: PortId(874),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10707, 10719),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(725),
-            target: TransformTarget::Callable(DeclarationId(2281)),
+            target: TransformTarget::Callable(DeclarationId(2282)),
             inputs: vec![PortId(874)],
             output: PortId(875),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10694, 10720),
@@ -8364,7 +8364,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(739),
-            target: TransformTarget::Callable(DeclarationId(2309)),
+            target: TransformTarget::Callable(DeclarationId(2310)),
             inputs: vec![PortId(889)],
             output: PortId(890),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11811, 11923),
@@ -8385,7 +8385,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(742),
-            target: TransformTarget::Callable(DeclarationId(2309)),
+            target: TransformTarget::Callable(DeclarationId(2310)),
             inputs: vec![PortId(892)],
             output: PortId(893),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11951, 12132),
@@ -8445,7 +8445,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(747),
-            target: TransformTarget::Callable(DeclarationId(2309)),
+            target: TransformTarget::Callable(DeclarationId(2310)),
             inputs: vec![PortId(898)],
             output: PortId(899),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12168, 12329),
@@ -8547,21 +8547,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(754),
-            target: TransformTarget::Callable(DeclarationId(2591)),
+            target: TransformTarget::Callable(DeclarationId(2592)),
             inputs: vec![],
             output: PortId(910),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12959, 12969),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(755),
-            target: TransformTarget::Callable(DeclarationId(2592)),
+            target: TransformTarget::Callable(DeclarationId(2593)),
             inputs: vec![],
             output: PortId(911),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12987, 12996),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(756),
-            target: TransformTarget::Callable(DeclarationId(2593)),
+            target: TransformTarget::Callable(DeclarationId(2594)),
             inputs: vec![],
             output: PortId(912),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13010, 13015),
@@ -8646,7 +8646,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(762),
-            target: TransformTarget::Callable(DeclarationId(2596)),
+            target: TransformTarget::Callable(DeclarationId(2597)),
             inputs: vec![PortId(919)],
             output: PortId(920),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13939, 13980),
@@ -8660,7 +8660,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(764),
-            target: TransformTarget::Callable(DeclarationId(2597)),
+            target: TransformTarget::Callable(DeclarationId(2598)),
             inputs: vec![PortId(921)],
             output: PortId(922),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13986, 14027),
@@ -8715,7 +8715,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(769),
-            target: TransformTarget::Callable(DeclarationId(2598)),
+            target: TransformTarget::Callable(DeclarationId(2599)),
             inputs: vec![PortId(927)],
             output: PortId(928),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14090, 14131),
@@ -8729,7 +8729,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(771),
-            target: TransformTarget::Callable(DeclarationId(2599)),
+            target: TransformTarget::Callable(DeclarationId(2600)),
             inputs: vec![PortId(929)],
             output: PortId(930),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14137, 14178),
@@ -8784,7 +8784,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(776),
-            target: TransformTarget::Callable(DeclarationId(2600)),
+            target: TransformTarget::Callable(DeclarationId(2601)),
             inputs: vec![PortId(935)],
             output: PortId(936),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14238, 14279),
@@ -8798,7 +8798,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(778),
-            target: TransformTarget::Callable(DeclarationId(2601)),
+            target: TransformTarget::Callable(DeclarationId(2602)),
             inputs: vec![PortId(937)],
             output: PortId(938),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14285, 14326),
@@ -8853,7 +8853,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(783),
-            target: TransformTarget::Callable(DeclarationId(2602)),
+            target: TransformTarget::Callable(DeclarationId(2603)),
             inputs: vec![PortId(943)],
             output: PortId(944),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14384, 14425),
@@ -8867,7 +8867,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(785),
-            target: TransformTarget::Callable(DeclarationId(2603)),
+            target: TransformTarget::Callable(DeclarationId(2604)),
             inputs: vec![PortId(945)],
             output: PortId(946),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14431, 14472),
@@ -8922,7 +8922,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(790),
-            target: TransformTarget::Callable(DeclarationId(2604)),
+            target: TransformTarget::Callable(DeclarationId(2605)),
             inputs: vec![PortId(951)],
             output: PortId(952),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14530, 14571),
@@ -8936,7 +8936,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(792),
-            target: TransformTarget::Callable(DeclarationId(2605)),
+            target: TransformTarget::Callable(DeclarationId(2606)),
             inputs: vec![PortId(953)],
             output: PortId(954),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14577, 14618),
@@ -9071,14 +9071,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(799),
-            target: TransformTarget::Callable(DeclarationId(2308)),
+            target: TransformTarget::Callable(DeclarationId(2309)),
             inputs: vec![],
             output: PortId(963),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14802, 14814),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(800),
-            target: TransformTarget::Callable(DeclarationId(2308)),
+            target: TransformTarget::Callable(DeclarationId(2309)),
             inputs: vec![],
             output: PortId(964),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14820, 14832),
@@ -9196,14 +9196,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
             target: TransformTarget::Callable(DeclarationId(1305)),
             inputs: vec![PortId(974)],
             output: PortId(975),
-            span: SourceSpan::new("src/v3/std/verification.dag", 28548, 28571),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28552, 28575),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(811),
             target: TransformTarget::Callable(DeclarationId(1306)),
             inputs: vec![PortId(976)],
             output: PortId(977),
-            span: SourceSpan::new("src/v3/std/verification.dag", 28593, 28627),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28597, 28631),
         }));
         nodes.push(Behavior::Branch(BranchNode {
             id: NodeId(812),
@@ -9214,7 +9214,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     output: PortId(975),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Enumerated".to_string(),
-                        span: SourceSpan::new("src/v3/std/verification.dag", 28531, 28544),
+                        span: SourceSpan::new("src/v3/std/verification.dag", 28535, 28548),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "c".to_string(),
@@ -9226,7 +9226,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                     output: PortId(977),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Quantified".to_string(),
-                        span: SourceSpan::new("src/v3/std/verification.dag", 28576, 28589),
+                        span: SourceSpan::new("src/v3/std/verification.dag", 28580, 28593),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "q".to_string(),
@@ -9235,7 +9235,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
                 },
             ],
             output: PortId(978),
-            span: SourceSpan::new("src/v3/std/verification.dag", 28513, 28631),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28517, 28635),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Bind(BindNode {
@@ -9243,7 +9243,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
             name: "obligation_for_suite_claim".to_string(),
             value: PortId(978),
             params: vec![PortId(973)],
-            span: SourceSpan::new("src/v3/std/verification.dag", 28513, 28631),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28517, 28635),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
@@ -9862,7 +9862,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(3352);
+        let mut declarations = Vec::with_capacity(3353);
         declarations.push(Declaration {
             id: DeclarationId(0),
             name: Some("Classical".to_string()),
@@ -24070,11 +24070,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Empty".to_string(),
-                        ty: DeclarationId(1818),
+                        ty: DeclarationId(1819),
                     },
                     Field {
                         label: "Cons".to_string(),
-                        ty: DeclarationId(1820),
+                        ty: DeclarationId(1821),
                     },
                 ],
             },
@@ -24107,7 +24107,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1788),
+                output: DeclarationId(1789),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3273, 3284)),
             },
             type_params: vec![DeclarationId(688)],
@@ -24138,8 +24138,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(689),
             name: Some("cons".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(690), DeclarationId(1789)],
-                output: DeclarationId(1790),
+                inputs: vec![DeclarationId(690), DeclarationId(1790)],
+                output: DeclarationId(1791),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3453, 3475)),
             },
             type_params: vec![DeclarationId(690)],
@@ -24171,7 +24171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("singleton".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(692)],
-                output: DeclarationId(1791),
+                output: DeclarationId(1792),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3570, 3590)),
             },
             type_params: vec![DeclarationId(692)],
@@ -24202,7 +24202,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(693),
             name: Some("fold".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1792), DeclarationId(695), DeclarationId(1793)],
+                inputs: vec![DeclarationId(1793), DeclarationId(695), DeclarationId(1794)],
                 output: DeclarationId(695),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4203, 4307)),
             },
@@ -24248,7 +24248,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(696),
             name: Some("fold_right".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1794), DeclarationId(698), DeclarationId(1795)],
+                inputs: vec![DeclarationId(1795), DeclarationId(698), DeclarationId(1796)],
                 output: DeclarationId(698),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4658, 4768)),
             },
@@ -24294,8 +24294,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(699),
             name: Some("concat".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1796), DeclarationId(1797)],
-                output: DeclarationId(1798),
+                inputs: vec![DeclarationId(1797), DeclarationId(1798)],
+                output: DeclarationId(1799),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5386, 5414)),
             },
             type_params: vec![DeclarationId(700)],
@@ -24326,8 +24326,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(701),
             name: Some("map".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1799), DeclarationId(1800)],
-                output: DeclarationId(1801),
+                inputs: vec![DeclarationId(1800), DeclarationId(1801)],
+                output: DeclarationId(1802),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5721, 5778)),
             },
             type_params: vec![DeclarationId(702), DeclarationId(703)],
@@ -24372,8 +24372,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(704),
             name: Some("filter".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1802), DeclarationId(1803)],
-                output: DeclarationId(1804),
+                inputs: vec![DeclarationId(1803), DeclarationId(1804)],
+                output: DeclarationId(1805),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5905, 5988)),
             },
             type_params: vec![DeclarationId(705)],
@@ -24404,8 +24404,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(706),
             name: Some("flat_map".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1805), DeclarationId(1807)],
-                output: DeclarationId(1808),
+                inputs: vec![DeclarationId(1806), DeclarationId(1808)],
+                output: DeclarationId(1809),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6171, 6230)),
             },
             type_params: vec![DeclarationId(707), DeclarationId(708)],
@@ -24450,7 +24450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(709),
             name: Some("length".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1809)],
+                inputs: vec![DeclarationId(1810)],
                 output: DeclarationId(93),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6372, 6409)),
             },
@@ -24482,7 +24482,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(711),
             name: Some("is_empty".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1810)],
+                inputs: vec![DeclarationId(1811)],
                 output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6605, 6671)),
             },
@@ -24553,8 +24553,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(715),
             name: Some("enumerate".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1811)],
-                output: DeclarationId(1813),
+                inputs: vec![DeclarationId(1812)],
+                output: DeclarationId(1814),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7238, 7269)),
             },
             type_params: vec![DeclarationId(716)],
@@ -24585,8 +24585,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(717),
             name: Some("enumerate_helper".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1814), DeclarationId(93)],
-                output: DeclarationId(1816),
+                inputs: vec![DeclarationId(1815), DeclarationId(93)],
+                output: DeclarationId(1817),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7463, 7644)),
             },
             type_params: vec![DeclarationId(718)],
@@ -24617,7 +24617,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(719),
             name: Some("contains".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1817), DeclarationId(720)],
+                inputs: vec![DeclarationId(1818), DeclarationId(720)],
                 output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 8205, 8332)),
             },
@@ -24712,7 +24712,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "rest".to_string(),
-                        ty: DeclarationId(1821),
+                        ty: DeclarationId(1822),
                     },
                 ],
             },
@@ -24755,7 +24755,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "rest".to_string(),
-                        ty: DeclarationId(1822),
+                        ty: DeclarationId(1823),
                     },
                 ],
             },
@@ -24790,11 +24790,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LiteralToken".to_string(),
-                        ty: DeclarationId(1837),
+                        ty: DeclarationId(1838),
                     },
                     Field {
                         label: "ParamToken".to_string(),
-                        ty: DeclarationId(1838),
+                        ty: DeclarationId(1839),
                     },
                 ],
             },
@@ -24814,7 +24814,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tokens".to_string(),
-                    ty: DeclarationId(1839),
+                    ty: DeclarationId(1840),
                 }],
             },
             type_params: vec![],
@@ -24834,11 +24834,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ParsedSegmentTokens".to_string(),
-                        ty: DeclarationId(1841),
+                        ty: DeclarationId(1842),
                     },
                     Field {
                         label: "MalformedPathSegment".to_string(),
-                        ty: DeclarationId(1842),
+                        ty: DeclarationId(1843),
                     },
                 ],
             },
@@ -24859,11 +24859,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ParsedPathTemplate".to_string(),
-                        ty: DeclarationId(1843),
+                        ty: DeclarationId(1844),
                     },
                     Field {
                         label: "MalformedPathTemplate".to_string(),
-                        ty: DeclarationId(1844),
+                        ty: DeclarationId(1845),
                     },
                 ],
             },
@@ -24918,7 +24918,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("last_path_param".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(730)],
-                output: DeclarationId(1823),
+                output: DeclarationId(1824),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 11761, 12044)),
             },
             type_params: vec![],
@@ -24938,15 +24938,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ReadEffect".to_string(),
-                        ty: DeclarationId(1845),
+                        ty: DeclarationId(1846),
                     },
                     Field {
                         label: "UpsertEffect".to_string(),
-                        ty: DeclarationId(1846),
+                        ty: DeclarationId(1847),
                     },
                     Field {
                         label: "DeleteEffect".to_string(),
-                        ty: DeclarationId(1847),
+                        ty: DeclarationId(1848),
                     },
                 ],
             },
@@ -24958,7 +24958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 14330, 14451),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14328, 14449),
         });
         declarations.push(Declaration {
             id: DeclarationId(737),
@@ -24967,11 +24967,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "CreateEffect".to_string(),
-                        ty: DeclarationId(1848),
+                        ty: DeclarationId(1849),
                     },
                     Field {
                         label: "AppendEffect".to_string(),
-                        ty: DeclarationId(1849),
+                        ty: DeclarationId(1850),
                     },
                 ],
             },
@@ -24983,7 +24983,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 14674, 14749),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14672, 14747),
         });
         declarations.push(Declaration {
             id: DeclarationId(738),
@@ -24992,11 +24992,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IsIdempotent".to_string(),
-                        ty: DeclarationId(1850),
+                        ty: DeclarationId(1851),
                     },
                     Field {
                         label: "IsBreaking".to_string(),
-                        ty: DeclarationId(1851),
+                        ty: DeclarationId(1852),
                     },
                 ],
             },
@@ -25008,7 +25008,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 15150, 15230),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15148, 15228),
         });
         declarations.push(Declaration {
             id: DeclarationId(739),
@@ -25017,11 +25017,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "PostAlways".to_string(),
-                        ty: DeclarationId(1852),
+                        ty: DeclarationId(1853),
                     },
                     Field {
                         label: "KeylessFallback".to_string(),
-                        ty: DeclarationId(1853),
+                        ty: DeclarationId(1854),
                     },
                 ],
             },
@@ -25033,7 +25033,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 15722, 15796),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15720, 15794),
         });
         declarations.push(Declaration {
             id: DeclarationId(740),
@@ -25042,15 +25042,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "PathParam".to_string(),
-                        ty: DeclarationId(1854),
+                        ty: DeclarationId(1855),
                     },
                     Field {
                         label: "InputField".to_string(),
-                        ty: DeclarationId(1855),
+                        ty: DeclarationId(1856),
                     },
                     Field {
                         label: "CompositeKey".to_string(),
-                        ty: DeclarationId(1857),
+                        ty: DeclarationId(1858),
                     },
                 ],
             },
@@ -25062,7 +25062,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 16482, 16603),
+            span: SourceSpan::new("src/v3/std/effects.dag", 16480, 16601),
         });
         declarations.push(Declaration {
             id: DeclarationId(741),
@@ -25071,15 +25071,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LatticeEffect".to_string(),
-                        ty: DeclarationId(1858),
+                        ty: DeclarationId(1859),
                     },
                     Field {
                         label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(1859),
+                        ty: DeclarationId(1860),
                     },
                     Field {
                         label: "NonIdempotent".to_string(),
-                        ty: DeclarationId(1860),
+                        ty: DeclarationId(1861),
                     },
                 ],
             },
@@ -25091,7 +25091,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 17251, 17349),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17249, 17347),
         });
         declarations.push(Declaration {
             id: DeclarationId(742),
@@ -25099,7 +25099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(738)],
                 output: DeclarationId(128),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 17576, 17648)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 17574, 17646)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25109,7 +25109,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 17524, 17648),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17522, 17646),
         });
         declarations.push(Declaration {
             id: DeclarationId(743),
@@ -25117,7 +25117,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(738)],
                 output: DeclarationId(741),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 17861, 18381)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 17859, 18379)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25127,7 +25127,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 17787, 18381),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17785, 18379),
         });
         declarations.push(Declaration {
             id: DeclarationId(744),
@@ -25152,7 +25152,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 19065, 19135),
+            span: SourceSpan::new("src/v3/std/effects.dag", 19063, 19133),
         });
         declarations.push(Declaration {
             id: DeclarationId(745),
@@ -25161,15 +25161,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DerivedEffect".to_string(),
-                        ty: DeclarationId(1861),
+                        ty: DeclarationId(1862),
                     },
                     Field {
                         label: "UnknownHttpMethodInput".to_string(),
-                        ty: DeclarationId(1862),
+                        ty: DeclarationId(1863),
                     },
                     Field {
                         label: "MalformedPathInput".to_string(),
-                        ty: DeclarationId(1863),
+                        ty: DeclarationId(1864),
                     },
                 ],
             },
@@ -25181,7 +25181,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 19489, 19789),
+            span: SourceSpan::new("src/v3/std/effects.dag", 19487, 19787),
         });
         declarations.push(Declaration {
             id: DeclarationId(746),
@@ -25190,11 +25190,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IdempotentComposition".to_string(),
-                        ty: DeclarationId(1864),
+                        ty: DeclarationId(1865),
                     },
                     Field {
                         label: "BrokenBy".to_string(),
-                        ty: DeclarationId(1866),
+                        ty: DeclarationId(1867),
                     },
                 ],
             },
@@ -25206,7 +25206,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20510, 20619),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20508, 20617),
         });
         declarations.push(Declaration {
             id: DeclarationId(747),
@@ -25214,7 +25214,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744)],
                 output: DeclarationId(128),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20809, 20884)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20807, 20882)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25224,15 +25224,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20755, 20884),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20753, 20882),
         });
         declarations.push(Declaration {
             id: DeclarationId(748),
             name: Some("breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(1824),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20944, 20966)),
+                output: DeclarationId(1825),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20942, 20964)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25242,15 +25242,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20886, 20966),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20884, 20964),
         });
         declarations.push(Declaration {
             id: DeclarationId(749),
             name: Some("indexed_breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1825)],
-                output: DeclarationId(1827),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21060, 21153)),
+                inputs: vec![DeclarationId(1826)],
+                output: DeclarationId(1828),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21058, 21151)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25260,15 +25260,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20968, 21153),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20966, 21151),
         });
         declarations.push(Declaration {
             id: DeclarationId(750),
             name: Some("first_breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1828)],
-                output: DeclarationId(1830),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21240, 21423)),
+                inputs: vec![DeclarationId(1829)],
+                output: DeclarationId(1831),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21238, 21421)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25278,15 +25278,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21155, 21423),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21153, 21421),
         });
         declarations.push(Declaration {
             id: DeclarationId(751),
             name: Some("compose_effects".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1831)],
+                inputs: vec![DeclarationId(1832)],
                 output: DeclarationId(746),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22313, 22436)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22311, 22434)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25296,7 +25296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 22240, 22436),
+            span: SourceSpan::new("src/v3/std/effects.dag", 22238, 22434),
         });
         declarations.push(Declaration {
             id: DeclarationId(752),
@@ -25315,7 +25315,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 23637, 23672),
+            span: SourceSpan::new("src/v3/std/effects.dag", 23635, 23670),
         });
         declarations.push(Declaration {
             id: DeclarationId(753),
@@ -25340,7 +25340,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 23757, 23823),
+            span: SourceSpan::new("src/v3/std/effects.dag", 23755, 23821),
         });
         declarations.push(Declaration {
             id: DeclarationId(754),
@@ -25349,19 +25349,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LinearEffect".to_string(),
-                        ty: DeclarationId(1868),
+                        ty: DeclarationId(1869),
                     },
                     Field {
                         label: "BranchEffect".to_string(),
-                        ty: DeclarationId(1870),
+                        ty: DeclarationId(1871),
                     },
                     Field {
                         label: "LoopEffect".to_string(),
-                        ty: DeclarationId(1871),
+                        ty: DeclarationId(1872),
                     },
                     Field {
                         label: "ParallelEffect".to_string(),
-                        ty: DeclarationId(1873),
+                        ty: DeclarationId(1874),
                     },
                 ],
             },
@@ -25373,7 +25373,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 24499, 24727),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24497, 24725),
         });
         declarations.push(Declaration {
             id: DeclarationId(755),
@@ -25402,7 +25402,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 25086, 25190),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25084, 25188),
         });
         declarations.push(Declaration {
             id: DeclarationId(756),
@@ -25411,11 +25411,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "WorkflowCompositionVerdict".to_string(),
-                        ty: DeclarationId(1874),
+                        ty: DeclarationId(1875),
                     },
                     Field {
                         label: "IdempotencyUnsupported".to_string(),
-                        ty: DeclarationId(1875),
+                        ty: DeclarationId(1876),
                     },
                 ],
             },
@@ -25427,7 +25427,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 25329, 25467),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25327, 25465),
         });
         declarations.push(Declaration {
             id: DeclarationId(757),
@@ -25435,7 +25435,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230), DeclarationId(230), DeclarationId(230)],
                 output: DeclarationId(756),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 25609, 25765)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 25607, 25763)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25445,7 +25445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 25469, 25765),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25467, 25763),
         });
         declarations.push(Declaration {
             id: DeclarationId(758),
@@ -25454,23 +25454,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoWorkflowProjection".to_string(),
-                        ty: DeclarationId(1876),
+                        ty: DeclarationId(1877),
                     },
                     Field {
                         label: "NotParallelEffectRoot".to_string(),
-                        ty: DeclarationId(1877),
+                        ty: DeclarationId(1878),
                     },
                     Field {
                         label: "NonLinearParallelBranch".to_string(),
-                        ty: DeclarationId(1878),
+                        ty: DeclarationId(1879),
                     },
                     Field {
                         label: "PairwiseNonCommute".to_string(),
-                        ty: DeclarationId(1879),
+                        ty: DeclarationId(1880),
                     },
                     Field {
                         label: "LensSurfacePending".to_string(),
-                        ty: DeclarationId(1880),
+                        ty: DeclarationId(1881),
                     },
                 ],
             },
@@ -25482,7 +25482,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 25928, 26084),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25926, 26082),
         });
         declarations.push(Declaration {
             id: DeclarationId(759),
@@ -25511,7 +25511,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 26086, 26202),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26084, 26200),
         });
         declarations.push(Declaration {
             id: DeclarationId(760),
@@ -25520,11 +25520,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ParallelCompositionVerdict".to_string(),
-                        ty: DeclarationId(1881),
+                        ty: DeclarationId(1882),
                     },
                     Field {
                         label: "ParallelismUnsupported".to_string(),
-                        ty: DeclarationId(1882),
+                        ty: DeclarationId(1883),
                     },
                 ],
             },
@@ -25536,7 +25536,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 26366, 26504),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26364, 26502),
         });
         declarations.push(Declaration {
             id: DeclarationId(761),
@@ -25544,7 +25544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(758), DeclarationId(230)],
                 output: DeclarationId(760),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 26625, 26780)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 26623, 26778)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25554,7 +25554,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 26506, 26780),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26504, 26778),
         });
         declarations.push(Declaration {
             id: DeclarationId(762),
@@ -25562,7 +25562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(754)],
                 output: DeclarationId(756),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 27018, 27848)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 27016, 27846)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25572,15 +25572,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 26932, 27848),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26930, 27846),
         });
         declarations.push(Declaration {
             id: DeclarationId(763),
             name: Some("parse_http_method".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230)],
-                output: DeclarationId(1832),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 29707, 30005)),
+                output: DeclarationId(1833),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 29705, 30003)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25590,7 +25590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 29658, 30005),
+            span: SourceSpan::new("src/v3/std/effects.dag", 29656, 30003),
         });
         declarations.push(Declaration {
             id: DeclarationId(764),
@@ -25598,7 +25598,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(198)],
                 output: DeclarationId(738),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30060, 30136)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30058, 30134)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25608,15 +25608,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30007, 30136),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30005, 30134),
         });
         declarations.push(Declaration {
             id: DeclarationId(765),
             name: Some("upsert_or_create".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1833), DeclarationId(198)],
+                inputs: vec![DeclarationId(1834), DeclarationId(198)],
                 output: DeclarationId(738),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30476, 30628)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30474, 30626)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25626,15 +25626,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30400, 30628),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30398, 30626),
         });
         declarations.push(Declaration {
             id: DeclarationId(766),
             name: Some("delete_or_create".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1834), DeclarationId(198)],
+                inputs: vec![DeclarationId(1835), DeclarationId(198)],
                 output: DeclarationId(738),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30706, 30858)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30704, 30856)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25644,7 +25644,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30630, 30858),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30628, 30856),
         });
         declarations.push(Declaration {
             id: DeclarationId(767),
@@ -25652,7 +25652,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(198), DeclarationId(730)],
                 output: DeclarationId(738),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30944, 31429)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30942, 31427)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25662,7 +25662,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30860, 31429),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30858, 31427),
         });
         declarations.push(Declaration {
             id: DeclarationId(768),
@@ -25670,7 +25670,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230), DeclarationId(198), DeclarationId(730)],
                 output: DeclarationId(745),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 31547, 31731)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 31545, 31729)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25680,7 +25680,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 31431, 31731),
+            span: SourceSpan::new("src/v3/std/effects.dag", 31429, 31729),
         });
         declarations.push(Declaration {
             id: DeclarationId(769),
@@ -25689,15 +25689,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Agrees".to_string(),
-                        ty: DeclarationId(1883),
+                        ty: DeclarationId(1884),
                     },
                     Field {
                         label: "Disagrees".to_string(),
-                        ty: DeclarationId(1884),
+                        ty: DeclarationId(1885),
                     },
                     Field {
                         label: "DerivationUnknown".to_string(),
-                        ty: DeclarationId(1885),
+                        ty: DeclarationId(1886),
                     },
                 ],
             },
@@ -25709,7 +25709,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 32431, 32548),
+            span: SourceSpan::new("src/v3/std/effects.dag", 32429, 32546),
         });
         declarations.push(Declaration {
             id: DeclarationId(770),
@@ -25718,11 +25718,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ModifierNotDeclared".to_string(),
-                        ty: DeclarationId(1886),
+                        ty: DeclarationId(1887),
                     },
                     Field {
                         label: "ModifierDeclared".to_string(),
-                        ty: DeclarationId(1887),
+                        ty: DeclarationId(1888),
                     },
                 ],
             },
@@ -25734,7 +25734,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 32995, 33095),
+            span: SourceSpan::new("src/v3/std/effects.dag", 32993, 33093),
         });
         declarations.push(Declaration {
             id: DeclarationId(771),
@@ -25767,7 +25767,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 33097, 33247),
+            span: SourceSpan::new("src/v3/std/effects.dag", 33095, 33245),
         });
         declarations.push(Declaration {
             id: DeclarationId(772),
@@ -25775,7 +25775,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(737)],
                 output: DeclarationId(769),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 33886, 34428)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 33884, 34426)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25785,7 +25785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 33807, 34428),
+            span: SourceSpan::new("src/v3/std/effects.dag", 33805, 34426),
         });
         declarations.push(Declaration {
             id: DeclarationId(773),
@@ -25793,7 +25793,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(738)],
                 output: DeclarationId(769),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 34832, 35274)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 34830, 35272)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25803,7 +25803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 34760, 35274),
+            span: SourceSpan::new("src/v3/std/effects.dag", 34758, 35272),
         });
         declarations.push(Declaration {
             id: DeclarationId(774),
@@ -25811,7 +25811,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744), DeclarationId(128), DeclarationId(128)],
                 output: DeclarationId(771),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 35406, 36055)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 35404, 36053)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25821,7 +25821,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 35276, 36055),
+            span: SourceSpan::new("src/v3/std/effects.dag", 35274, 36053),
         });
         declarations.push(Declaration {
             id: DeclarationId(775),
@@ -25854,15 +25854,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 36407, 36535),
+            span: SourceSpan::new("src/v3/std/effects.dag", 36405, 36533),
         });
         declarations.push(Declaration {
             id: DeclarationId(776),
             name: Some("generate_idempotency_obligations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1835)],
-                output: DeclarationId(1836),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 36640, 36910)),
+                inputs: vec![DeclarationId(1836)],
+                output: DeclarationId(1837),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 36638, 36908)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25872,7 +25872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 36537, 36910),
+            span: SourceSpan::new("src/v3/std/effects.dag", 36535, 36908),
         });
         declarations.push(Declaration {
             id: DeclarationId(777),
@@ -25901,7 +25901,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 37227, 37318),
+            span: SourceSpan::new("src/v3/std/effects.dag", 37225, 37316),
         });
         declarations.push(Declaration {
             id: DeclarationId(778),
@@ -25954,15 +25954,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Uninferred".to_string(),
-                        ty: DeclarationId(1896),
+                        ty: DeclarationId(1897),
                     },
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(1897),
+                        ty: DeclarationId(1898),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(1898),
+                        ty: DeclarationId(1899),
                     },
                 ],
             },
@@ -25991,7 +25991,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "produced_by".to_string(),
-                        ty: DeclarationId(1899),
+                        ty: DeclarationId(1900),
                     },
                 ],
             },
@@ -26012,15 +26012,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LitInt".to_string(),
-                        ty: DeclarationId(1900),
+                        ty: DeclarationId(1901),
                     },
                     Field {
                         label: "LitBool".to_string(),
-                        ty: DeclarationId(1901),
+                        ty: DeclarationId(1902),
                     },
                     Field {
                         label: "LitString".to_string(),
-                        ty: DeclarationId(1902),
+                        ty: DeclarationId(1903),
                     },
                 ],
             },
@@ -26041,23 +26041,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(1903),
+                        ty: DeclarationId(1904),
                     },
                     Field {
                         label: "UnresolvedIdentifier".to_string(),
-                        ty: DeclarationId(1904),
+                        ty: DeclarationId(1905),
                     },
                     Field {
                         label: "ResolvedByStructure".to_string(),
-                        ty: DeclarationId(1905),
+                        ty: DeclarationId(1906),
                     },
                     Field {
                         label: "ResolvedByName".to_string(),
-                        ty: DeclarationId(1906),
+                        ty: DeclarationId(1907),
                     },
                     Field {
                         label: "TypeParam".to_string(),
-                        ty: DeclarationId(1907),
+                        ty: DeclarationId(1908),
                     },
                 ],
             },
@@ -26078,15 +26078,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "OneUnit".to_string(),
-                        ty: DeclarationId(1908),
+                        ty: DeclarationId(1909),
                     },
                     Field {
                         label: "AdditionalUnit".to_string(),
-                        ty: DeclarationId(1909),
+                        ty: DeclarationId(1910),
                     },
                     Field {
                         label: "UnitCount".to_string(),
-                        ty: DeclarationId(1910),
+                        ty: DeclarationId(1911),
                     },
                 ],
             },
@@ -26107,11 +26107,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ZeroWidth".to_string(),
-                        ty: DeclarationId(1911),
+                        ty: DeclarationId(1912),
                     },
                     Field {
                         label: "PositiveWidth".to_string(),
-                        ty: DeclarationId(1912),
+                        ty: DeclarationId(1913),
                     },
                 ],
             },
@@ -26132,11 +26132,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "BoundedInterval".to_string(),
-                        ty: DeclarationId(1913),
+                        ty: DeclarationId(1914),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1914),
+                        ty: DeclarationId(1915),
                     },
                 ],
             },
@@ -26191,11 +26191,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "StaticBound".to_string(),
-                        ty: DeclarationId(1916),
+                        ty: DeclarationId(1917),
                     },
                     Field {
                         label: "PlatformDependent".to_string(),
-                        ty: DeclarationId(1917),
+                        ty: DeclarationId(1918),
                     },
                 ],
             },
@@ -26216,15 +26216,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Exact".to_string(),
-                        ty: DeclarationId(1918),
+                        ty: DeclarationId(1919),
                     },
                     Field {
                         label: "AtMostOne".to_string(),
-                        ty: DeclarationId(1919),
+                        ty: DeclarationId(1920),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1920),
+                        ty: DeclarationId(1921),
                     },
                 ],
             },
@@ -26320,27 +26320,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(1921),
+                        ty: DeclarationId(1922),
                     },
                     Field {
                         label: "Reference".to_string(),
-                        ty: DeclarationId(1922),
+                        ty: DeclarationId(1923),
                     },
                     Field {
                         label: "Record".to_string(),
-                        ty: DeclarationId(1924),
+                        ty: DeclarationId(1925),
                     },
                     Field {
                         label: "List".to_string(),
-                        ty: DeclarationId(1926),
+                        ty: DeclarationId(1927),
                     },
                     Field {
                         label: "Map".to_string(),
-                        ty: DeclarationId(1928),
+                        ty: DeclarationId(1929),
                     },
                     Field {
                         label: "Variant".to_string(),
-                        ty: DeclarationId(1930),
+                        ty: DeclarationId(1931),
                     },
                 ],
             },
@@ -26361,23 +26361,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ValueBodyUnparsed".to_string(),
-                        ty: DeclarationId(1931),
+                        ty: DeclarationId(1932),
                     },
                     Field {
                         label: "ValueBodyStructural".to_string(),
-                        ty: DeclarationId(1933),
+                        ty: DeclarationId(1934),
                     },
                     Field {
                         label: "ValueBodyScalar".to_string(),
-                        ty: DeclarationId(1934),
+                        ty: DeclarationId(1935),
                     },
                     Field {
                         label: "ValueBodyList".to_string(),
-                        ty: DeclarationId(1936),
+                        ty: DeclarationId(1937),
                     },
                     Field {
                         label: "ValueBodyMap".to_string(),
-                        ty: DeclarationId(1938),
+                        ty: DeclarationId(1939),
                     },
                 ],
             },
@@ -26417,23 +26417,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UserDefined".to_string(),
-                        ty: DeclarationId(1939),
+                        ty: DeclarationId(1940),
                     },
                     Field {
                         label: "ExternalRealization".to_string(),
-                        ty: DeclarationId(1940),
+                        ty: DeclarationId(1941),
                     },
                     Field {
                         label: "Pending".to_string(),
-                        ty: DeclarationId(1941),
+                        ty: DeclarationId(1942),
                     },
                     Field {
                         label: "NoBody".to_string(),
-                        ty: DeclarationId(1942),
+                        ty: DeclarationId(1943),
                     },
                     Field {
                         label: "Unparsed".to_string(),
-                        ty: DeclarationId(1943),
+                        ty: DeclarationId(1944),
                     },
                 ],
             },
@@ -26454,27 +26454,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Atom".to_string(),
-                        ty: DeclarationId(1944),
+                        ty: DeclarationId(1945),
                     },
                     Field {
                         label: "Conj".to_string(),
-                        ty: DeclarationId(1946),
+                        ty: DeclarationId(1947),
                     },
                     Field {
                         label: "Disj".to_string(),
-                        ty: DeclarationId(1948),
+                        ty: DeclarationId(1949),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(1950),
+                        ty: DeclarationId(1951),
                     },
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(1951),
+                        ty: DeclarationId(1952),
                     },
                     Field {
                         label: "Instantiation".to_string(),
-                        ty: DeclarationId(1953),
+                        ty: DeclarationId(1954),
                     },
                 ],
             },
@@ -26499,7 +26499,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(1954),
+                        ty: DeclarationId(1955),
                     },
                     Field {
                         label: "connective".to_string(),
@@ -26507,27 +26507,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(1955),
+                        ty: DeclarationId(1956),
                     },
                     Field {
                         label: "phantom_params".to_string(),
-                        ty: DeclarationId(1956),
+                        ty: DeclarationId(1957),
                     },
                     Field {
                         label: "meta_tag".to_string(),
-                        ty: DeclarationId(1957),
+                        ty: DeclarationId(1958),
                     },
                     Field {
                         label: "inhabits".to_string(),
-                        ty: DeclarationId(1958),
+                        ty: DeclarationId(1959),
                     },
                     Field {
                         label: "value_body".to_string(),
-                        ty: DeclarationId(1959),
+                        ty: DeclarationId(1960),
                     },
                     Field {
                         label: "nominal_opacity".to_string(),
-                        ty: DeclarationId(1960),
+                        ty: DeclarationId(1961),
                     },
                     Field {
                         label: "span".to_string(),
@@ -26576,7 +26576,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "permitted_accessors".to_string(),
-                    ty: DeclarationId(1961),
+                    ty: DeclarationId(1962),
                 }],
             },
             type_params: vec![],
@@ -26596,19 +26596,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Add".to_string(),
-                        ty: DeclarationId(1962),
+                        ty: DeclarationId(1963),
                     },
                     Field {
                         label: "Sub".to_string(),
-                        ty: DeclarationId(1963),
+                        ty: DeclarationId(1964),
                     },
                     Field {
                         label: "Mul".to_string(),
-                        ty: DeclarationId(1964),
+                        ty: DeclarationId(1965),
                     },
                     Field {
                         label: "Div".to_string(),
-                        ty: DeclarationId(1965),
+                        ty: DeclarationId(1966),
                     },
                 ],
             },
@@ -26629,27 +26629,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(1966),
+                        ty: DeclarationId(1967),
                     },
                     Field {
                         label: "Ne".to_string(),
-                        ty: DeclarationId(1967),
+                        ty: DeclarationId(1968),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(1968),
+                        ty: DeclarationId(1969),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(1969),
+                        ty: DeclarationId(1970),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(1970),
+                        ty: DeclarationId(1971),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(1971),
+                        ty: DeclarationId(1972),
                     },
                 ],
             },
@@ -26695,11 +26695,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "And".to_string(),
-                        ty: DeclarationId(1972),
+                        ty: DeclarationId(1973),
                     },
                     Field {
                         label: "Or".to_string(),
-                        ty: DeclarationId(1973),
+                        ty: DeclarationId(1974),
                     },
                 ],
             },
@@ -26720,15 +26720,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Arithmetic".to_string(),
-                        ty: DeclarationId(1974),
+                        ty: DeclarationId(1975),
                     },
                     Field {
                         label: "Comparison".to_string(),
-                        ty: DeclarationId(1975),
+                        ty: DeclarationId(1976),
                     },
                     Field {
                         label: "Logical".to_string(),
-                        ty: DeclarationId(1976),
+                        ty: DeclarationId(1977),
                     },
                 ],
             },
@@ -26749,19 +26749,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Callable".to_string(),
-                        ty: DeclarationId(1977),
+                        ty: DeclarationId(1978),
                     },
                     Field {
                         label: "UnresolvedFieldProject".to_string(),
-                        ty: DeclarationId(1978),
+                        ty: DeclarationId(1979),
                     },
                     Field {
                         label: "ResolvedFieldProject".to_string(),
-                        ty: DeclarationId(1979),
+                        ty: DeclarationId(1980),
                     },
                     Field {
                         label: "Operator".to_string(),
-                        ty: DeclarationId(1980),
+                        ty: DeclarationId(1981),
                     },
                 ],
             },
@@ -26782,11 +26782,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UnresolvedVariant".to_string(),
-                        ty: DeclarationId(1981),
+                        ty: DeclarationId(1982),
                     },
                     Field {
                         label: "ResolvedVariant".to_string(),
-                        ty: DeclarationId(1982),
+                        ty: DeclarationId(1983),
                     },
                 ],
             },
@@ -26844,7 +26844,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "binding".to_string(),
-                        ty: DeclarationId(1983),
+                        ty: DeclarationId(1984),
                     },
                 ],
             },
@@ -26980,11 +26980,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "members".to_string(),
-                        ty: DeclarationId(1984),
+                        ty: DeclarationId(1985),
                     },
                     Field {
                         label: "intra_cluster_calls".to_string(),
-                        ty: DeclarationId(1985),
+                        ty: DeclarationId(1986),
                     },
                 ],
             },
@@ -27005,11 +27005,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(1986),
+                        ty: DeclarationId(1987),
                     },
                     Field {
                         label: "Descent".to_string(),
-                        ty: DeclarationId(1987),
+                        ty: DeclarationId(1988),
                     },
                 ],
             },
@@ -27064,7 +27064,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "lane2_workflow".to_string(),
-                        ty: DeclarationId(1988),
+                        ty: DeclarationId(1989),
                     },
                 ],
             },
@@ -27093,7 +27093,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(1989),
+                        ty: DeclarationId(1990),
                     },
                     Field {
                         label: "result_port".to_string(),
@@ -27121,7 +27121,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "UserMatch".to_string(),
-                    ty: DeclarationId(1990),
+                    ty: DeclarationId(1991),
                 }],
             },
             type_params: vec![],
@@ -27149,7 +27149,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "paths".to_string(),
-                        ty: DeclarationId(1991),
+                        ty: DeclarationId(1992),
                     },
                     Field {
                         label: "result_port".to_string(),
@@ -27161,7 +27161,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "emit_participation".to_string(),
-                        ty: DeclarationId(1992),
+                        ty: DeclarationId(1993),
                     },
                 ],
             },
@@ -27226,7 +27226,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "UserCallable".to_string(),
-                    ty: DeclarationId(1993),
+                    ty: DeclarationId(1994),
                 }],
             },
             type_params: vec![],
@@ -27258,7 +27258,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(1994),
+                        ty: DeclarationId(1995),
                     },
                     Field {
                         label: "span".to_string(),
@@ -27266,11 +27266,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "lane2_workflow".to_string(),
-                        ty: DeclarationId(1995),
+                        ty: DeclarationId(1996),
                     },
                     Field {
                         label: "emit_participation".to_string(),
-                        ty: DeclarationId(1996),
+                        ty: DeclarationId(1997),
                     },
                 ],
             },
@@ -27291,23 +27291,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Value".to_string(),
-                        ty: DeclarationId(1997),
+                        ty: DeclarationId(1998),
                     },
                     Field {
                         label: "Transform".to_string(),
-                        ty: DeclarationId(1998),
+                        ty: DeclarationId(1999),
                     },
                     Field {
                         label: "Branch".to_string(),
-                        ty: DeclarationId(1999),
+                        ty: DeclarationId(2000),
                     },
                     Field {
                         label: "Loop".to_string(),
-                        ty: DeclarationId(2000),
+                        ty: DeclarationId(2001),
                     },
                     Field {
                         label: "Bind".to_string(),
-                        ty: DeclarationId(2001),
+                        ty: DeclarationId(2002),
                     },
                 ],
             },
@@ -27328,19 +27328,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "declarations".to_string(),
-                        ty: DeclarationId(2002),
+                        ty: DeclarationId(2003),
                     },
                     Field {
                         label: "nodes".to_string(),
-                        ty: DeclarationId(2003),
+                        ty: DeclarationId(2004),
                     },
                     Field {
                         label: "ports".to_string(),
-                        ty: DeclarationId(2004),
+                        ty: DeclarationId(2005),
                     },
                     Field {
                         label: "clusters".to_string(),
-                        ty: DeclarationId(2005),
+                        ty: DeclarationId(2006),
                     },
                 ],
             },
@@ -27407,7 +27407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("port".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(722)],
-                output: DeclarationId(1888),
+                output: DeclarationId(1889),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22297,
@@ -27429,7 +27429,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("node".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-                output: DeclarationId(1889),
+                output: DeclarationId(1890),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22355,
@@ -27451,7 +27451,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("resolve_producer".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(722)],
-                output: DeclarationId(1890),
+                output: DeclarationId(1891),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22430,
@@ -27473,7 +27473,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("declaration_by_id".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(723)],
-                output: DeclarationId(1891),
+                output: DeclarationId(1892),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22819,
@@ -27495,7 +27495,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("declaration_by_name".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(230)],
-                output: DeclarationId(1892),
+                output: DeclarationId(1893),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     23694,
@@ -27517,7 +27517,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("lane2_workflow_at".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-                output: DeclarationId(1893),
+                output: DeclarationId(1894),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     24020,
@@ -27541,15 +27541,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "SingleRoot".to_string(),
-                        ty: DeclarationId(2006),
+                        ty: DeclarationId(2007),
                     },
                     Field {
                         label: "NoRoot".to_string(),
-                        ty: DeclarationId(2007),
+                        ty: DeclarationId(2008),
                     },
                     Field {
                         label: "AmbiguousRoot".to_string(),
-                        ty: DeclarationId(2009),
+                        ty: DeclarationId(2010),
                     },
                 ],
             },
@@ -27590,7 +27590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("miss_declaration_id_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1894),
+                output: DeclarationId(1895),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     28025,
@@ -27612,7 +27612,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("hit_declaration_id_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(723)],
-                output: DeclarationId(1895),
+                output: DeclarationId(1896),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     28110,
@@ -27655,15 +27655,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ShrinkEffect".to_string(),
-                        ty: DeclarationId(2034),
+                        ty: DeclarationId(2035),
                     },
                     Field {
                         label: "ProjectionEffect".to_string(),
-                        ty: DeclarationId(2035),
+                        ty: DeclarationId(2036),
                     },
                     Field {
                         label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(2036),
+                        ty: DeclarationId(2037),
                     },
                 ],
             },
@@ -27684,19 +27684,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ShapeConstant".to_string(),
-                        ty: DeclarationId(2037),
+                        ty: DeclarationId(2038),
                     },
                     Field {
                         label: "ShapeLinearScan".to_string(),
-                        ty: DeclarationId(2038),
+                        ty: DeclarationId(2039),
                     },
                     Field {
                         label: "ShapeIterateBody".to_string(),
-                        ty: DeclarationId(2039),
+                        ty: DeclarationId(2040),
                     },
                     Field {
                         label: "ShapeSortBody".to_string(),
-                        ty: DeclarationId(2040),
+                        ty: DeclarationId(2041),
                     },
                 ],
             },
@@ -27725,15 +27725,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "size_effect".to_string(),
-                        ty: DeclarationId(2041),
+                        ty: DeclarationId(2042),
                     },
                     Field {
                         label: "cost_shape".to_string(),
-                        ty: DeclarationId(2042),
+                        ty: DeclarationId(2043),
                     },
                     Field {
                         label: "callback_element_position".to_string(),
-                        ty: DeclarationId(2043),
+                        ty: DeclarationId(2044),
                     },
                 ],
             },
@@ -27758,7 +27758,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "display_name".to_string(),
-                        ty: DeclarationId(2044),
+                        ty: DeclarationId(2045),
                     },
                 ],
             },
@@ -27815,11 +27815,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DegreeTwo".to_string(),
-                        ty: DeclarationId(2045),
+                        ty: DeclarationId(2046),
                     },
                     Field {
                         label: "DegreeSuccessor".to_string(),
-                        ty: DeclarationId(2046),
+                        ty: DeclarationId(2047),
                     },
                 ],
             },
@@ -27840,31 +27840,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ConstantCost".to_string(),
-                        ty: DeclarationId(2047),
+                        ty: DeclarationId(2048),
                     },
                     Field {
                         label: "LinearCost".to_string(),
-                        ty: DeclarationId(2048),
+                        ty: DeclarationId(2049),
                     },
                     Field {
                         label: "PolynomialCost".to_string(),
-                        ty: DeclarationId(2049),
+                        ty: DeclarationId(2050),
                     },
                     Field {
                         label: "ProductCost".to_string(),
-                        ty: DeclarationId(2051),
+                        ty: DeclarationId(2052),
                     },
                     Field {
                         label: "SumCost".to_string(),
-                        ty: DeclarationId(2053),
+                        ty: DeclarationId(2054),
                     },
                     Field {
                         label: "LogCost".to_string(),
-                        ty: DeclarationId(2054),
+                        ty: DeclarationId(2055),
                     },
                     Field {
                         label: "UnknownCost".to_string(),
-                        ty: DeclarationId(2055),
+                        ty: DeclarationId(2056),
                     },
                 ],
             },
@@ -27872,7 +27872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-            inhabits: Some(DeclarationId(2056)),
+            inhabits: Some(DeclarationId(2057)),
             value_body: None,
             refinement: None,
             nominal_opacity: None,
@@ -27926,7 +27926,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("miss_symbolic_cost_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2010),
+                output: DeclarationId(2011),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 10963, 10973)),
             },
             type_params: vec![],
@@ -27944,7 +27944,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("hit_symbolic_cost_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(849)],
-                output: DeclarationId(2011),
+                output: DeclarationId(2012),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 11047, 11062)),
             },
             type_params: vec![],
@@ -27962,7 +27962,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("two_terms".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(849), DeclarationId(849)],
-                output: DeclarationId(2012),
+                output: DeclarationId(2013),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(185))),
             },
             type_params: vec![],
@@ -27979,8 +27979,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(855),
             name: Some("many_terms".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849), DeclarationId(849), DeclarationId(2013)],
-                output: DeclarationId(2014),
+                inputs: vec![DeclarationId(849), DeclarationId(849), DeclarationId(2014)],
+                output: DeclarationId(2015),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(187))),
             },
             type_params: vec![],
@@ -28105,7 +28105,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(862),
             name: Some("max_path".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2015)],
+                inputs: vec![DeclarationId(2016)],
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(220))),
             },
@@ -28162,35 +28162,35 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ClassConstant".to_string(),
-                        ty: DeclarationId(2057),
+                        ty: DeclarationId(2058),
                     },
                     Field {
                         label: "ClassLog".to_string(),
-                        ty: DeclarationId(2058),
+                        ty: DeclarationId(2059),
                     },
                     Field {
                         label: "ClassLinear".to_string(),
-                        ty: DeclarationId(2059),
+                        ty: DeclarationId(2060),
                     },
                     Field {
                         label: "ClassLinearithmic".to_string(),
-                        ty: DeclarationId(2060),
+                        ty: DeclarationId(2061),
                     },
                     Field {
                         label: "ClassQuadratic".to_string(),
-                        ty: DeclarationId(2061),
+                        ty: DeclarationId(2062),
                     },
                     Field {
                         label: "ClassPolynomial".to_string(),
-                        ty: DeclarationId(2062),
+                        ty: DeclarationId(2063),
                     },
                     Field {
                         label: "ClassExponential".to_string(),
-                        ty: DeclarationId(2063),
+                        ty: DeclarationId(2064),
                     },
                     Field {
                         label: "ClassUnknown".to_string(),
-                        ty: DeclarationId(2064),
+                        ty: DeclarationId(2065),
                     },
                 ],
             },
@@ -28198,7 +28198,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-            inhabits: Some(DeclarationId(2065)),
+            inhabits: Some(DeclarationId(2066)),
             value_body: None,
             refinement: None,
             nominal_opacity: None,
@@ -28298,8 +28298,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(871),
             name: Some("nsl_to_list".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2016)],
-                output: DeclarationId(2017),
+                inputs: vec![DeclarationId(2017)],
+                output: DeclarationId(2018),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(366))),
             },
             type_params: vec![],
@@ -28316,8 +28316,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(872),
             name: Some("drop_additive_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2018)],
-                output: DeclarationId(2019),
+                inputs: vec![DeclarationId(2019)],
+                output: DeclarationId(2020),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(379))),
             },
             type_params: vec![],
@@ -28334,8 +28334,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(873),
             name: Some("collapse_on_multiplicative_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2020)],
-                output: DeclarationId(2021),
+                inputs: vec![DeclarationId(2021)],
+                output: DeclarationId(2022),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(386))),
             },
             type_params: vec![],
@@ -28352,7 +28352,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(874),
             name: Some("any_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2022)],
+                inputs: vec![DeclarationId(2023)],
                 output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(395))),
             },
@@ -28370,8 +28370,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(875),
             name: Some("drop_multiplicative_one".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2023)],
-                output: DeclarationId(2024),
+                inputs: vec![DeclarationId(2024)],
+                output: DeclarationId(2025),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(408))),
             },
             type_params: vec![],
@@ -28424,7 +28424,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(878),
             name: Some("reduce_sum".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2025)],
+                inputs: vec![DeclarationId(2026)],
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(440))),
             },
@@ -28442,7 +28442,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(879),
             name: Some("wrap_sum".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2026)],
+                inputs: vec![DeclarationId(2027)],
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(452))),
             },
@@ -28460,7 +28460,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(880),
             name: Some("reduce_product".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2027)],
+                inputs: vec![DeclarationId(2028)],
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(469))),
             },
@@ -28609,8 +28609,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(888),
             name: Some("filter_not_dominated_by".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2028), DeclarationId(849)],
-                output: DeclarationId(2029),
+                inputs: vec![DeclarationId(2029), DeclarationId(849)],
+                output: DeclarationId(2030),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(517))),
             },
             type_params: vec![],
@@ -28627,8 +28627,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(889),
             name: Some("drop_dominated_step".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2030), DeclarationId(849)],
-                output: DeclarationId(2031),
+                inputs: vec![DeclarationId(2031), DeclarationId(849)],
+                output: DeclarationId(2032),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(524))),
             },
             type_params: vec![],
@@ -28645,8 +28645,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(890),
             name: Some("drop_dominated".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2032)],
-                output: DeclarationId(2033),
+                inputs: vec![DeclarationId(2033)],
+                output: DeclarationId(2034),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(527))),
             },
             type_params: vec![],
@@ -28666,10 +28666,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 inputs: vec![
                     DeclarationId(147),
                     DeclarationId(230),
-                    DeclarationId(2093),
-                    DeclarationId(93),
                     DeclarationId(2094),
+                    DeclarationId(93),
                     DeclarationId(2095),
+                    DeclarationId(2096),
                 ],
                 output: DeclarationId(912),
                 body: ArrowBody::Unparsed(SourceSpan::new(
@@ -28700,7 +28700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2096)),
+            meta_tag: Some(DeclarationId(2097)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![])),
@@ -28715,11 +28715,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UserMessage".to_string(),
-                        ty: DeclarationId(2098),
+                        ty: DeclarationId(2099),
                     },
                     Field {
                         label: "AssistantMessage".to_string(),
-                        ty: DeclarationId(2100),
+                        ty: DeclarationId(2101),
                     },
                 ],
             },
@@ -28740,11 +28740,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Base64Image".to_string(),
-                        ty: DeclarationId(2101),
+                        ty: DeclarationId(2102),
                     },
                     Field {
                         label: "UrlImage".to_string(),
-                        ty: DeclarationId(2102),
+                        ty: DeclarationId(2103),
                     },
                 ],
             },
@@ -28765,11 +28765,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "TextContent".to_string(),
-                        ty: DeclarationId(2103),
+                        ty: DeclarationId(2104),
                     },
                     Field {
                         label: "ImageContent".to_string(),
-                        ty: DeclarationId(2104),
+                        ty: DeclarationId(2105),
                     },
                 ],
             },
@@ -28828,11 +28828,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ToolResultText".to_string(),
-                        ty: DeclarationId(2105),
+                        ty: DeclarationId(2106),
                     },
                     Field {
                         label: "ToolResultBlocks".to_string(),
-                        ty: DeclarationId(2107),
+                        ty: DeclarationId(2108),
                     },
                 ],
             },
@@ -28852,7 +28852,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Text".to_string(),
-                    ty: DeclarationId(2108),
+                    ty: DeclarationId(2109),
                 }],
             },
             type_params: vec![],
@@ -28871,7 +28871,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "TextPlain".to_string(),
-                    ty: DeclarationId(2109),
+                    ty: DeclarationId(2110),
                 }],
             },
             type_params: vec![],
@@ -28916,23 +28916,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "AnthropicTextBlock".to_string(),
-                        ty: DeclarationId(2110),
+                        ty: DeclarationId(2111),
                     },
                     Field {
                         label: "AnthropicImageBlock".to_string(),
-                        ty: DeclarationId(2111),
+                        ty: DeclarationId(2112),
                     },
                     Field {
                         label: "AnthropicDocumentBlock".to_string(),
-                        ty: DeclarationId(2112),
+                        ty: DeclarationId(2113),
                     },
                     Field {
                         label: "AnthropicSearchResultBlock".to_string(),
-                        ty: DeclarationId(2116),
+                        ty: DeclarationId(2117),
                     },
                     Field {
                         label: "AnthropicToolReferenceBlock".to_string(),
-                        ty: DeclarationId(2117),
+                        ty: DeclarationId(2118),
                     },
                 ],
             },
@@ -28982,11 +28982,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UserTextBlock".to_string(),
-                        ty: DeclarationId(2118),
+                        ty: DeclarationId(2119),
                     },
                     Field {
                         label: "UserToolResultBlock".to_string(),
-                        ty: DeclarationId(2121),
+                        ty: DeclarationId(2122),
                     },
                 ],
             },
@@ -29007,11 +29007,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "AssistantTextBlock".to_string(),
-                        ty: DeclarationId(2122),
+                        ty: DeclarationId(2123),
                     },
                     Field {
                         label: "AssistantToolUseBlock".to_string(),
-                        ty: DeclarationId(2123),
+                        ty: DeclarationId(2124),
                     },
                 ],
             },
@@ -29032,31 +29032,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "EndTurn".to_string(),
-                        ty: DeclarationId(2124),
+                        ty: DeclarationId(2125),
                     },
                     Field {
                         label: "MaxTokens".to_string(),
-                        ty: DeclarationId(2125),
+                        ty: DeclarationId(2126),
                     },
                     Field {
                         label: "StopSequence".to_string(),
-                        ty: DeclarationId(2126),
+                        ty: DeclarationId(2127),
                     },
                     Field {
                         label: "ToolUse".to_string(),
-                        ty: DeclarationId(2127),
+                        ty: DeclarationId(2128),
                     },
                     Field {
                         label: "PauseTurn".to_string(),
-                        ty: DeclarationId(2128),
+                        ty: DeclarationId(2129),
                     },
                     Field {
                         label: "Refusal".to_string(),
-                        ty: DeclarationId(2129),
+                        ty: DeclarationId(2130),
                     },
                     Field {
                         label: "ModelContextWindowExceeded".to_string(),
-                        ty: DeclarationId(2130),
+                        ty: DeclarationId(2131),
                     },
                 ],
             },
@@ -29077,23 +29077,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "CharLocation".to_string(),
-                        ty: DeclarationId(2133),
+                        ty: DeclarationId(2134),
                     },
                     Field {
                         label: "PageLocation".to_string(),
-                        ty: DeclarationId(2136),
+                        ty: DeclarationId(2137),
                     },
                     Field {
                         label: "ContentBlockLocation".to_string(),
-                        ty: DeclarationId(2139),
+                        ty: DeclarationId(2140),
                     },
                     Field {
                         label: "WebSearchResultLocation".to_string(),
-                        ty: DeclarationId(2141),
+                        ty: DeclarationId(2142),
                     },
                     Field {
                         label: "SearchResultLocation".to_string(),
-                        ty: DeclarationId(2143),
+                        ty: DeclarationId(2144),
                     },
                 ],
             },
@@ -29114,27 +29114,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "MessagesTextBlock".to_string(),
-                        ty: DeclarationId(2146),
+                        ty: DeclarationId(2147),
                     },
                     Field {
                         label: "MessagesThinkingBlock".to_string(),
-                        ty: DeclarationId(2147),
+                        ty: DeclarationId(2148),
                     },
                     Field {
                         label: "MessagesRedactedThinkingBlock".to_string(),
-                        ty: DeclarationId(2148),
+                        ty: DeclarationId(2149),
                     },
                     Field {
                         label: "MessagesToolUseBlock".to_string(),
-                        ty: DeclarationId(2150),
+                        ty: DeclarationId(2151),
                     },
                     Field {
                         label: "MessagesServerToolUseBlock".to_string(),
-                        ty: DeclarationId(2152),
+                        ty: DeclarationId(2153),
                     },
                     Field {
                         label: "MessagesWebSearchToolResultBlock".to_string(),
-                        ty: DeclarationId(2154),
+                        ty: DeclarationId(2155),
                     },
                 ],
             },
@@ -29155,35 +29155,35 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "WebSearch".to_string(),
-                        ty: DeclarationId(2155),
+                        ty: DeclarationId(2156),
                     },
                     Field {
                         label: "WebFetch".to_string(),
-                        ty: DeclarationId(2156),
+                        ty: DeclarationId(2157),
                     },
                     Field {
                         label: "CodeExecution".to_string(),
-                        ty: DeclarationId(2157),
+                        ty: DeclarationId(2158),
                     },
                     Field {
                         label: "BashCodeExecution".to_string(),
-                        ty: DeclarationId(2158),
+                        ty: DeclarationId(2159),
                     },
                     Field {
                         label: "TextEditorCodeExecution".to_string(),
-                        ty: DeclarationId(2159),
+                        ty: DeclarationId(2160),
                     },
                     Field {
                         label: "ToolSearchToolRegex".to_string(),
-                        ty: DeclarationId(2160),
+                        ty: DeclarationId(2161),
                     },
                     Field {
                         label: "ToolSearchToolBm25".to_string(),
-                        ty: DeclarationId(2161),
+                        ty: DeclarationId(2162),
                     },
                     Field {
                         label: "Advisor".to_string(),
-                        ty: DeclarationId(2162),
+                        ty: DeclarationId(2163),
                     },
                 ],
             },
@@ -29212,15 +29212,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "cache_creation_input_tokens".to_string(),
-                        ty: DeclarationId(2163),
+                        ty: DeclarationId(2164),
                     },
                     Field {
                         label: "cache_read_input_tokens".to_string(),
-                        ty: DeclarationId(2164),
+                        ty: DeclarationId(2165),
                     },
                     Field {
                         label: "service_tier".to_string(),
-                        ty: DeclarationId(2165),
+                        ty: DeclarationId(2166),
                     },
                 ],
             },
@@ -29240,7 +29240,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Assistant".to_string(),
-                    ty: DeclarationId(2166),
+                    ty: DeclarationId(2167),
                 }],
             },
             type_params: vec![],
@@ -29272,7 +29272,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(2167),
+                        ty: DeclarationId(2168),
                     },
                     Field {
                         label: "model".to_string(),
@@ -29284,7 +29284,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "stop_sequence".to_string(),
-                        ty: DeclarationId(2168),
+                        ty: DeclarationId(2169),
                     },
                     Field {
                         label: "usage".to_string(),
@@ -29292,7 +29292,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "container".to_string(),
-                        ty: DeclarationId(2169),
+                        ty: DeclarationId(2170),
                     },
                 ],
             },
@@ -29342,23 +29342,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "StdAuthority".to_string(),
-                        ty: DeclarationId(2170),
+                        ty: DeclarationId(2171),
                     },
                     Field {
                         label: "V3StdAuthority".to_string(),
-                        ty: DeclarationId(2171),
+                        ty: DeclarationId(2172),
                     },
                     Field {
                         label: "V3SpecAuthority".to_string(),
-                        ty: DeclarationId(2172),
+                        ty: DeclarationId(2173),
                     },
                     Field {
                         label: "CompilerAuthority".to_string(),
-                        ty: DeclarationId(2173),
+                        ty: DeclarationId(2174),
                     },
                     Field {
                         label: "ExtdepsFixtureAuthority".to_string(),
-                        ty: DeclarationId(2174),
+                        ty: DeclarationId(2175),
                     },
                 ],
             },
@@ -29415,483 +29415,483 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "dsl/std/logic.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2170),
+                            constructor: DeclarationId(2171),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/bit.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2170),
+                            constructor: DeclarationId(2171),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/error_primitives.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2170),
+                            constructor: DeclarationId(2171),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/algebra.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2170),
+                            constructor: DeclarationId(2171),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/magnitude.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2170),
+                            constructor: DeclarationId(2171),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/machine_constraints.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2170),
+                            constructor: DeclarationId(2171),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/nat.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2170),
+                            constructor: DeclarationId(2171),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/integer.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2170),
+                            constructor: DeclarationId(2171),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/rational.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2170),
+                            constructor: DeclarationId(2171),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/float.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2170),
+                            constructor: DeclarationId(2171),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/types.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2170),
+                            constructor: DeclarationId(2171),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/string_type.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2170),
+                            constructor: DeclarationId(2171),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/unicode.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2170),
+                            constructor: DeclarationId(2171),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/render_repeat_string_bootstrap.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2170),
+                            constructor: DeclarationId(2171),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/methods.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2170),
+                            constructor: DeclarationId(2171),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/serialization.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2170),
+                            constructor: DeclarationId(2171),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/algebra.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_messages.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_operations.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_schema.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/approximate_field.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bin_shim.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bootstrap_authority.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bridge_ledger.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/clean_emission.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/computation.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/computation_model.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/coproduct_projection.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/cross_target_coverage.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/diagnostics.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/dimensions.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/effects.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/emission_provenance.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/emit_model.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/extdeps_bootstrap_fixtures.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/go_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/induction.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/integer_diagnostic_order.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lens.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lens_application.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/list.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lookup.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/methods.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/parse_surface.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/python_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/resources.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/runtime.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/rust_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/services.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/substrate.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/substrate_minimal.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/termination.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/t_ci_workflow_as_data_demo.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/timing_lens.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/tokenize.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/verification.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/workflows.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2171),
+                            constructor: DeclarationId(2172),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/v3_l1.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2172),
+                            constructor: DeclarationId(2173),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/go.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2172),
+                            constructor: DeclarationId(2173),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/python.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2172),
+                            constructor: DeclarationId(2173),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/rust.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2172),
+                            constructor: DeclarationId(2173),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/pipeline.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2173),
+                            constructor: DeclarationId(2174),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/operators.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2173),
+                            constructor: DeclarationId(2174),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/regen.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2173),
+                            constructor: DeclarationId(2174),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/languages/rust/primitives.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2174),
+                            constructor: DeclarationId(2175),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/cron_schedule_model.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2174),
+                            constructor: DeclarationId(2175),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/github/github.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2174),
+                            constructor: DeclarationId(2175),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/github/actions.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2174),
+                            constructor: DeclarationId(2175),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/github/ci.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2174),
+                            constructor: DeclarationId(2175),
                             payload: vec![],
                         },
                     ),
@@ -29909,11 +29909,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Retired".to_string(),
-                        ty: DeclarationId(2175),
+                        ty: DeclarationId(2176),
                     },
                     Field {
                         label: "Open".to_string(),
-                        ty: DeclarationId(2176),
+                        ty: DeclarationId(2177),
                     },
                 ],
             },
@@ -29979,7 +29979,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6389, 6499),
         });
-        declarations.push(Declaration { id: DeclarationId(920), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(919) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2177)), 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(2176), 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(2175), 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(2175), 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(2175), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-pb-bridge-canonical-lens-name-dispatch-closure.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(2175), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/l1_5_fixed_point_test.rs".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(2175), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/bridge_lower_helpers_patch_zero_residual_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_semantic_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2176), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-v-bridge-row-4-exact-string-deeper-detail-receipt.md".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6963, 8416) });
+        declarations.push(Declaration { id: DeclarationId(920), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(919) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2178)), 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(2177), 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(2176), 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(2176), 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(2176), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-pb-bridge-canonical-lens-name-dispatch-closure.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(2176), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/l1_5_fixed_point_test.rs".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(2176), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/bridge_lower_helpers_patch_zero_residual_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_semantic_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2177), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-v-bridge-row-4-exact-string-deeper-detail-receipt.md".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6963, 8416) });
         declarations.push(Declaration {
             id: DeclarationId(921),
             name: Some("CleanEmissionContract".to_string()),
@@ -30065,15 +30065,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "WrapEverything".to_string(),
-                        ty: DeclarationId(2178),
+                        ty: DeclarationId(2179),
                     },
                     Field {
                         label: "WrapOnlyInOperandPosition".to_string(),
-                        ty: DeclarationId(2179),
+                        ty: DeclarationId(2180),
                     },
                     Field {
                         label: "NoWrapping".to_string(),
-                        ty: DeclarationId(2180),
+                        ty: DeclarationId(2181),
                     },
                 ],
             },
@@ -30094,19 +30094,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "EmitBindingAlways".to_string(),
-                        ty: DeclarationId(2181),
+                        ty: DeclarationId(2182),
                     },
                     Field {
                         label: "EmitUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(2182),
+                        ty: DeclarationId(2183),
                     },
                     Field {
                         label: "EmitPrefixedUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(2183),
+                        ty: DeclarationId(2184),
                     },
                     Field {
                         label: "NotApplicablePatternBinding".to_string(),
-                        ty: DeclarationId(2184),
+                        ty: DeclarationId(2185),
                     },
                 ],
             },
@@ -30127,11 +30127,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "AccessFromPayloadBinding".to_string(),
-                        ty: DeclarationId(2185),
+                        ty: DeclarationId(2186),
                     },
                     Field {
                         label: "OverrideNamedFieldsAtBindingSite".to_string(),
-                        ty: DeclarationId(2186),
+                        ty: DeclarationId(2187),
                     },
                 ],
             },
@@ -30152,15 +30152,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ImportEverythingDeclared".to_string(),
-                        ty: DeclarationId(2187),
+                        ty: DeclarationId(2188),
                     },
                     Field {
                         label: "IncludeOnlyReferenced".to_string(),
-                        ty: DeclarationId(2188),
+                        ty: DeclarationId(2189),
                     },
                     Field {
                         label: "ImportPerUsageSite".to_string(),
-                        ty: DeclarationId(2189),
+                        ty: DeclarationId(2190),
                     },
                 ],
             },
@@ -30181,15 +30181,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "WrapReturnValue".to_string(),
-                        ty: DeclarationId(2190),
+                        ty: DeclarationId(2191),
                     },
                     Field {
                         label: "NoWrappingOnTerminalExpression".to_string(),
-                        ty: DeclarationId(2191),
+                        ty: DeclarationId(2192),
                     },
                     Field {
                         label: "ExplicitReturnKeyword".to_string(),
-                        ty: DeclarationId(2192),
+                        ty: DeclarationId(2193),
                     },
                 ],
             },
@@ -30210,15 +30210,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "EmitLetBindingAlways".to_string(),
-                        ty: DeclarationId(2193),
+                        ty: DeclarationId(2194),
                     },
                     Field {
                         label: "EmitLetUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(2194),
+                        ty: DeclarationId(2195),
                     },
                     Field {
                         label: "OmitLetBinding".to_string(),
-                        ty: DeclarationId(2195),
+                        ty: DeclarationId(2196),
                     },
                 ],
             },
@@ -30239,15 +30239,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "WrapBody".to_string(),
-                        ty: DeclarationId(2196),
+                        ty: DeclarationId(2197),
                     },
                     Field {
                         label: "NoWrappingOnNonComplexBody".to_string(),
-                        ty: DeclarationId(2197),
+                        ty: DeclarationId(2198),
                     },
                     Field {
                         label: "NotApplicableMatchArmBody".to_string(),
-                        ty: DeclarationId(2198),
+                        ty: DeclarationId(2199),
                     },
                 ],
             },
@@ -30305,7 +30305,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2199),
+                        ty: DeclarationId(2200),
                     },
                     Field {
                         label: "syntax_only".to_string(),
@@ -30338,19 +30338,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IgnoreVerifierOutput".to_string(),
-                        ty: DeclarationId(2200),
+                        ty: DeclarationId(2201),
                     },
                     Field {
                         label: "RequireEmptyStdout".to_string(),
-                        ty: DeclarationId(2201),
+                        ty: DeclarationId(2202),
                     },
                     Field {
                         label: "RequireEmptyStderr".to_string(),
-                        ty: DeclarationId(2202),
+                        ty: DeclarationId(2203),
                     },
                     Field {
                         label: "RequireEmptyStdoutAndStderr".to_string(),
-                        ty: DeclarationId(2203),
+                        ty: DeclarationId(2204),
                     },
                 ],
             },
@@ -30371,35 +30371,35 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "CollectionSize".to_string(),
-                        ty: DeclarationId(2210),
+                        ty: DeclarationId(2211),
                     },
                     Field {
                         label: "ParserStreamSize".to_string(),
-                        ty: DeclarationId(2211),
+                        ty: DeclarationId(2212),
                     },
                     Field {
                         label: "WorklistDrainSize".to_string(),
-                        ty: DeclarationId(2212),
+                        ty: DeclarationId(2213),
                     },
                     Field {
                         label: "TreeSize".to_string(),
-                        ty: DeclarationId(2213),
+                        ty: DeclarationId(2214),
                     },
                     Field {
                         label: "ArithmeticParam".to_string(),
-                        ty: DeclarationId(2214),
+                        ty: DeclarationId(2215),
                     },
                     Field {
                         label: "ExplicitCountZero".to_string(),
-                        ty: DeclarationId(2215),
+                        ty: DeclarationId(2216),
                     },
                     Field {
                         label: "ExplicitCountPositive".to_string(),
-                        ty: DeclarationId(2216),
+                        ty: DeclarationId(2217),
                     },
                     Field {
                         label: "Forever".to_string(),
-                        ty: DeclarationId(2217),
+                        ty: DeclarationId(2218),
                     },
                 ],
             },
@@ -30442,35 +30442,35 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ChildAccessorCall".to_string(),
-                        ty: DeclarationId(2218),
+                        ty: DeclarationId(2219),
                     },
                     Field {
                         label: "CollectionShrinkCall".to_string(),
-                        ty: DeclarationId(2219),
+                        ty: DeclarationId(2220),
                     },
                     Field {
                         label: "ArithmeticSubtractCall".to_string(),
-                        ty: DeclarationId(2220),
+                        ty: DeclarationId(2221),
                     },
                     Field {
                         label: "ArithmeticDivideCall".to_string(),
-                        ty: DeclarationId(2221),
+                        ty: DeclarationId(2222),
                     },
                     Field {
                         label: "ParserAdvanceCall".to_string(),
-                        ty: DeclarationId(2222),
+                        ty: DeclarationId(2223),
                     },
                     Field {
                         label: "WorklistDrainCall".to_string(),
-                        ty: DeclarationId(2223),
+                        ty: DeclarationId(2224),
                     },
                     Field {
                         label: "FoldBodyCall".to_string(),
-                        ty: DeclarationId(2224),
+                        ty: DeclarationId(2225),
                     },
                     Field {
                         label: "SameArgumentCall".to_string(),
-                        ty: DeclarationId(2225),
+                        ty: DeclarationId(2226),
                     },
                 ],
             },
@@ -30489,7 +30489,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("per_call_pattern_at".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-                output: DeclarationId(2204),
+                output: DeclarationId(2205),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     2764,
@@ -30511,7 +30511,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("per_call_descent_operand_port".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-                output: DeclarationId(2205),
+                output: DeclarationId(2206),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     2969,
@@ -30535,15 +30535,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UnitShrink".to_string(),
-                        ty: DeclarationId(2226),
+                        ty: DeclarationId(2227),
                     },
                     Field {
                         label: "ConstantShrink".to_string(),
-                        ty: DeclarationId(2227),
+                        ty: DeclarationId(2228),
                     },
                     Field {
                         label: "ProportionalShrink".to_string(),
-                        ty: DeclarationId(2228),
+                        ty: DeclarationId(2229),
                     },
                 ],
             },
@@ -30564,15 +30564,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Fold".to_string(),
-                        ty: DeclarationId(2229),
+                        ty: DeclarationId(2230),
                     },
                     Field {
                         label: "Descend".to_string(),
-                        ty: DeclarationId(2230),
+                        ty: DeclarationId(2231),
                     },
                     Field {
                         label: "Repeat".to_string(),
-                        ty: DeclarationId(2231),
+                        ty: DeclarationId(2232),
                     },
                 ],
             },
@@ -30605,7 +30605,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "factor".to_string(),
-                        ty: DeclarationId(2232),
+                        ty: DeclarationId(2233),
                     },
                 ],
             },
@@ -30646,7 +30646,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("size_bound_param".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(933)],
-                output: DeclarationId(2206),
+                output: DeclarationId(2207),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     5787,
@@ -30712,7 +30712,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("constant_bound_value".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(933)],
-                output: DeclarationId(2207),
+                output: DeclarationId(2208),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     6715,
@@ -30736,15 +30736,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "TreeDescent".to_string(),
-                        ty: DeclarationId(2233),
+                        ty: DeclarationId(2234),
                     },
                     Field {
                         label: "CollectionFold".to_string(),
-                        ty: DeclarationId(2234),
+                        ty: DeclarationId(2235),
                     },
                     Field {
                         label: "ArithmeticRepeat".to_string(),
-                        ty: DeclarationId(2235),
+                        ty: DeclarationId(2236),
                     },
                 ],
             },
@@ -30763,7 +30763,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("algebra_profile_to_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(53)],
-                output: DeclarationId(2208),
+                output: DeclarationId(2209),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     7781,
@@ -30785,7 +30785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("type_iteration_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230)],
-                output: DeclarationId(2209),
+                output: DeclarationId(2210),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     8346,
@@ -30809,11 +30809,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Immutable".to_string(),
-                        ty: DeclarationId(2236),
+                        ty: DeclarationId(2237),
                     },
                     Field {
                         label: "Mutable".to_string(),
-                        ty: DeclarationId(2237),
+                        ty: DeclarationId(2238),
                     },
                 ],
             },
@@ -30834,11 +30834,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Pure".to_string(),
-                        ty: DeclarationId(2238),
+                        ty: DeclarationId(2239),
                     },
                     Field {
                         label: "Effectful".to_string(),
-                        ty: DeclarationId(2239),
+                        ty: DeclarationId(2240),
                     },
                 ],
             },
@@ -30859,11 +30859,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ExplicitDAG".to_string(),
-                        ty: DeclarationId(2240),
+                        ty: DeclarationId(2241),
                     },
                     Field {
                         label: "Arbitrary".to_string(),
-                        ty: DeclarationId(2241),
+                        ty: DeclarationId(2242),
                     },
                 ],
             },
@@ -30884,11 +30884,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Bounded".to_string(),
-                        ty: DeclarationId(2242),
+                        ty: DeclarationId(2243),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(2243),
+                        ty: DeclarationId(2244),
                     },
                 ],
             },
@@ -30952,28 +30952,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "mutability".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2236),
+                            constructor: DeclarationId(2237),
                             payload: vec![],
                         },
                     ),
                     (
                         "purity".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2238),
+                            constructor: DeclarationId(2239),
                             payload: vec![],
                         },
                     ),
                     (
                         "structure".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2240),
+                            constructor: DeclarationId(2241),
                             payload: vec![],
                         },
                     ),
                     (
                         "iteration".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2242),
+                            constructor: DeclarationId(2243),
                             payload: vec![],
                         },
                     ),
@@ -30990,19 +30990,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ValueOnly".to_string(),
-                        ty: DeclarationId(2244),
+                        ty: DeclarationId(2245),
                     },
                     Field {
                         label: "GarbageCollected".to_string(),
-                        ty: DeclarationId(2245),
+                        ty: DeclarationId(2246),
                     },
                     Field {
                         label: "RefCounted".to_string(),
-                        ty: DeclarationId(2246),
+                        ty: DeclarationId(2247),
                     },
                     Field {
                         label: "OwnershipBased".to_string(),
-                        ty: DeclarationId(2247),
+                        ty: DeclarationId(2248),
                     },
                 ],
             },
@@ -31023,11 +31023,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LexicalScoping".to_string(),
-                        ty: DeclarationId(2248),
+                        ty: DeclarationId(2249),
                     },
                     Field {
                         label: "DynamicScoping".to_string(),
-                        ty: DeclarationId(2249),
+                        ty: DeclarationId(2250),
                     },
                 ],
             },
@@ -31072,7 +31072,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "excluded_prefixes".to_string(),
-                    ty: DeclarationId(2250),
+                    ty: DeclarationId(2251),
                 }],
             },
             type_params: vec![],
@@ -31096,7 +31096,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "additional_excluded_prefixes".to_string(),
-                        ty: DeclarationId(2251),
+                        ty: DeclarationId(2252),
                     },
                 ],
             },
@@ -31144,11 +31144,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "OwnershipBased".to_string(),
-                        ty: DeclarationId(2252),
+                        ty: DeclarationId(2253),
                     },
                     Field {
                         label: "GarbageCollected".to_string(),
-                        ty: DeclarationId(2253),
+                        ty: DeclarationId(2254),
                     },
                 ],
             },
@@ -31185,7 +31185,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "StringTag".to_string(),
-                    ty: DeclarationId(2254),
+                    ty: DeclarationId(2255),
                 }],
             },
             type_params: vec![],
@@ -31205,11 +31205,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Empty".to_string(),
-                        ty: DeclarationId(2255),
+                        ty: DeclarationId(2256),
                     },
                     Field {
                         label: "Populated".to_string(),
-                        ty: DeclarationId(2256),
+                        ty: DeclarationId(2257),
                     },
                 ],
             },
@@ -31263,7 +31263,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "variant_projections".to_string(),
-                        ty: DeclarationId(2257),
+                        ty: DeclarationId(2258),
                     },
                 ],
             },
@@ -31364,27 +31364,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Atom".to_string(),
-                        ty: DeclarationId(2258),
+                        ty: DeclarationId(2259),
                     },
                     Field {
                         label: "Conj".to_string(),
-                        ty: DeclarationId(2259),
+                        ty: DeclarationId(2260),
                     },
                     Field {
                         label: "Disj".to_string(),
-                        ty: DeclarationId(2260),
+                        ty: DeclarationId(2261),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2261),
+                        ty: DeclarationId(2262),
                     },
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(2262),
+                        ty: DeclarationId(2263),
                     },
                     Field {
                         label: "Instantiation".to_string(),
-                        ty: DeclarationId(2263),
+                        ty: DeclarationId(2264),
                     },
                 ],
             },
@@ -31405,23 +31405,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Value".to_string(),
-                        ty: DeclarationId(2264),
+                        ty: DeclarationId(2265),
                     },
                     Field {
                         label: "Transform".to_string(),
-                        ty: DeclarationId(2265),
+                        ty: DeclarationId(2266),
                     },
                     Field {
                         label: "Branch".to_string(),
-                        ty: DeclarationId(2266),
+                        ty: DeclarationId(2267),
                     },
                     Field {
                         label: "Loop".to_string(),
-                        ty: DeclarationId(2267),
+                        ty: DeclarationId(2268),
                     },
                     Field {
                         label: "Bind".to_string(),
-                        ty: DeclarationId(2268),
+                        ty: DeclarationId(2269),
                     },
                 ],
             },
@@ -31496,7 +31496,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "cells".to_string(),
-                        ty: DeclarationId(2269),
+                        ty: DeclarationId(2270),
                     },
                 ],
             },
@@ -31522,7 +31522,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2270)),
+            meta_tag: Some(DeclarationId(2271)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -31549,14 +31549,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -31586,14 +31586,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -31623,14 +31623,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -31660,14 +31660,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -31697,14 +31697,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -31734,14 +31734,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -31771,14 +31771,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -31808,14 +31808,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -31845,14 +31845,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -31882,14 +31882,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -31919,14 +31919,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -31956,14 +31956,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -31993,14 +31993,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -32030,14 +32030,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -32067,14 +32067,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -32104,14 +32104,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -32141,14 +32141,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -32178,14 +32178,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -32215,14 +32215,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -32252,14 +32252,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -32289,14 +32289,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -32326,14 +32326,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -32363,14 +32363,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -32400,14 +32400,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -32437,14 +32437,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -32474,14 +32474,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -32511,14 +32511,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -32548,14 +32548,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -32585,14 +32585,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -32622,14 +32622,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -32659,14 +32659,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -32696,14 +32696,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -32733,14 +32733,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -32770,14 +32770,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -32807,14 +32807,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -32844,14 +32844,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -32881,14 +32881,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -32918,14 +32918,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -32955,14 +32955,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -32992,14 +32992,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -33029,14 +33029,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2262),
+                                    constructor: DeclarationId(2263),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2265),
+                                    constructor: DeclarationId(2266),
                                     payload: vec![],
                                 },
                             ),
@@ -33055,43 +33055,43 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-                        ty: DeclarationId(2271),
+                        ty: DeclarationId(2272),
                     },
                     Field {
                         label: "ParseError".to_string(),
-                        ty: DeclarationId(2272),
+                        ty: DeclarationId(2273),
                     },
                     Field {
                         label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(2273),
+                        ty: DeclarationId(2274),
                     },
                     Field {
                         label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(2274),
+                        ty: DeclarationId(2275),
                     },
                     Field {
                         label: "ResolveError".to_string(),
-                        ty: DeclarationId(2275),
+                        ty: DeclarationId(2276),
                     },
                     Field {
                         label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(2276),
+                        ty: DeclarationId(2277),
                     },
                     Field {
                         label: "BranchConditionNotBool".to_string(),
-                        ty: DeclarationId(2277),
+                        ty: DeclarationId(2278),
                     },
                     Field {
                         label: "MagnitudeOutOfRange".to_string(),
-                        ty: DeclarationId(2278),
+                        ty: DeclarationId(2279),
                     },
                     Field {
                         label: "MalformedIntegerRangeFact".to_string(),
-                        ty: DeclarationId(2279),
+                        ty: DeclarationId(2280),
                     },
                     Field {
                         label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(2280),
+                        ty: DeclarationId(2281),
                     },
                 ],
             },
@@ -33185,11 +33185,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "CompilerKind".to_string(),
-                        ty: DeclarationId(2281),
+                        ty: DeclarationId(2282),
                     },
                     Field {
                         label: "LensInstanceKind".to_string(),
-                        ty: DeclarationId(2282),
+                        ty: DeclarationId(2283),
                     },
                 ],
             },
@@ -33222,7 +33222,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "fixes".to_string(),
-                        ty: DeclarationId(2283),
+                        ty: DeclarationId(2284),
                     },
                 ],
             },
@@ -33243,31 +33243,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UnderRefined".to_string(),
-                        ty: DeclarationId(2284),
+                        ty: DeclarationId(2285),
                     },
                     Field {
                         label: "NoInhabitant".to_string(),
-                        ty: DeclarationId(2285),
+                        ty: DeclarationId(2286),
                     },
                     Field {
                         label: "ContradictoryUse".to_string(),
-                        ty: DeclarationId(2287),
+                        ty: DeclarationId(2288),
                     },
                     Field {
                         label: "OutOfR2Scope".to_string(),
-                        ty: DeclarationId(2288),
+                        ty: DeclarationId(2289),
                     },
                     Field {
                         label: "LifetimeProgramExtractionPending".to_string(),
-                        ty: DeclarationId(2289),
+                        ty: DeclarationId(2290),
                     },
                     Field {
                         label: "FoldNotImplemented".to_string(),
-                        ty: DeclarationId(2290),
+                        ty: DeclarationId(2291),
                     },
                     Field {
                         label: "MissingEmissionPath".to_string(),
-                        ty: DeclarationId(2291),
+                        ty: DeclarationId(2292),
                     },
                 ],
             },
@@ -33288,11 +33288,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Inhabits".to_string(),
-                        ty: DeclarationId(2306),
+                        ty: DeclarationId(2307),
                     },
                     Field {
                         label: "Violates".to_string(),
-                        ty: DeclarationId(2307),
+                        ty: DeclarationId(2308),
                     },
                 ],
             },
@@ -33327,11 +33327,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoDiagnostic".to_string(),
-                        ty: DeclarationId(2308),
+                        ty: DeclarationId(2309),
                     },
                     Field {
                         label: "SomeDiagnostic".to_string(),
-                        ty: DeclarationId(2309),
+                        ty: DeclarationId(2310),
                     },
                 ],
             },
@@ -33352,11 +33352,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DimensionOk".to_string(),
-                        ty: DeclarationId(2312),
+                        ty: DeclarationId(2313),
                     },
                     Field {
                         label: "DimensionFail".to_string(),
-                        ty: DeclarationId(2316),
+                        ty: DeclarationId(2317),
                     },
                 ],
             },
@@ -33395,15 +33395,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "witness_of".to_string(),
-                        ty: DeclarationId(2318),
+                        ty: DeclarationId(2319),
                     },
                     Field {
                         label: "compose".to_string(),
-                        ty: DeclarationId(2319),
+                        ty: DeclarationId(2320),
                     },
                     Field {
                         label: "break_diagnostic".to_string(),
-                        ty: DeclarationId(2320),
+                        ty: DeclarationId(2321),
                     },
                 ],
             },
@@ -33443,7 +33443,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             type_params: vec![DeclarationId(992), DeclarationId(993)],
             phantom_params: vec![PhantomParameter {
                 parameter: DeclarationId(992),
-                algebra: DeclarationId(2321),
+                algebra: DeclarationId(2322),
             }],
             meta_tag: None,
             specialization_parent: None,
@@ -33584,11 +33584,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("add_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(2292),
                     DeclarationId(2293),
                     DeclarationId(2294),
+                    DeclarationId(2295),
                 ],
-                output: DeclarationId(2295),
+                output: DeclarationId(2296),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4966, 4988)),
             },
             type_params: vec![DeclarationId(1002), DeclarationId(1003)],
@@ -33634,11 +33634,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("sub_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(2296),
                     DeclarationId(2297),
                     DeclarationId(2298),
+                    DeclarationId(2299),
                 ],
-                output: DeclarationId(2299),
+                output: DeclarationId(2300),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5162, 5184)),
             },
             type_params: vec![DeclarationId(1005), DeclarationId(1006)],
@@ -33684,11 +33684,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("mul_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(2300),
                     DeclarationId(2301),
+                    DeclarationId(2302),
                     DeclarationId(1009),
                 ],
-                output: DeclarationId(2302),
+                output: DeclarationId(2303),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5350, 5379)),
             },
             type_params: vec![DeclarationId(1008), DeclarationId(1009)],
@@ -33734,11 +33734,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("div_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(2303),
                     DeclarationId(2304),
+                    DeclarationId(2305),
                     DeclarationId(1012),
                 ],
-                output: DeclarationId(2305),
+                output: DeclarationId(2306),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5545, 5574)),
             },
             type_params: vec![DeclarationId(1011), DeclarationId(1012)],
@@ -33803,11 +33803,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoSourceSpan".to_string(),
-                        ty: DeclarationId(2322),
+                        ty: DeclarationId(2323),
                     },
                     Field {
                         label: "SomeSourceSpan".to_string(),
-                        ty: DeclarationId(2323),
+                        ty: DeclarationId(2324),
                     },
                 ],
             },
@@ -33873,7 +33873,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2324),
+                        ty: DeclarationId(2325),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -33935,15 +33935,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "BoundUnspecified".to_string(),
-                        ty: DeclarationId(2325),
+                        ty: DeclarationId(2326),
                     },
                     Field {
                         label: "StaticBoundFact".to_string(),
-                        ty: DeclarationId(2326),
+                        ty: DeclarationId(2327),
                     },
                     Field {
                         label: "PlatformDependentFact".to_string(),
-                        ty: DeclarationId(2327),
+                        ty: DeclarationId(2328),
                     },
                 ],
             },
@@ -33993,11 +33993,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DirectField".to_string(),
-                        ty: DeclarationId(2328),
+                        ty: DeclarationId(2329),
                     },
                     Field {
                         label: "AccessorMethod".to_string(),
-                        ty: DeclarationId(2329),
+                        ty: DeclarationId(2330),
                     },
                 ],
             },
@@ -34100,7 +34100,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "parameters".to_string(),
-                        ty: DeclarationId(2330),
+                        ty: DeclarationId(2331),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -34150,11 +34150,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Borrowed".to_string(),
-                        ty: DeclarationId(2331),
+                        ty: DeclarationId(2332),
                     },
                     Field {
                         label: "Consumed".to_string(),
-                        ty: DeclarationId(2332),
+                        ty: DeclarationId(2333),
                     },
                 ],
             },
@@ -34175,11 +34175,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Owned".to_string(),
-                        ty: DeclarationId(2333),
+                        ty: DeclarationId(2334),
                     },
                     Field {
                         label: "Borrowed".to_string(),
-                        ty: DeclarationId(2334),
+                        ty: DeclarationId(2335),
                     },
                 ],
             },
@@ -34200,11 +34200,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "SelfContained".to_string(),
-                        ty: DeclarationId(2335),
+                        ty: DeclarationId(2336),
                     },
                     Field {
                         label: "Caller".to_string(),
-                        ty: DeclarationId(2336),
+                        ty: DeclarationId(2337),
                     },
                 ],
             },
@@ -34225,15 +34225,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Growable".to_string(),
-                        ty: DeclarationId(2337),
+                        ty: DeclarationId(2338),
                     },
                     Field {
                         label: "Fixed".to_string(),
-                        ty: DeclarationId(2338),
+                        ty: DeclarationId(2339),
                     },
                     Field {
                         label: "NotApplicable".to_string(),
-                        ty: DeclarationId(2339),
+                        ty: DeclarationId(2340),
                     },
                 ],
             },
@@ -34253,7 +34253,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Utf8FreeMonoidChar".to_string(),
-                    ty: DeclarationId(2340),
+                    ty: DeclarationId(2341),
                 }],
             },
             type_params: vec![],
@@ -34351,43 +34351,43 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ListEmpty".to_string(),
-                        ty: DeclarationId(2341),
+                        ty: DeclarationId(2342),
                     },
                     Field {
                         label: "ListSingleton".to_string(),
-                        ty: DeclarationId(2342),
+                        ty: DeclarationId(2343),
                     },
                     Field {
                         label: "ListCons".to_string(),
-                        ty: DeclarationId(2343),
+                        ty: DeclarationId(2344),
                     },
                     Field {
                         label: "ListConcat".to_string(),
-                        ty: DeclarationId(2344),
+                        ty: DeclarationId(2345),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(2345),
+                        ty: DeclarationId(2346),
                     },
                     Field {
                         label: "ListIsEmpty".to_string(),
-                        ty: DeclarationId(2346),
+                        ty: DeclarationId(2347),
                     },
                     Field {
                         label: "ListFold".to_string(),
-                        ty: DeclarationId(2347),
+                        ty: DeclarationId(2348),
                     },
                     Field {
                         label: "ListMap".to_string(),
-                        ty: DeclarationId(2348),
+                        ty: DeclarationId(2349),
                     },
                     Field {
                         label: "ListFilter".to_string(),
-                        ty: DeclarationId(2349),
+                        ty: DeclarationId(2350),
                     },
                     Field {
                         label: "ListContains".to_string(),
-                        ty: DeclarationId(2350),
+                        ty: DeclarationId(2351),
                     },
                 ],
             },
@@ -34469,11 +34469,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "PlaceholderPatternStrategy".to_string(),
-                        ty: DeclarationId(2351),
+                        ty: DeclarationId(2352),
                     },
                     Field {
                         label: "VectorList".to_string(),
-                        ty: DeclarationId(2352),
+                        ty: DeclarationId(2353),
                     },
                 ],
             },
@@ -34952,11 +34952,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Borrow".to_string(),
-                        ty: DeclarationId(2353),
+                        ty: DeclarationId(2354),
                     },
                     Field {
                         label: "PassByValue".to_string(),
-                        ty: DeclarationId(2354),
+                        ty: DeclarationId(2355),
                     },
                 ],
             },
@@ -34977,11 +34977,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "CopyOrClone".to_string(),
-                        ty: DeclarationId(2355),
+                        ty: DeclarationId(2356),
                     },
                     Field {
                         label: "PassByValue".to_string(),
-                        ty: DeclarationId(2356),
+                        ty: DeclarationId(2357),
                     },
                 ],
             },
@@ -35067,11 +35067,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IndexedArgs".to_string(),
-                        ty: DeclarationId(2357),
+                        ty: DeclarationId(2358),
                     },
                     Field {
                         label: "NamedArg".to_string(),
-                        ty: DeclarationId(2358),
+                        ty: DeclarationId(2359),
                     },
                 ],
             },
@@ -35092,11 +35092,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "SingleTemplate".to_string(),
-                        ty: DeclarationId(2359),
+                        ty: DeclarationId(2360),
                     },
                     Field {
                         label: "HigherOrderTemplates".to_string(),
-                        ty: DeclarationId(2360),
+                        ty: DeclarationId(2361),
                     },
                 ],
             },
@@ -35363,7 +35363,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({left}, {right}...)".to_string(),
                             ))],
@@ -35376,7 +35376,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -35414,7 +35414,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "int64(len({recv}))".to_string(),
                             ))],
@@ -35427,7 +35427,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -35465,7 +35465,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv}) == 0".to_string(),
                             ))],
@@ -35478,7 +35478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -35518,7 +35518,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "/* fold({recv}, {init}, {body}) */".to_string(),
                             ))],
@@ -35531,7 +35531,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -35571,7 +35571,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "/* map({recv}, {body}) */".to_string(),
                             ))],
@@ -35584,7 +35584,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -35624,7 +35624,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Filter({recv}, {arg})".to_string(),
                             ))],
@@ -35637,7 +35637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -35677,7 +35677,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Any({recv}, {arg})".to_string(),
                             ))],
@@ -35690,7 +35690,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -35730,7 +35730,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.All({recv}, {arg})".to_string(),
                             ))],
@@ -35743,7 +35743,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -35783,7 +35783,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.FlatMap({recv}, {arg})".to_string(),
                             ))],
@@ -35796,7 +35796,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -35818,7 +35818,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2361)),
+            meta_tag: Some(DeclarationId(2362)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -35837,7 +35837,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -35850,7 +35850,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -35872,7 +35872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Join({recv}, {arg})".to_string(),
                             ))],
@@ -35885,7 +35885,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -35907,7 +35907,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Split({recv}, {arg})".to_string(),
                             ))],
@@ -35920,7 +35920,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -35944,7 +35944,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -35957,7 +35957,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -35977,7 +35977,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -35990,7 +35990,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -36012,7 +36012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.SortBy({recv}, {arg})".to_string(),
                             ))],
@@ -36025,7 +36025,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -36047,7 +36047,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({recv}, {arg})".to_string(),
                             ))],
@@ -36060,7 +36060,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -36082,7 +36082,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Contains({recv}, {arg})".to_string(),
                             ))],
@@ -36095,7 +36095,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -36112,23 +36112,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DirectRecursion".to_string(),
-                        ty: DeclarationId(2375),
+                        ty: DeclarationId(2376),
                     },
                     Field {
                         label: "ListRecursion".to_string(),
-                        ty: DeclarationId(2376),
+                        ty: DeclarationId(2377),
                     },
                     Field {
                         label: "OptionalRecursion".to_string(),
-                        ty: DeclarationId(2377),
+                        ty: DeclarationId(2378),
                     },
                     Field {
                         label: "SetRecursion".to_string(),
-                        ty: DeclarationId(2378),
+                        ty: DeclarationId(2379),
                     },
                     Field {
                         label: "MapValueRecursion".to_string(),
-                        ty: DeclarationId(2379),
+                        ty: DeclarationId(2380),
                     },
                 ],
             },
@@ -36240,23 +36240,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "StrictSubValue".to_string(),
-                        ty: DeclarationId(2380),
+                        ty: DeclarationId(2381),
                     },
                     Field {
                         label: "IteratedSubValue".to_string(),
-                        ty: DeclarationId(2381),
+                        ty: DeclarationId(2382),
                     },
                     Field {
                         label: "ArithmeticDescent".to_string(),
-                        ty: DeclarationId(2382),
+                        ty: DeclarationId(2383),
                     },
                     Field {
                         label: "PreservedValue".to_string(),
-                        ty: DeclarationId(2383),
+                        ty: DeclarationId(2384),
                     },
                     Field {
                         label: "SubValueUnknown".to_string(),
-                        ty: DeclarationId(2384),
+                        ty: DeclarationId(2385),
                     },
                 ],
             },
@@ -36407,7 +36407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("sub_value_to_call_pattern".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1073)],
-                output: DeclarationId(2362),
+                output: DeclarationId(2363),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     20571,
@@ -36429,7 +36429,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("sub_value_to_lowering_target".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1073)],
-                output: DeclarationId(2363),
+                output: DeclarationId(2364),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     21959,
@@ -36453,19 +36453,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IntegerExpZero".to_string(),
-                        ty: DeclarationId(2385),
+                        ty: DeclarationId(2386),
                     },
                     Field {
                         label: "IntegerExpPos".to_string(),
-                        ty: DeclarationId(2386),
+                        ty: DeclarationId(2387),
                     },
                     Field {
                         label: "FractionExp".to_string(),
-                        ty: DeclarationId(2387),
+                        ty: DeclarationId(2388),
                     },
                     Field {
                         label: "LogBasedExp".to_string(),
-                        ty: DeclarationId(2388),
+                        ty: DeclarationId(2389),
                     },
                 ],
             },
@@ -36508,11 +36508,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "PolyCost".to_string(),
-                        ty: DeclarationId(2389),
+                        ty: DeclarationId(2390),
                     },
                     Field {
                         label: "LogCost".to_string(),
-                        ty: DeclarationId(2390),
+                        ty: DeclarationId(2391),
                     },
                 ],
             },
@@ -36533,31 +36533,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ConstantBound".to_string(),
-                        ty: DeclarationId(2391),
+                        ty: DeclarationId(2392),
                     },
                     Field {
                         label: "AtomicBound".to_string(),
-                        ty: DeclarationId(2392),
+                        ty: DeclarationId(2393),
                     },
                     Field {
                         label: "ProductBound".to_string(),
-                        ty: DeclarationId(2394),
+                        ty: DeclarationId(2395),
                     },
                     Field {
                         label: "SumOfProductsBound".to_string(),
-                        ty: DeclarationId(2397),
+                        ty: DeclarationId(2398),
                     },
                     Field {
                         label: "SumBound".to_string(),
-                        ty: DeclarationId(2399),
+                        ty: DeclarationId(2400),
                     },
                     Field {
                         label: "ForeverBound".to_string(),
-                        ty: DeclarationId(2400),
+                        ty: DeclarationId(2401),
                     },
                     Field {
                         label: "ErrorBound".to_string(),
-                        ty: DeclarationId(2401),
+                        ty: DeclarationId(2402),
                     },
                 ],
             },
@@ -36575,7 +36575,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1086),
             name: Some("sum_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2364)],
+                inputs: vec![DeclarationId(2365)],
                 output: DeclarationId(1085),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -36655,7 +36655,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1090),
             name: Some("product_atoms_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2365)],
+                inputs: vec![DeclarationId(2366)],
                 output: DeclarationId(849),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -36677,7 +36677,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1091),
             name: Some("product_term_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2366)],
+                inputs: vec![DeclarationId(2367)],
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(555))),
             },
@@ -36695,7 +36695,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1092),
             name: Some("sum_products_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2368)],
+                inputs: vec![DeclarationId(2369)],
                 output: DeclarationId(849),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -36949,7 +36949,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("int_add_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(2369),
+                output: DeclarationId(2370),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33617,
@@ -36971,7 +36971,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("int_mul_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(2370),
+                output: DeclarationId(2371),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33913,
@@ -36993,7 +36993,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("bounded_int_pow_exponent".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(2371),
+                output: DeclarationId(2372),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35162,
@@ -37015,7 +37015,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("int_pow_bounded".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(2372),
+                output: DeclarationId(2373),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35637,
@@ -37037,7 +37037,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("ceil_log".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(2373),
+                output: DeclarationId(2374),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     36900,
@@ -37064,7 +37064,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     DeclarationId(93),
                     DeclarationId(93),
                 ],
-                output: DeclarationId(2374),
+                output: DeclarationId(2375),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     37172,
@@ -37472,7 +37472,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2402)),
+            meta_tag: Some(DeclarationId(2403)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -37498,7 +37498,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2403)),
+            meta_tag: Some(DeclarationId(2404)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -37523,23 +37523,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "read".to_string(),
-                        ty: DeclarationId(2405),
+                        ty: DeclarationId(2406),
                     },
                     Field {
                         label: "sequential".to_string(),
-                        ty: DeclarationId(2406),
+                        ty: DeclarationId(2407),
                     },
                     Field {
                         label: "branch".to_string(),
-                        ty: DeclarationId(2407),
+                        ty: DeclarationId(2408),
                     },
                     Field {
                         label: "iterate".to_string(),
-                        ty: DeclarationId(2408),
+                        ty: DeclarationId(2409),
                     },
                     Field {
                         label: "validate".to_string(),
-                        ty: DeclarationId(2409),
+                        ty: DeclarationId(2410),
                     },
                 ],
             },
@@ -37574,11 +37574,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DeclarationScope".to_string(),
-                        ty: DeclarationId(2410),
+                        ty: DeclarationId(2411),
                     },
                     Field {
                         label: "NodeScope".to_string(),
-                        ty: DeclarationId(2411),
+                        ty: DeclarationId(2412),
                     },
                 ],
             },
@@ -37598,7 +37598,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Error".to_string(),
-                    ty: DeclarationId(2412),
+                    ty: DeclarationId(2413),
                 }],
             },
             type_params: vec![],
@@ -37618,11 +37618,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "project".to_string(),
-                        ty: DeclarationId(2413),
+                        ty: DeclarationId(2414),
                     },
                     Field {
                         label: "violates".to_string(),
-                        ty: DeclarationId(2414),
+                        ty: DeclarationId(2415),
                     },
                 ],
             },
@@ -37671,11 +37671,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "lens".to_string(),
-                        ty: DeclarationId(2415),
+                        ty: DeclarationId(2416),
                     },
                     Field {
                         label: "enforcement".to_string(),
-                        ty: DeclarationId(2416),
+                        ty: DeclarationId(2417),
                     },
                 ],
             },
@@ -37724,7 +37724,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "enforceable_lens".to_string(),
-                        ty: DeclarationId(2417),
+                        ty: DeclarationId(2418),
                     },
                     Field {
                         label: "section".to_string(),
@@ -37789,7 +37789,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "lens".to_string(),
-                        ty: DeclarationId(2418),
+                        ty: DeclarationId(2419),
                     },
                     Field {
                         label: "section".to_string(),
@@ -37832,11 +37832,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Miss".to_string(),
-                        ty: DeclarationId(2421),
+                        ty: DeclarationId(2422),
                     },
                     Field {
                         label: "Hit".to_string(),
-                        ty: DeclarationId(2422),
+                        ty: DeclarationId(2423),
                     },
                 ],
             },
@@ -37869,7 +37869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("miss_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2419),
+                output: DeclarationId(2420),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4601, 4611)),
             },
             type_params: vec![],
@@ -37887,7 +37887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("hit_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(2420),
+                output: DeclarationId(2421),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4654, 4666)),
             },
             type_params: vec![],
@@ -37925,7 +37925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "items".to_string(),
-                    ty: DeclarationId(2423),
+                    ty: DeclarationId(2424),
                 }],
             },
             type_params: vec![],
@@ -37953,7 +37953,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "refinement".to_string(),
-                        ty: DeclarationId(2424),
+                        ty: DeclarationId(2425),
                     },
                 ],
             },
@@ -38028,11 +38028,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Positional".to_string(),
-                        ty: DeclarationId(2426),
+                        ty: DeclarationId(2427),
                     },
                     Field {
                         label: "Record".to_string(),
-                        ty: DeclarationId(2428),
+                        ty: DeclarationId(2429),
                     },
                 ],
             },
@@ -38053,11 +38053,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "TypeExpr".to_string(),
-                        ty: DeclarationId(2429),
+                        ty: DeclarationId(2430),
                     },
                     Field {
                         label: "WidthNatLiteral".to_string(),
-                        ty: DeclarationId(2430),
+                        ty: DeclarationId(2431),
                     },
                 ],
             },
@@ -38078,19 +38078,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Named".to_string(),
-                        ty: DeclarationId(2431),
+                        ty: DeclarationId(2432),
                     },
                     Field {
                         label: "Parameterized".to_string(),
-                        ty: DeclarationId(2433),
+                        ty: DeclarationId(2434),
                     },
                     Field {
                         label: "Optional".to_string(),
-                        ty: DeclarationId(2434),
+                        ty: DeclarationId(2435),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2436),
+                        ty: DeclarationId(2437),
                     },
                 ],
             },
@@ -38231,15 +38231,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "BareVariant".to_string(),
-                        ty: DeclarationId(2437),
+                        ty: DeclarationId(2438),
                     },
                     Field {
                         label: "VariantWith".to_string(),
-                        ty: DeclarationId(2438),
+                        ty: DeclarationId(2439),
                     },
                     Field {
                         label: "VariantFields".to_string(),
-                        ty: DeclarationId(2440),
+                        ty: DeclarationId(2441),
                     },
                 ],
             },
@@ -38260,15 +38260,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Int".to_string(),
-                        ty: DeclarationId(2441),
+                        ty: DeclarationId(2442),
                     },
                     Field {
                         label: "Bool".to_string(),
-                        ty: DeclarationId(2442),
+                        ty: DeclarationId(2443),
                     },
                     Field {
                         label: "String".to_string(),
-                        ty: DeclarationId(2443),
+                        ty: DeclarationId(2444),
                     },
                 ],
             },
@@ -38289,55 +38289,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(2444),
+                        ty: DeclarationId(2445),
                     },
                     Field {
                         label: "Var".to_string(),
-                        ty: DeclarationId(2445),
+                        ty: DeclarationId(2446),
                     },
                     Field {
                         label: "Path".to_string(),
-                        ty: DeclarationId(2448),
+                        ty: DeclarationId(2449),
                     },
                     Field {
                         label: "Call".to_string(),
-                        ty: DeclarationId(2450),
+                        ty: DeclarationId(2451),
                     },
                     Field {
                         label: "PathCall".to_string(),
-                        ty: DeclarationId(2454),
+                        ty: DeclarationId(2455),
                     },
                     Field {
                         label: "VariantRecord".to_string(),
-                        ty: DeclarationId(2456),
+                        ty: DeclarationId(2457),
                     },
                     Field {
                         label: "Operator".to_string(),
-                        ty: DeclarationId(2458),
+                        ty: DeclarationId(2459),
                     },
                     Field {
                         label: "Lambda".to_string(),
-                        ty: DeclarationId(2460),
+                        ty: DeclarationId(2461),
                     },
                     Field {
                         label: "If".to_string(),
-                        ty: DeclarationId(2461),
+                        ty: DeclarationId(2462),
                     },
                     Field {
                         label: "Match".to_string(),
-                        ty: DeclarationId(2463),
+                        ty: DeclarationId(2464),
                     },
                     Field {
                         label: "Record".to_string(),
-                        ty: DeclarationId(2465),
+                        ty: DeclarationId(2466),
                     },
                     Field {
                         label: "List".to_string(),
-                        ty: DeclarationId(2467),
+                        ty: DeclarationId(2468),
                     },
                     Field {
                         label: "Map".to_string(),
-                        ty: DeclarationId(2469),
+                        ty: DeclarationId(2470),
                     },
                 ],
             },
@@ -38358,43 +38358,43 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Let".to_string(),
-                        ty: DeclarationId(2471),
+                        ty: DeclarationId(2472),
                     },
                     Field {
                         label: "Fn".to_string(),
-                        ty: DeclarationId(2474),
+                        ty: DeclarationId(2475),
                     },
                     Field {
                         label: "FnExternalBody".to_string(),
-                        ty: DeclarationId(2477),
+                        ty: DeclarationId(2478),
                     },
                     Field {
                         label: "Data".to_string(),
-                        ty: DeclarationId(2479),
+                        ty: DeclarationId(2480),
                     },
                     Field {
                         label: "Module".to_string(),
-                        ty: DeclarationId(2481),
+                        ty: DeclarationId(2482),
                     },
                     Field {
                         label: "Import".to_string(),
-                        ty: DeclarationId(2484),
+                        ty: DeclarationId(2485),
                     },
                     Field {
                         label: "TypeAtom".to_string(),
-                        ty: DeclarationId(2486),
+                        ty: DeclarationId(2487),
                     },
                     Field {
                         label: "TypeRecord".to_string(),
-                        ty: DeclarationId(2489),
+                        ty: DeclarationId(2490),
                     },
                     Field {
                         label: "TypeSum".to_string(),
-                        ty: DeclarationId(2493),
+                        ty: DeclarationId(2494),
                     },
                     Field {
                         label: "TypeAlias".to_string(),
-                        ty: DeclarationId(2496),
+                        ty: DeclarationId(2497),
                     },
                 ],
             },
@@ -38436,7 +38436,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[*{left}, *{right}]".to_string(),
                             ))],
@@ -38449,7 +38449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -38491,7 +38491,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -38504,7 +38504,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -38546,7 +38546,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "(len({recv}) == 0)".to_string(),
                             ))],
@@ -38559,7 +38559,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -38603,7 +38603,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "__v3_fold({recv}, {init}, {body})".to_string(),
                             ))],
@@ -38616,7 +38616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -38660,7 +38660,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[{body} for {item} in {recv}]".to_string(),
                             ))],
@@ -38673,7 +38673,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -38717,7 +38717,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[x for x in {recv} if {arg}(x)]".to_string(),
                             ))],
@@ -38730,7 +38730,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -38774,7 +38774,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "any({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -38787,7 +38787,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -38831,7 +38831,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "all({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -38844,7 +38844,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -38888,7 +38888,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[y for x in {recv} for y in {arg}(x)]".to_string(),
                             ))],
@@ -38901,7 +38901,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -38927,7 +38927,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2497)),
+            meta_tag: Some(DeclarationId(2498)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -38946,7 +38946,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -38959,7 +38959,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -38979,7 +38979,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg}.join({recv})".to_string(),
                             ))],
@@ -38992,7 +38992,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -39012,7 +39012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}.split({arg})".to_string(),
                             ))],
@@ -39025,7 +39025,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -39047,7 +39047,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[-1] if {recv} else None".to_string(),
                             ))],
@@ -39060,7 +39060,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -39082,7 +39082,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[0] if {recv} else None".to_string(),
                             ))],
@@ -39095,7 +39095,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -39117,7 +39117,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "list(enumerate({recv}))".to_string(),
                             ))],
@@ -39130,7 +39130,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -39152,7 +39152,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[ord(c) for c in {recv}]".to_string(),
                             ))],
@@ -39165,7 +39165,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -39189,7 +39189,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -39202,7 +39202,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -39222,7 +39222,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -39235,7 +39235,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -39257,7 +39257,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "sorted({recv}, key={arg})".to_string(),
                             ))],
@@ -39270,7 +39270,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -39290,7 +39290,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv} + [{arg}]".to_string(),
                             ))],
@@ -39303,7 +39303,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -39323,7 +39323,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg} in {recv}".to_string(),
                             ))],
@@ -39336,7 +39336,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -39434,23 +39434,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LiteralValue".to_string(),
-                        ty: DeclarationId(2499),
+                        ty: DeclarationId(2500),
                     },
                     Field {
                         label: "RecordValue".to_string(),
-                        ty: DeclarationId(2501),
+                        ty: DeclarationId(2502),
                     },
                     Field {
                         label: "VariantValue".to_string(),
-                        ty: DeclarationId(2502),
+                        ty: DeclarationId(2503),
                     },
                     Field {
                         label: "NodeRef".to_string(),
-                        ty: DeclarationId(2503),
+                        ty: DeclarationId(2504),
                     },
                     Field {
                         label: "CardinalityValue".to_string(),
-                        ty: DeclarationId(2504),
+                        ty: DeclarationId(2505),
                     },
                 ],
             },
@@ -39503,7 +39503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bindings".to_string(),
-                    ty: DeclarationId(2505),
+                    ty: DeclarationId(2506),
                 }],
             },
             type_params: vec![],
@@ -39522,7 +39522,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "frames".to_string(),
-                    ty: DeclarationId(2506),
+                    ty: DeclarationId(2507),
                 }],
             },
             type_params: vec![],
@@ -39560,7 +39560,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "ApplicativeOrder".to_string(),
-                    ty: DeclarationId(2507),
+                    ty: DeclarationId(2508),
                 }],
             },
             type_params: vec![],
@@ -39580,11 +39580,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LeftFirst".to_string(),
-                        ty: DeclarationId(2508),
+                        ty: DeclarationId(2509),
                     },
                     Field {
                         label: "RightFirst".to_string(),
-                        ty: DeclarationId(2509),
+                        ty: DeclarationId(2510),
                     },
                 ],
             },
@@ -39635,7 +39635,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1185),
             name: Some("evaluate".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(721), DeclarationId(2498)],
+                inputs: vec![DeclarationId(828), DeclarationId(721), DeclarationId(2499)],
                 output: DeclarationId(1176),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/runtime.dag", 11265, 11284)),
             },
@@ -39649,11 +39649,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/runtime.dag", 11196, 11284),
         });
-        declarations.push(Declaration { id: DeclarationId(1186), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(263)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2360), payload: vec![FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __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(2358), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3555, 4208) });
-        declarations.push(Declaration { id: DeclarationId(1187), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(249)))])), ("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(2360), 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(2358), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4210, 4705) });
-        declarations.push(Declaration { id: DeclarationId(1188), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(248)))])), ("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(2360), 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(2358), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4707, 5196) });
-        declarations.push(Declaration { id: DeclarationId(1189), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(265)))])), ("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(2360), 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(2358), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5198, 5729) });
-        declarations.push(Declaration { id: DeclarationId(1190), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(1054) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2510)), 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(258)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2359), 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(2358), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(271)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2359), 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(2358), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(295)))])), ("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(2359), 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(2358), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(273)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2359), 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(2358), 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}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2359), 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(2358), 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}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2359), 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(2358), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(252)))])), ("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(2359), 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(2358), payload: vec![] })]), FieldValue::Reference(DeclarationId(1186)), FieldValue::Reference(DeclarationId(1187)), FieldValue::Reference(DeclarationId(1188)), FieldValue::Reference(DeclarationId(1189)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(293)))])), ("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(2359), 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(2358), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(299)))])), ("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(2359), 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(2358), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5732, 8453) });
+        declarations.push(Declaration { id: DeclarationId(1186), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(263)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2361), payload: vec![FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __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(2359), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3555, 4208) });
+        declarations.push(Declaration { id: DeclarationId(1187), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(249)))])), ("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(2361), 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(2359), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4210, 4705) });
+        declarations.push(Declaration { id: DeclarationId(1188), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(248)))])), ("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(2361), 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(2359), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4707, 5196) });
+        declarations.push(Declaration { id: DeclarationId(1189), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(265)))])), ("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(2361), 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(2359), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5198, 5729) });
+        declarations.push(Declaration { id: DeclarationId(1190), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(1054) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2511)), 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(258)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2360), 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(2359), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(271)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2360), 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(2359), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(295)))])), ("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(2360), 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(2359), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(273)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2360), 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(2359), 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}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2360), 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(2359), 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}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2360), 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(2359), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(252)))])), ("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(2360), 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(2359), payload: vec![] })]), FieldValue::Reference(DeclarationId(1186)), FieldValue::Reference(DeclarationId(1187)), FieldValue::Reference(DeclarationId(1188)), FieldValue::Reference(DeclarationId(1189)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(293)))])), ("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(2360), 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(2359), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(299)))])), ("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(2360), 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(2359), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5732, 8453) });
         declarations.push(Declaration {
             id: DeclarationId(1191),
             name: Some("InputField".to_string()),
@@ -39666,7 +39666,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/services.dag", 3670, 3688),
+            span: SourceSpan::new("src/v3/std/services.dag", 3669, 3687),
         });
         declarations.push(Declaration {
             id: DeclarationId(1192),
@@ -39691,7 +39691,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/services.dag", 4600, 4672),
+            span: SourceSpan::new("src/v3/std/services.dag", 4599, 4671),
         });
         declarations.push(Declaration {
             id: DeclarationId(1193),
@@ -39710,7 +39710,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/services.dag", 5480, 5523),
+            span: SourceSpan::new("src/v3/std/services.dag", 5479, 5522),
         });
         declarations.push(Declaration {
             id: DeclarationId(1194),
@@ -39723,7 +39723,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(2511),
+                        ty: DeclarationId(2512),
                     },
                     Field {
                         label: "endpoint".to_string(),
@@ -39739,18 +39739,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/services.dag", 6732, 6842),
+            span: SourceSpan::new("src/v3/std/services.dag", 6731, 6841),
         });
         declarations.push(Declaration {
             id: DeclarationId(1195),
             name: Some("modeled_gunbc_ci_workflow".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1744),
+                template: DeclarationId(1745),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1744)),
+            meta_tag: Some(DeclarationId(1745)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -39767,7 +39767,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("ci_demo_timing_read".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2512),
+                output: DeclarationId(2513),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(597))),
             },
             type_params: vec![],
@@ -39785,7 +39785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("ci_wad_modeled_workflow_timing_witness".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2513),
+                output: DeclarationId(2514),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(599))),
             },
             type_params: vec![],
@@ -39803,7 +39803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_seed_list_declaration_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2514),
+                output: DeclarationId(2515),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(601))),
             },
             type_params: vec![],
@@ -39821,7 +39821,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_seed_list_behavior_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2515),
+                output: DeclarationId(2516),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(603))),
             },
             type_params: vec![],
@@ -39839,7 +39839,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_seed_list_dagport_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2516),
+                output: DeclarationId(2517),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(605))),
             },
             type_params: vec![],
@@ -39857,7 +39857,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_seed_list_cluster_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2517),
+                output: DeclarationId(2518),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(607))),
             },
             type_params: vec![],
@@ -39875,7 +39875,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_empty_list_diagnostic".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2518),
+                output: DeclarationId(2519),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(609))),
             },
             type_params: vec![],
@@ -39893,7 +39893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_empty_list_witness_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2520),
+                output: DeclarationId(2521),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(611))),
             },
             type_params: vec![],
@@ -39911,7 +39911,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_witnesses_singleton_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1238)],
-                output: DeclarationId(2522),
+                output: DeclarationId(2523),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(615))),
             },
             type_params: vec![],
@@ -39929,7 +39929,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_violations_singleton".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(982)],
-                output: DeclarationId(2523),
+                output: DeclarationId(2524),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(618))),
             },
             type_params: vec![],
@@ -39947,7 +39947,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_dimension_ok_tm_payload".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1238)],
-                output: DeclarationId(2524),
+                output: DeclarationId(2525),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(622))),
             },
             type_params: vec![],
@@ -39965,7 +39965,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("_ci_wad_dimension_fail_tm_payload".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1238), DeclarationId(982)],
-                output: DeclarationId(2525),
+                output: DeclarationId(2526),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(627))),
             },
             type_params: vec![],
@@ -39983,7 +39983,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("report_dim_ok_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(1238)],
-                output: DeclarationId(2526),
+                output: DeclarationId(2527),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(634))),
             },
             type_params: vec![],
@@ -40001,7 +40001,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("report_dim_fail_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(1238), DeclarationId(982)],
-                output: DeclarationId(2527),
+                output: DeclarationId(2528),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(641))),
             },
             type_params: vec![],
@@ -40019,7 +40019,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("report_inhabits_branch_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(1238), DeclarationId(986)],
-                output: DeclarationId(2528),
+                output: DeclarationId(2529),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(646))),
             },
             type_params: vec![],
@@ -40036,8 +40036,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1211),
             name: Some("dimension_report_tm_from_witness".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(2529)],
-                output: DeclarationId(2530),
+                inputs: vec![DeclarationId(828), DeclarationId(2530)],
+                output: DeclarationId(2531),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(656))),
             },
             type_params: vec![],
@@ -40055,7 +40055,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("demo_ci_modeled_timing_dimension_report".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2531),
+                output: DeclarationId(2532),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(664))),
             },
             type_params: vec![],
@@ -40075,15 +40075,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Strict".to_string(),
-                        ty: DeclarationId(2561),
+                        ty: DeclarationId(2562),
                     },
                     Field {
                         label: "NonIncreasing".to_string(),
-                        ty: DeclarationId(2562),
+                        ty: DeclarationId(2563),
                     },
                     Field {
                         label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2563),
+                        ty: DeclarationId(2564),
                     },
                 ],
             },
@@ -40185,8 +40185,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1218),
             name: Some("optional_evidence_meet".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2553), DeclarationId(2554)],
-                output: DeclarationId(2555),
+                inputs: vec![DeclarationId(2554), DeclarationId(2555)],
+                output: DeclarationId(2556),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2488,
@@ -40207,8 +40207,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(1219),
             name: Some("map_evidence_merge_at".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2556), DeclarationId(230), DeclarationId(1213)],
-                output: DeclarationId(2557),
+                inputs: vec![DeclarationId(2557), DeclarationId(230), DeclarationId(1213)],
+                output: DeclarationId(2558),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2833,
@@ -40232,23 +40232,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "TreeSize".to_string(),
-                        ty: DeclarationId(2564),
+                        ty: DeclarationId(2565),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(2565),
+                        ty: DeclarationId(2566),
                     },
                     Field {
                         label: "ArithmeticValue".to_string(),
-                        ty: DeclarationId(2566),
+                        ty: DeclarationId(2567),
                     },
                     Field {
                         label: "TokenPosition".to_string(),
-                        ty: DeclarationId(2567),
+                        ty: DeclarationId(2568),
                     },
                     Field {
                         label: "SetCardinality".to_string(),
-                        ty: DeclarationId(2568),
+                        ty: DeclarationId(2569),
                     },
                 ],
             },
@@ -40269,11 +40269,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "OneStep".to_string(),
-                        ty: DeclarationId(2569),
+                        ty: DeclarationId(2570),
                     },
                     Field {
                         label: "AdditionalStep".to_string(),
-                        ty: DeclarationId(2570),
+                        ty: DeclarationId(2571),
                     },
                 ],
             },
@@ -40316,11 +40316,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DivideByTwo".to_string(),
-                        ty: DeclarationId(2571),
+                        ty: DeclarationId(2572),
                     },
                     Field {
                         label: "StrictlyLarger".to_string(),
-                        ty: DeclarationId(2572),
+                        ty: DeclarationId(2573),
                     },
                 ],
             },
@@ -40383,7 +40383,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("positive_descent_amount_from_positive_int".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(2558),
+                output: DeclarationId(2559),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     6420,
@@ -40405,7 +40405,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(93)],
-                output: DeclarationId(2559),
+                output: DeclarationId(2560),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     6860,
@@ -40429,31 +40429,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ChildAccessor".to_string(),
-                        ty: DeclarationId(2573),
+                        ty: DeclarationId(2574),
                     },
                     Field {
                         label: "ListShrink".to_string(),
-                        ty: DeclarationId(2574),
+                        ty: DeclarationId(2575),
                     },
                     Field {
                         label: "ArithmeticSubtractDescent".to_string(),
-                        ty: DeclarationId(2575),
+                        ty: DeclarationId(2576),
                     },
                     Field {
                         label: "ArithmeticDivideDescent".to_string(),
-                        ty: DeclarationId(2576),
+                        ty: DeclarationId(2577),
                     },
                     Field {
                         label: "ParserAdvance".to_string(),
-                        ty: DeclarationId(2577),
+                        ty: DeclarationId(2578),
                     },
                     Field {
                         label: "SetRemoval".to_string(),
-                        ty: DeclarationId(2578),
+                        ty: DeclarationId(2579),
                     },
                     Field {
                         label: "FoldIteration".to_string(),
-                        ty: DeclarationId(2579),
+                        ty: DeclarationId(2580),
                     },
                 ],
             },
@@ -40473,7 +40473,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "dimensions".to_string(),
-                    ty: DeclarationId(2580),
+                    ty: DeclarationId(2581),
                 }],
             },
             type_params: vec![],
@@ -40501,7 +40501,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "evidence".to_string(),
-                        ty: DeclarationId(2581),
+                        ty: DeclarationId(2582),
                     },
                 ],
             },
@@ -40521,7 +40521,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Strict".to_string(),
-                    ty: DeclarationId(2582),
+                    ty: DeclarationId(2583),
                 }],
             },
             type_params: vec![],
@@ -40541,11 +40541,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NonIncreasing".to_string(),
-                        ty: DeclarationId(2583),
+                        ty: DeclarationId(2584),
                     },
                     Field {
                         label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2584),
+                        ty: DeclarationId(2585),
                     },
                 ],
             },
@@ -40566,11 +40566,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "EvidenceUnknown".to_string(),
-                        ty: DeclarationId(2585),
+                        ty: DeclarationId(2586),
                     },
                     Field {
                         label: "EvidenceIncomplete".to_string(),
-                        ty: DeclarationId(2586),
+                        ty: DeclarationId(2587),
                     },
                 ],
             },
@@ -40599,7 +40599,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "per_path".to_string(),
-                        ty: DeclarationId(2587),
+                        ty: DeclarationId(2588),
                     },
                 ],
             },
@@ -40618,7 +40618,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("descent_execution_proof".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(724), DeclarationId(722)],
-                output: DeclarationId(2560),
+                output: DeclarationId(2561),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     12400,
@@ -40679,19 +40679,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Observed".to_string(),
-                        ty: DeclarationId(2590),
+                        ty: DeclarationId(2591),
                     },
                     Field {
                         label: "Unobserved".to_string(),
-                        ty: DeclarationId(2591),
+                        ty: DeclarationId(2592),
                     },
                     Field {
                         label: "Ambiguous".to_string(),
-                        ty: DeclarationId(2592),
+                        ty: DeclarationId(2593),
                     },
                     Field {
                         label: "Stale".to_string(),
-                        ty: DeclarationId(2593),
+                        ty: DeclarationId(2594),
                     },
                 ],
             },
@@ -40817,7 +40817,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "observations".to_string(),
-                    ty: DeclarationId(2594),
+                    ty: DeclarationId(2595),
                 }],
             },
             type_params: vec![],
@@ -41007,7 +41007,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("timing_lens_empty_corrections".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2588),
+                output: DeclarationId(2589),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(716))),
             },
             type_params: vec![],
@@ -41115,7 +41115,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("timing_lens_read".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2589),
+                output: DeclarationId(2590),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(795))),
             },
             type_params: vec![],
@@ -41153,183 +41153,183 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2606),
+                        ty: DeclarationId(2607),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2607),
+                        ty: DeclarationId(2608),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2608),
+                        ty: DeclarationId(2609),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2609),
+                        ty: DeclarationId(2610),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2610),
+                        ty: DeclarationId(2611),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2611),
+                        ty: DeclarationId(2612),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2612),
+                        ty: DeclarationId(2613),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2613),
+                        ty: DeclarationId(2614),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2614),
+                        ty: DeclarationId(2615),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2615),
+                        ty: DeclarationId(2616),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2616),
+                        ty: DeclarationId(2617),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2617),
+                        ty: DeclarationId(2618),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2618),
+                        ty: DeclarationId(2619),
                     },
                     Field {
                         label: "Ident".to_string(),
-                        ty: DeclarationId(2619),
+                        ty: DeclarationId(2620),
                     },
                     Field {
                         label: "IntLit".to_string(),
-                        ty: DeclarationId(2620),
+                        ty: DeclarationId(2621),
                     },
                     Field {
                         label: "StringLit".to_string(),
-                        ty: DeclarationId(2621),
+                        ty: DeclarationId(2622),
                     },
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2622),
+                        ty: DeclarationId(2623),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2623),
+                        ty: DeclarationId(2624),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2624),
+                        ty: DeclarationId(2625),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2625),
+                        ty: DeclarationId(2626),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2626),
+                        ty: DeclarationId(2627),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2627),
+                        ty: DeclarationId(2628),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2628),
+                        ty: DeclarationId(2629),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2629),
+                        ty: DeclarationId(2630),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2630),
+                        ty: DeclarationId(2631),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2631),
+                        ty: DeclarationId(2632),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2632),
+                        ty: DeclarationId(2633),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2633),
+                        ty: DeclarationId(2634),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2634),
+                        ty: DeclarationId(2635),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2635),
+                        ty: DeclarationId(2636),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2636),
+                        ty: DeclarationId(2637),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2637),
+                        ty: DeclarationId(2638),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2638),
+                        ty: DeclarationId(2639),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2639),
+                        ty: DeclarationId(2640),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2640),
+                        ty: DeclarationId(2641),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2641),
+                        ty: DeclarationId(2642),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2642),
+                        ty: DeclarationId(2643),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2643),
+                        ty: DeclarationId(2644),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2644),
+                        ty: DeclarationId(2645),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2645),
+                        ty: DeclarationId(2646),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2646),
+                        ty: DeclarationId(2647),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2647),
+                        ty: DeclarationId(2648),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2648),
+                        ty: DeclarationId(2649),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2649),
+                        ty: DeclarationId(2650),
                     },
                     Field {
                         label: "Eof".to_string(),
-                        ty: DeclarationId(2650),
+                        ty: DeclarationId(2651),
                     },
                 ],
             },
@@ -41375,55 +41375,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2651),
+                        ty: DeclarationId(2652),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2652),
+                        ty: DeclarationId(2653),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2653),
+                        ty: DeclarationId(2654),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2654),
+                        ty: DeclarationId(2655),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2655),
+                        ty: DeclarationId(2656),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2656),
+                        ty: DeclarationId(2657),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2657),
+                        ty: DeclarationId(2658),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2658),
+                        ty: DeclarationId(2659),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2659),
+                        ty: DeclarationId(2660),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2660),
+                        ty: DeclarationId(2661),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2661),
+                        ty: DeclarationId(2662),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2662),
+                        ty: DeclarationId(2663),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2663),
+                        ty: DeclarationId(2664),
                     },
                 ],
             },
@@ -41444,115 +41444,115 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2664),
+                        ty: DeclarationId(2665),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2665),
+                        ty: DeclarationId(2666),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2666),
+                        ty: DeclarationId(2667),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2667),
+                        ty: DeclarationId(2668),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2668),
+                        ty: DeclarationId(2669),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2669),
+                        ty: DeclarationId(2670),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2670),
+                        ty: DeclarationId(2671),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2671),
+                        ty: DeclarationId(2672),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2672),
+                        ty: DeclarationId(2673),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2673),
+                        ty: DeclarationId(2674),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2674),
+                        ty: DeclarationId(2675),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2675),
+                        ty: DeclarationId(2676),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2676),
+                        ty: DeclarationId(2677),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2677),
+                        ty: DeclarationId(2678),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2678),
+                        ty: DeclarationId(2679),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2679),
+                        ty: DeclarationId(2680),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2680),
+                        ty: DeclarationId(2681),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2681),
+                        ty: DeclarationId(2682),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2682),
+                        ty: DeclarationId(2683),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2683),
+                        ty: DeclarationId(2684),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2684),
+                        ty: DeclarationId(2685),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2685),
+                        ty: DeclarationId(2686),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2686),
+                        ty: DeclarationId(2687),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2687),
+                        ty: DeclarationId(2688),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2688),
+                        ty: DeclarationId(2689),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2689),
+                        ty: DeclarationId(2690),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2690),
+                        ty: DeclarationId(2691),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2691),
+                        ty: DeclarationId(2692),
                     },
                 ],
             },
@@ -41798,43 +41798,43 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-                        ty: DeclarationId(2695),
+                        ty: DeclarationId(2696),
                     },
                     Field {
                         label: "ParseError".to_string(),
-                        ty: DeclarationId(2696),
+                        ty: DeclarationId(2697),
                     },
                     Field {
                         label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(2697),
+                        ty: DeclarationId(2698),
                     },
                     Field {
                         label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(2698),
+                        ty: DeclarationId(2699),
                     },
                     Field {
                         label: "ResolveError".to_string(),
-                        ty: DeclarationId(2699),
+                        ty: DeclarationId(2700),
                     },
                     Field {
                         label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(2700),
+                        ty: DeclarationId(2701),
                     },
                     Field {
                         label: "BranchConditionNotBool".to_string(),
-                        ty: DeclarationId(2701),
+                        ty: DeclarationId(2702),
                     },
                     Field {
                         label: "MagnitudeOutOfRange".to_string(),
-                        ty: DeclarationId(2702),
+                        ty: DeclarationId(2703),
                     },
                     Field {
                         label: "MalformedIntegerRangeFact".to_string(),
-                        ty: DeclarationId(2703),
+                        ty: DeclarationId(2704),
                     },
                     Field {
                         label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(2704),
+                        ty: DeclarationId(2705),
                     },
                 ],
             },
@@ -41855,11 +41855,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "AnyDetail".to_string(),
-                        ty: DeclarationId(2705),
+                        ty: DeclarationId(2706),
                     },
                     Field {
                         label: "Contains".to_string(),
-                        ty: DeclarationId(2706),
+                        ty: DeclarationId(2707),
                     },
                 ],
             },
@@ -41905,11 +41905,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(2707),
+                        ty: DeclarationId(2708),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(2708),
+                        ty: DeclarationId(2709),
                     },
                 ],
             },
@@ -41929,7 +41929,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "AtMostBudget".to_string(),
-                    ty: DeclarationId(2709),
+                    ty: DeclarationId(2710),
                 }],
             },
             type_params: vec![],
@@ -41949,15 +41949,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Associativity".to_string(),
-                        ty: DeclarationId(2710),
+                        ty: DeclarationId(2711),
                     },
                     Field {
                         label: "Commutativity".to_string(),
-                        ty: DeclarationId(2711),
+                        ty: DeclarationId(2712),
                     },
                     Field {
                         label: "Identity".to_string(),
-                        ty: DeclarationId(2712),
+                        ty: DeclarationId(2713),
                     },
                 ],
             },
@@ -41996,7 +41996,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "LiteralProgram".to_string(),
-                    ty: DeclarationId(2713),
+                    ty: DeclarationId(2714),
                 }],
             },
             type_params: vec![],
@@ -42015,7 +42015,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "LinearCostForBindParam".to_string(),
-                    ty: DeclarationId(2714),
+                    ty: DeclarationId(2715),
                 }],
             },
             type_params: vec![],
@@ -42034,7 +42034,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "SelectedBindParamSizeVariable".to_string(),
-                    ty: DeclarationId(2715),
+                    ty: DeclarationId(2716),
                 }],
             },
             type_params: vec![],
@@ -42073,11 +42073,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LensCapabilityStructuralTerminal".to_string(),
-                        ty: DeclarationId(2716),
+                        ty: DeclarationId(2717),
                     },
                     Field {
                         label: "LensCapabilityStructuralPartial".to_string(),
-                        ty: DeclarationId(2717),
+                        ty: DeclarationId(2718),
                     },
                 ],
             },
@@ -42098,19 +42098,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LensCapabilityBehavioralComplete".to_string(),
-                        ty: DeclarationId(2718),
+                        ty: DeclarationId(2719),
                     },
                     Field {
                         label: "LensCapabilityBehavioralPartial".to_string(),
-                        ty: DeclarationId(2719),
+                        ty: DeclarationId(2720),
                     },
                     Field {
                         label: "LensCapabilityBehavioralStub".to_string(),
-                        ty: DeclarationId(2720),
+                        ty: DeclarationId(2721),
                     },
                     Field {
                         label: "LensCapabilityBehavioralNA".to_string(),
-                        ty: DeclarationId(2721),
+                        ty: DeclarationId(2722),
                     },
                 ],
             },
@@ -42131,15 +42131,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LensCapabilityV2RealV2".to_string(),
-                        ty: DeclarationId(2722),
+                        ty: DeclarationId(2723),
                     },
                     Field {
                         label: "LensCapabilityV2NoneV3Native".to_string(),
-                        ty: DeclarationId(2723),
+                        ty: DeclarationId(2724),
                     },
                     Field {
                         label: "LensCapabilityV2NotApplicable".to_string(),
-                        ty: DeclarationId(2724),
+                        ty: DeclarationId(2725),
                     },
                 ],
             },
@@ -42198,7 +42198,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2764)),
+            meta_tag: Some(DeclarationId(2765)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -42210,21 +42210,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2716),
+                            constructor: DeclarationId(2717),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2718),
+                            constructor: DeclarationId(2719),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2722),
+                            constructor: DeclarationId(2723),
                             payload: vec![],
                         },
                     ),
@@ -42237,21 +42237,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2716),
+                            constructor: DeclarationId(2717),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2718),
+                            constructor: DeclarationId(2719),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2722),
+                            constructor: DeclarationId(2723),
                             payload: vec![],
                         },
                     ),
@@ -42266,21 +42266,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2716),
+                            constructor: DeclarationId(2717),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2721),
+                            constructor: DeclarationId(2722),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2723),
+                            constructor: DeclarationId(2724),
                             payload: vec![],
                         },
                     ),
@@ -42295,21 +42295,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2716),
+                            constructor: DeclarationId(2717),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2719),
+                            constructor: DeclarationId(2720),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2723),
+                            constructor: DeclarationId(2724),
                             payload: vec![],
                         },
                     ),
@@ -42322,21 +42322,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2716),
+                            constructor: DeclarationId(2717),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2718),
+                            constructor: DeclarationId(2719),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2723),
+                            constructor: DeclarationId(2724),
                             payload: vec![],
                         },
                     ),
@@ -42363,7 +42363,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2723),
+                            constructor: DeclarationId(2724),
                             payload: vec![],
                         },
                     ),
@@ -42376,21 +42376,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2716),
+                            constructor: DeclarationId(2717),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2718),
+                            constructor: DeclarationId(2719),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2723),
+                            constructor: DeclarationId(2724),
                             payload: vec![],
                         },
                     ),
@@ -42405,21 +42405,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2716),
+                            constructor: DeclarationId(2717),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2718),
+                            constructor: DeclarationId(2719),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2723),
+                            constructor: DeclarationId(2724),
                             payload: vec![],
                         },
                     ),
@@ -42432,21 +42432,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2716),
+                            constructor: DeclarationId(2717),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2718),
+                            constructor: DeclarationId(2719),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2723),
+                            constructor: DeclarationId(2724),
                             payload: vec![],
                         },
                     ),
@@ -42461,21 +42461,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2716),
+                            constructor: DeclarationId(2717),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2718),
+                            constructor: DeclarationId(2719),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2723),
+                            constructor: DeclarationId(2724),
                             payload: vec![],
                         },
                     ),
@@ -42488,21 +42488,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2717),
+                            constructor: DeclarationId(2718),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2721),
+                            constructor: DeclarationId(2722),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2724),
+                            constructor: DeclarationId(2725),
                             payload: vec![],
                         },
                     ),
@@ -42515,21 +42515,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2717),
+                            constructor: DeclarationId(2718),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2721),
+                            constructor: DeclarationId(2722),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2724),
+                            constructor: DeclarationId(2725),
                             payload: vec![],
                         },
                     ),
@@ -42544,21 +42544,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2716),
+                            constructor: DeclarationId(2717),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2721),
+                            constructor: DeclarationId(2722),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2724),
+                            constructor: DeclarationId(2725),
                             payload: vec![],
                         },
                     ),
@@ -42566,7 +42566,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ])),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 7185, 9768),
+            span: SourceSpan::new("src/v3/std/verification.dag", 7185, 9772),
         });
         declarations.push(Declaration {
             id: DeclarationId(1293),
@@ -42575,107 +42575,107 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Compiles".to_string(),
-                        ty: DeclarationId(2725),
+                        ty: DeclarationId(2726),
                     },
                     Field {
                         label: "FailsWithDiagnostic".to_string(),
-                        ty: DeclarationId(2726),
+                        ty: DeclarationId(2727),
                     },
                     Field {
                         label: "OutputEquals".to_string(),
-                        ty: DeclarationId(2727),
+                        ty: DeclarationId(2728),
                     },
                     Field {
                         label: "PortHasState".to_string(),
-                        ty: DeclarationId(2728),
+                        ty: DeclarationId(2729),
                     },
                     Field {
                         label: "DeclarationHasRefinement".to_string(),
-                        ty: DeclarationId(2729),
+                        ty: DeclarationId(2730),
                     },
                     Field {
                         label: "CostBounded".to_string(),
-                        ty: DeclarationId(2730),
+                        ty: DeclarationId(2731),
                     },
                     Field {
                         label: "BehavioralObservation".to_string(),
-                        ty: DeclarationId(2731),
+                        ty: DeclarationId(2732),
                     },
                     Field {
                         label: "MockBackedInvariant".to_string(),
-                        ty: DeclarationId(2732),
+                        ty: DeclarationId(2733),
                     },
                     Field {
                         label: "ExecuteCommand".to_string(),
-                        ty: DeclarationId(2734),
+                        ty: DeclarationId(2735),
                     },
                     Field {
                         label: "ForAllTargets".to_string(),
-                        ty: DeclarationId(2736),
+                        ty: DeclarationId(2737),
                     },
                     Field {
                         label: "LensOutputEquals".to_string(),
-                        ty: DeclarationId(2737),
+                        ty: DeclarationId(2738),
                     },
                     Field {
                         label: "DifferentialEquals".to_string(),
-                        ty: DeclarationId(2738),
+                        ty: DeclarationId(2739),
                     },
                     Field {
                         label: "SymbolicCostExprEquals".to_string(),
-                        ty: DeclarationId(2739),
+                        ty: DeclarationId(2740),
                     },
                     Field {
                         label: "SymbolicCostExprEqualsForBindParam".to_string(),
-                        ty: DeclarationId(2740),
+                        ty: DeclarationId(2741),
                     },
                     Field {
                         label: "PerfWithinBaseline".to_string(),
-                        ty: DeclarationId(2741),
+                        ty: DeclarationId(2742),
                     },
                     Field {
                         label: "BinaryDimensionReportEquals".to_string(),
-                        ty: DeclarationId(2742),
+                        ty: DeclarationId(2743),
                     },
                     Field {
                         label: "AlgebraicLaw".to_string(),
-                        ty: DeclarationId(2743),
+                        ty: DeclarationId(2744),
                     },
                     Field {
                         label: "CensusBoundCheck".to_string(),
-                        ty: DeclarationId(2744),
+                        ty: DeclarationId(2745),
                     },
                     Field {
                         label: "CensusSubsetCount".to_string(),
-                        ty: DeclarationId(2745),
+                        ty: DeclarationId(2746),
                     },
                     Field {
                         label: "FixedPointConverges".to_string(),
-                        ty: DeclarationId(2746),
+                        ty: DeclarationId(2747),
                     },
                     Field {
                         label: "RatchetZero".to_string(),
-                        ty: DeclarationId(2747),
+                        ty: DeclarationId(2748),
                     },
                     Field {
                         label: "GeneratedFromDag".to_string(),
-                        ty: DeclarationId(2749),
+                        ty: DeclarationId(2750),
                     },
                     Field {
                         label: "CementingDispatchMatchesProjection".to_string(),
-                        ty: DeclarationId(2750),
+                        ty: DeclarationId(2751),
                     },
                     Field {
                         label: "ReleaseDeferredClaim".to_string(),
-                        ty: DeclarationId(2751),
+                        ty: DeclarationId(2752),
                     },
                     Field {
                         label: "SubstrateResearchDeferredClaim".to_string(),
-                        ty: DeclarationId(2752),
+                        ty: DeclarationId(2753),
                     },
                     Field {
                         label: "BridgeLedgerZero".to_string(),
-                        ty: DeclarationId(2753),
+                        ty: DeclarationId(2754),
                     },
                 ],
             },
@@ -42687,7 +42687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9770, 22663),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9774, 22667),
         });
         declarations.push(Declaration {
             id: DeclarationId(1294),
@@ -42701,7 +42701,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 22771, 22791),
+            span: SourceSpan::new("src/v3/std/verification.dag", 22775, 22795),
         });
         declarations.push(Declaration {
             id: DeclarationId(1295),
@@ -42720,7 +42720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 22934, 22989),
+            span: SourceSpan::new("src/v3/std/verification.dag", 22938, 22993),
         });
         declarations.push(Declaration {
             id: DeclarationId(1296),
@@ -42745,7 +42745,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "requires".to_string(),
-                        ty: DeclarationId(2754),
+                        ty: DeclarationId(2755),
                     },
                 ],
             },
@@ -42757,7 +42757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 23599, 23732),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23603, 23736),
         });
         declarations.push(Declaration {
             id: DeclarationId(1297),
@@ -42766,11 +42766,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ForAll".to_string(),
-                        ty: DeclarationId(2755),
+                        ty: DeclarationId(2756),
                     },
                     Field {
                         label: "Exists".to_string(),
-                        ty: DeclarationId(2756),
+                        ty: DeclarationId(2757),
                     },
                 ],
             },
@@ -42782,7 +42782,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 23913, 23950),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23917, 23954),
         });
         declarations.push(Declaration {
             id: DeclarationId(1298),
@@ -42807,7 +42807,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "requires".to_string(),
-                        ty: DeclarationId(2757),
+                        ty: DeclarationId(2758),
                     },
                 ],
             },
@@ -42819,7 +42819,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 23952, 24113),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23956, 24117),
         });
         declarations.push(Declaration {
             id: DeclarationId(1299),
@@ -42828,11 +42828,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "EnumeratedTestNode".to_string(),
-                        ty: DeclarationId(2758),
+                        ty: DeclarationId(2759),
                     },
                     Field {
                         label: "QuantifiedTestNode".to_string(),
-                        ty: DeclarationId(2759),
+                        ty: DeclarationId(2760),
                     },
                 ],
             },
@@ -42844,7 +42844,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 25813, 25907),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25817, 25911),
         });
         declarations.push(Declaration {
             id: DeclarationId(1300),
@@ -42873,7 +42873,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 25909, 26012),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25913, 26016),
         });
         declarations.push(Declaration {
             id: DeclarationId(1301),
@@ -42882,11 +42882,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Enumerated".to_string(),
-                        ty: DeclarationId(2760),
+                        ty: DeclarationId(2761),
                     },
                     Field {
                         label: "Quantified".to_string(),
-                        ty: DeclarationId(2761),
+                        ty: DeclarationId(2762),
                     },
                 ],
             },
@@ -42898,7 +42898,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26745, 26822),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26749, 26826),
         });
         declarations.push(Declaration {
             id: DeclarationId(1302),
@@ -42911,7 +42911,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "claims".to_string(),
-                        ty: DeclarationId(2762),
+                        ty: DeclarationId(2763),
                     },
                 ],
             },
@@ -42923,7 +42923,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26824, 26884),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26828, 26888),
         });
         declarations.push(Declaration {
             id: DeclarationId(1303),
@@ -42936,7 +42936,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "resources".to_string(),
-                        ty: DeclarationId(2763),
+                        ty: DeclarationId(2764),
                     },
                 ],
             },
@@ -42948,18 +42948,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 27082, 27163),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27086, 27167),
         });
         declarations.push(Declaration {
             id: DeclarationId(1304),
             name: Some("claim_obligation_resources".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1296)],
-                output: DeclarationId(2692),
+                output: DeclarationId(2693),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    27605,
-                    27621,
+                    27609,
+                    27625,
                 )),
             },
             type_params: vec![],
@@ -42970,7 +42970,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 27534, 27621),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27538, 27625),
         });
         declarations.push(Declaration {
             id: DeclarationId(1305),
@@ -42980,8 +42980,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 output: DeclarationId(1303),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    27679,
-                    27764,
+                    27683,
+                    27768,
                 )),
             },
             type_params: vec![],
@@ -42992,7 +42992,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 27623, 27764),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27627, 27768),
         });
         declarations.push(Declaration {
             id: DeclarationId(1306),
@@ -43002,8 +43002,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 output: DeclarationId(1303),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    28071,
-                    28137,
+                    28075,
+                    28141,
                 )),
             },
             type_params: vec![],
@@ -43014,7 +43014,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 27994, 28137),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27998, 28141),
         });
         declarations.push(Declaration {
             id: DeclarationId(1307),
@@ -43032,18 +43032,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 28442, 28631),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28446, 28635),
         });
         declarations.push(Declaration {
             id: DeclarationId(1308),
             name: Some("materialize_test_obligations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2693)],
-                output: DeclarationId(2694),
+                inputs: vec![DeclarationId(2694)],
+                output: DeclarationId(2695),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    28715,
-                    28760,
+                    28719,
+                    28764,
                 )),
             },
             type_params: vec![],
@@ -43054,14 +43054,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 28633, 28760),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28637, 28764),
         });
         declarations.push(Declaration {
             id: DeclarationId(1309),
             name: Some("behavior_spine".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828)],
-                output: DeclarationId(2765),
+                output: DeclarationId(2766),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(815))),
             },
             type_params: vec![],
@@ -43189,14 +43189,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2245),
+                            constructor: DeclarationId(2246),
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2248),
+                            constructor: DeclarationId(2249),
                             payload: vec![],
                         },
                     ),
@@ -43368,17 +43368,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2326),
+                            constructor: DeclarationId(2327),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1913),
+                                constructor: DeclarationId(1914),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(
                                         "-2147483648".to_string(),
                                     )),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1912),
+                                        constructor: DeclarationId(1913),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1910),
+                                            constructor: DeclarationId(1911),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 "4294967295".to_string(),
                                             ))],
@@ -43427,7 +43427,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2327),
+                            constructor: DeclarationId(2328),
                             payload: vec![],
                         },
                     ),
@@ -43727,7 +43727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2328),
+                                    constructor: DeclarationId(2329),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "declaration".to_string(),
                                     ))],
@@ -43831,7 +43831,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -43850,7 +43850,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "state".to_string(),
                                         ))],
@@ -43871,7 +43871,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "produced_by".to_string(),
                                         ))],
@@ -43935,7 +43935,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "file".to_string(),
                                         ))],
@@ -43954,7 +43954,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_start".to_string(),
                                         ))],
@@ -43973,7 +43973,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_end".to_string(),
                                         ))],
@@ -44285,7 +44285,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -44304,7 +44304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -44370,7 +44370,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -44389,7 +44389,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -44455,7 +44455,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -44474,7 +44474,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "algebra".to_string(),
                                         ))],
@@ -44539,7 +44539,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2328),
+                                    constructor: DeclarationId(2329),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "permitted_accessors".to_string(),
                                     ))],
@@ -44602,7 +44602,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -44621,7 +44621,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -44685,7 +44685,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -44704,7 +44704,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -44768,7 +44768,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -44787,7 +44787,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "second".to_string(),
                                         ))],
@@ -44806,7 +44806,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -44870,7 +44870,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "member_of".to_string(),
                                         ))],
@@ -44889,7 +44889,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "slot_of".to_string(),
                                         ))],
@@ -44952,7 +44952,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2329),
+                                    constructor: DeclarationId(2330),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "node_id".to_string(),
                                     ))],
@@ -45014,7 +45014,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2328),
+                                    constructor: DeclarationId(2329),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "param".to_string(),
                                     ))],
@@ -45076,7 +45076,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2328),
+                                    constructor: DeclarationId(2329),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "transform".to_string(),
                                     ))],
@@ -45139,7 +45139,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "members".to_string(),
                                         ))],
@@ -45160,7 +45160,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "intra_cluster_calls".to_string(),
                                         ))],
@@ -45388,7 +45388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -45407,7 +45407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -45428,7 +45428,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "connective".to_string(),
                                         ))],
@@ -45449,7 +45449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "type_params".to_string(),
                                         ))],
@@ -45470,7 +45470,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "phantom_params".to_string(),
                                         ))],
@@ -45491,7 +45491,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "meta_tag".to_string(),
                                         ))],
@@ -45512,7 +45512,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inhabits".to_string(),
                                         ))],
@@ -45533,7 +45533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value_body".to_string(),
                                         ))],
@@ -45554,7 +45554,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nominal_opacity".to_string(),
                                         ))],
@@ -45573,7 +45573,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -45885,7 +45885,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding_name".to_string(),
                                         ))],
@@ -45906,7 +45906,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload_port".to_string(),
                                         ))],
@@ -45970,7 +45970,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -45991,7 +45991,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -46010,7 +46010,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -46029,7 +46029,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -46134,7 +46134,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -46153,7 +46153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -46174,7 +46174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -46193,7 +46193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -46257,7 +46257,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -46276,7 +46276,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "target".to_string(),
                                         ))],
@@ -46295,7 +46295,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inputs".to_string(),
                                         ))],
@@ -46316,7 +46316,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -46335,7 +46335,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -46399,7 +46399,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -46418,7 +46418,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "input".to_string(),
                                         ))],
@@ -46437,7 +46437,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "paths".to_string(),
                                         ))],
@@ -46458,7 +46458,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -46477,7 +46477,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -46498,7 +46498,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -46562,7 +46562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -46581,7 +46581,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "source".to_string(),
                                         ))],
@@ -46600,7 +46600,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "init".to_string(),
                                         ))],
@@ -46619,7 +46619,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -46638,7 +46638,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "bound".to_string(),
                                         ))],
@@ -46659,7 +46659,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -46678,7 +46678,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -46742,7 +46742,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -46761,7 +46761,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -46782,7 +46782,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -46801,7 +46801,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "params".to_string(),
                                         ))],
@@ -46820,7 +46820,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -46841,7 +46841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -46948,7 +46948,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "declarations".to_string(),
                                         ))],
@@ -46967,7 +46967,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nodes".to_string(),
                                         ))],
@@ -46986,7 +46986,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ports".to_string(),
                                         ))],
@@ -47007,7 +47007,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "clusters".to_string(),
                                         ))],
@@ -47070,7 +47070,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2328),
+                                    constructor: DeclarationId(2329),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "items".to_string(),
                                     ))],
@@ -47174,7 +47174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -47193,7 +47193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -47214,7 +47214,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "refinement".to_string(),
                                         ))],
@@ -47278,7 +47278,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -47297,7 +47297,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -47361,7 +47361,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -47380,7 +47380,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -47399,7 +47399,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -47545,7 +47545,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -47564,7 +47564,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -47583,7 +47583,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -47647,7 +47647,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key".to_string(),
                                         ))],
@@ -47668,7 +47668,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key_span".to_string(),
                                         ))],
@@ -47687,7 +47687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -47706,7 +47706,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -47770,7 +47770,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -47789,7 +47789,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -47808,7 +47808,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -47872,7 +47872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -47891,7 +47891,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -47910,7 +47910,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -48863,7 +48863,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2341),
+                            constructor: DeclarationId(2342),
                             payload: vec![],
                         },
                     ),
@@ -48903,7 +48903,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2342),
+                            constructor: DeclarationId(2343),
                             payload: vec![],
                         },
                     ),
@@ -48917,7 +48917,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2332),
+                                    constructor: DeclarationId(2333),
                                     payload: vec![],
                                 },
                             ),
@@ -48958,7 +48958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2343),
+                            constructor: DeclarationId(2344),
                             payload: vec![],
                         },
                     ),
@@ -48973,7 +48973,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2333),
                                         payload: vec![],
                                     },
                                 ),
@@ -48986,7 +48986,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2333),
                                         payload: vec![],
                                     },
                                 ),
@@ -49028,7 +49028,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2344),
+                            constructor: DeclarationId(2345),
                             payload: vec![],
                         },
                     ),
@@ -49043,7 +49043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2333),
                                         payload: vec![],
                                     },
                                 ),
@@ -49056,7 +49056,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2333),
                                         payload: vec![],
                                     },
                                 ),
@@ -49098,7 +49098,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2345),
+                            constructor: DeclarationId(2346),
                             payload: vec![],
                         },
                     ),
@@ -49112,7 +49112,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2331),
+                                    constructor: DeclarationId(2332),
                                     payload: vec![],
                                 },
                             ),
@@ -49263,7 +49263,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2346),
+                            constructor: DeclarationId(2347),
                             payload: vec![],
                         },
                     ),
@@ -49277,7 +49277,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2331),
+                                    constructor: DeclarationId(2332),
                                     payload: vec![],
                                 },
                             ),
@@ -49318,7 +49318,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2347),
+                            constructor: DeclarationId(2348),
                             payload: vec![],
                         },
                     ),
@@ -49333,7 +49333,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2331),
+                                        constructor: DeclarationId(2332),
                                         payload: vec![],
                                     },
                                 ),
@@ -49346,7 +49346,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2333),
                                         payload: vec![],
                                     },
                                 ),
@@ -49359,7 +49359,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2331),
+                                        constructor: DeclarationId(2332),
                                         payload: vec![],
                                     },
                                 ),
@@ -49401,7 +49401,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2348),
+                            constructor: DeclarationId(2349),
                             payload: vec![],
                         },
                     ),
@@ -49416,7 +49416,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2331),
+                                        constructor: DeclarationId(2332),
                                         payload: vec![],
                                     },
                                 ),
@@ -49429,7 +49429,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2331),
+                                        constructor: DeclarationId(2332),
                                         payload: vec![],
                                     },
                                 ),
@@ -49471,7 +49471,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2349),
+                            constructor: DeclarationId(2350),
                             payload: vec![],
                         },
                     ),
@@ -49486,7 +49486,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2331),
+                                        constructor: DeclarationId(2332),
                                         payload: vec![],
                                     },
                                 ),
@@ -49499,7 +49499,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2331),
+                                        constructor: DeclarationId(2332),
                                         payload: vec![],
                                     },
                                 ),
@@ -49541,7 +49541,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2350),
+                            constructor: DeclarationId(2351),
                             payload: vec![],
                         },
                     ),
@@ -49556,7 +49556,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2331),
+                                        constructor: DeclarationId(2332),
                                         payload: vec![],
                                     },
                                 ),
@@ -49569,7 +49569,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2331),
+                                        constructor: DeclarationId(2332),
                                         payload: vec![],
                                     },
                                 ),
@@ -49611,17 +49611,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2352),
+                            constructor: DeclarationId(2353),
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1818)),
+                        FieldValue::Reference(DeclarationId(1819)),
                     ),
                     (
                         "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1820)),
+                        FieldValue::Reference(DeclarationId(1821)),
                     ),
                     (
                         "scrutinee".to_string(),
@@ -50259,49 +50259,49 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2179),
+                            constructor: DeclarationId(2180),
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2182),
+                            constructor: DeclarationId(2183),
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2185),
+                            constructor: DeclarationId(2186),
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2188),
+                            constructor: DeclarationId(2189),
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2192),
+                            constructor: DeclarationId(2193),
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2194),
+                            constructor: DeclarationId(2195),
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2198),
+                            constructor: DeclarationId(2199),
                             payload: vec![],
                         },
                     ),
@@ -50333,7 +50333,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2201),
+                                    constructor: DeclarationId(2202),
                                     payload: vec![],
                                 },
                             ),
@@ -50937,14 +50937,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2245),
+                            constructor: DeclarationId(2246),
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2248),
+                            constructor: DeclarationId(2249),
                             payload: vec![],
                         },
                     ),
@@ -51073,17 +51073,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2326),
+                            constructor: DeclarationId(2327),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1913),
+                                constructor: DeclarationId(1914),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(
                                         "-2147483648".to_string(),
                                     )),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1912),
+                                        constructor: DeclarationId(1913),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1910),
+                                            constructor: DeclarationId(1911),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 "4294967295".to_string(),
                                             ))],
@@ -51132,9 +51132,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2326),
+                            constructor: DeclarationId(2327),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1914),
+                                constructor: DeclarationId(1915),
                                 payload: vec![],
                             }],
                         },
@@ -51845,7 +51845,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2328),
+                                    constructor: DeclarationId(2329),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "items".to_string(),
                                     ))],
@@ -51949,7 +51949,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -51968,7 +51968,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -51989,7 +51989,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "refinement".to_string(),
                                         ))],
@@ -52053,7 +52053,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -52072,7 +52072,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -52136,7 +52136,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -52155,7 +52155,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -52174,7 +52174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -52320,7 +52320,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -52339,7 +52339,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -52358,7 +52358,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -52422,7 +52422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key".to_string(),
                                         ))],
@@ -52443,7 +52443,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key_span".to_string(),
                                         ))],
@@ -52462,7 +52462,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -52481,7 +52481,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -52545,7 +52545,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -52564,7 +52564,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -52583,7 +52583,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -52647,7 +52647,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -52666,7 +52666,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -52685,7 +52685,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -53413,7 +53413,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2341),
+                            constructor: DeclarationId(2342),
                             payload: vec![],
                         },
                     ),
@@ -53453,7 +53453,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2342),
+                            constructor: DeclarationId(2343),
                             payload: vec![],
                         },
                     ),
@@ -53467,7 +53467,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2332),
+                                    constructor: DeclarationId(2333),
                                     payload: vec![],
                                 },
                             ),
@@ -53508,7 +53508,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2343),
+                            constructor: DeclarationId(2344),
                             payload: vec![],
                         },
                     ),
@@ -53523,7 +53523,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2333),
                                         payload: vec![],
                                     },
                                 ),
@@ -53536,7 +53536,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2333),
                                         payload: vec![],
                                     },
                                 ),
@@ -53578,7 +53578,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2344),
+                            constructor: DeclarationId(2345),
                             payload: vec![],
                         },
                     ),
@@ -53593,7 +53593,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2333),
                                         payload: vec![],
                                     },
                                 ),
@@ -53606,7 +53606,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2333),
                                         payload: vec![],
                                     },
                                 ),
@@ -53648,7 +53648,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2345),
+                            constructor: DeclarationId(2346),
                             payload: vec![],
                         },
                     ),
@@ -53662,7 +53662,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2331),
+                                    constructor: DeclarationId(2332),
                                     payload: vec![],
                                 },
                             ),
@@ -53703,7 +53703,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2346),
+                            constructor: DeclarationId(2347),
                             payload: vec![],
                         },
                     ),
@@ -53717,7 +53717,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2331),
+                                    constructor: DeclarationId(2332),
                                     payload: vec![],
                                 },
                             ),
@@ -53758,7 +53758,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2347),
+                            constructor: DeclarationId(2348),
                             payload: vec![],
                         },
                     ),
@@ -53773,7 +53773,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2331),
+                                        constructor: DeclarationId(2332),
                                         payload: vec![],
                                     },
                                 ),
@@ -53786,7 +53786,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2333),
                                         payload: vec![],
                                     },
                                 ),
@@ -53799,7 +53799,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2331),
+                                        constructor: DeclarationId(2332),
                                         payload: vec![],
                                     },
                                 ),
@@ -53841,7 +53841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2348),
+                            constructor: DeclarationId(2349),
                             payload: vec![],
                         },
                     ),
@@ -53856,7 +53856,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2331),
+                                        constructor: DeclarationId(2332),
                                         payload: vec![],
                                     },
                                 ),
@@ -53869,7 +53869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2331),
+                                        constructor: DeclarationId(2332),
                                         payload: vec![],
                                     },
                                 ),
@@ -53911,7 +53911,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2349),
+                            constructor: DeclarationId(2350),
                             payload: vec![],
                         },
                     ),
@@ -53926,7 +53926,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2331),
+                                        constructor: DeclarationId(2332),
                                         payload: vec![],
                                     },
                                 ),
@@ -53939,7 +53939,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2331),
+                                        constructor: DeclarationId(2332),
                                         payload: vec![],
                                     },
                                 ),
@@ -53981,7 +53981,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2350),
+                            constructor: DeclarationId(2351),
                             payload: vec![],
                         },
                     ),
@@ -53996,7 +53996,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2331),
+                                        constructor: DeclarationId(2332),
                                         payload: vec![],
                                     },
                                 ),
@@ -54009,7 +54009,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2331),
+                                        constructor: DeclarationId(2332),
                                         payload: vec![],
                                     },
                                 ),
@@ -54164,17 +54164,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2352),
+                            constructor: DeclarationId(2353),
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1818)),
+                        FieldValue::Reference(DeclarationId(1819)),
                     ),
                     (
                         "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1820)),
+                        FieldValue::Reference(DeclarationId(1821)),
                     ),
                     (
                         "scrutinee".to_string(),
@@ -54259,49 +54259,49 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2179),
+                            constructor: DeclarationId(2180),
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2184),
+                            constructor: DeclarationId(2185),
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2185),
+                            constructor: DeclarationId(2186),
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2188),
+                            constructor: DeclarationId(2189),
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2192),
+                            constructor: DeclarationId(2193),
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2193),
+                            constructor: DeclarationId(2194),
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2198),
+                            constructor: DeclarationId(2199),
                             payload: vec![],
                         },
                     ),
@@ -54336,7 +54336,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2200),
+                                    constructor: DeclarationId(2201),
                                     payload: vec![],
                                 },
                             ),
@@ -54393,14 +54393,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2247),
+                            constructor: DeclarationId(2248),
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2248),
+                            constructor: DeclarationId(2249),
                             payload: vec![],
                         },
                     ),
@@ -54818,15 +54818,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2326),
+                            constructor: DeclarationId(2327),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1913),
+                                constructor: DeclarationId(1914),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int("0".to_string())),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1912),
+                                        constructor: DeclarationId(1913),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1910),
+                                            constructor: DeclarationId(1911),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 "4294967295".to_string(),
                                             ))],
@@ -54875,17 +54875,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2326),
+                            constructor: DeclarationId(2327),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1913),
+                                constructor: DeclarationId(1914),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(
                                         "-2147483648".to_string(),
                                     )),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1912),
+                                        constructor: DeclarationId(1913),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1910),
+                                            constructor: DeclarationId(1911),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 "4294967295".to_string(),
                                             ))],
@@ -54934,7 +54934,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2325),
+                            constructor: DeclarationId(2326),
                             payload: vec![],
                         },
                     ),
@@ -54977,7 +54977,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2325),
+                            constructor: DeclarationId(2326),
                             payload: vec![],
                         },
                     ),
@@ -55020,7 +55020,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2325),
+                            constructor: DeclarationId(2326),
                             payload: vec![],
                         },
                     ),
@@ -55063,7 +55063,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2325),
+                            constructor: DeclarationId(2326),
                             payload: vec![],
                         },
                     ),
@@ -55106,7 +55106,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2327),
+                            constructor: DeclarationId(2328),
                             payload: vec![],
                         },
                     ),
@@ -55149,7 +55149,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2327),
+                            constructor: DeclarationId(2328),
                             payload: vec![],
                         },
                     ),
@@ -55449,7 +55449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2328),
+                                    constructor: DeclarationId(2329),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "declaration".to_string(),
                                     ))],
@@ -55553,7 +55553,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -55572,7 +55572,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "state_value".to_string(),
                                         ))],
@@ -55593,7 +55593,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "produced_by".to_string(),
                                         ))],
@@ -55657,7 +55657,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "file".to_string(),
                                         ))],
@@ -55676,7 +55676,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_start".to_string(),
                                         ))],
@@ -55695,7 +55695,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_end".to_string(),
                                         ))],
@@ -56007,7 +56007,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -56026,7 +56026,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -56092,7 +56092,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -56111,7 +56111,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -56177,7 +56177,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -56196,7 +56196,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "algebra".to_string(),
                                         ))],
@@ -56261,7 +56261,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2328),
+                                    constructor: DeclarationId(2329),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "permitted_accessors".to_string(),
                                     ))],
@@ -56326,7 +56326,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "0".to_string(),
                                         ))],
@@ -56345,7 +56345,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "1".to_string(),
                                         ))],
@@ -56409,7 +56409,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -56428,7 +56428,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -56492,7 +56492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -56511,7 +56511,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "second".to_string(),
                                         ))],
@@ -56530,7 +56530,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -56593,7 +56593,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2329),
+                                    constructor: DeclarationId(2330),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "index_of".to_string(),
                                     ))],
@@ -56656,7 +56656,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "member_of".to_string(),
                                         ))],
@@ -56675,7 +56675,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "slot_of".to_string(),
                                         ))],
@@ -56738,7 +56738,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2329),
+                                    constructor: DeclarationId(2330),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "node_id".to_string(),
                                     ))],
@@ -56800,7 +56800,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2328),
+                                    constructor: DeclarationId(2329),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "param".to_string(),
                                     ))],
@@ -56862,7 +56862,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2328),
+                                    constructor: DeclarationId(2329),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "transform".to_string(),
                                     ))],
@@ -56925,7 +56925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "members".to_string(),
                                         ))],
@@ -56946,7 +56946,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "intra_cluster_calls".to_string(),
                                         ))],
@@ -57174,7 +57174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -57193,7 +57193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -57214,7 +57214,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "connective".to_string(),
                                         ))],
@@ -57235,7 +57235,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "type_params".to_string(),
                                         ))],
@@ -57256,7 +57256,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "phantom_params".to_string(),
                                         ))],
@@ -57277,7 +57277,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "meta_tag".to_string(),
                                         ))],
@@ -57298,7 +57298,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inhabits".to_string(),
                                         ))],
@@ -57319,7 +57319,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value_body".to_string(),
                                         ))],
@@ -57340,7 +57340,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nominal_opacity".to_string(),
                                         ))],
@@ -57359,7 +57359,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -57671,7 +57671,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding_name".to_string(),
                                         ))],
@@ -57692,7 +57692,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload_port".to_string(),
                                         ))],
@@ -57756,7 +57756,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -57777,7 +57777,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -57796,7 +57796,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -57815,7 +57815,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -57920,7 +57920,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -57939,7 +57939,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "data".to_string(),
                                         ))],
@@ -57960,7 +57960,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -57979,7 +57979,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -58000,7 +58000,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "lane2_workflow".to_string(),
                                         ))],
@@ -58064,7 +58064,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -58083,7 +58083,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "target".to_string(),
                                         ))],
@@ -58102,7 +58102,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inputs".to_string(),
                                         ))],
@@ -58123,7 +58123,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -58142,7 +58142,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -58206,7 +58206,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -58225,7 +58225,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "input".to_string(),
                                         ))],
@@ -58244,7 +58244,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "paths".to_string(),
                                         ))],
@@ -58265,7 +58265,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -58284,7 +58284,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -58305,7 +58305,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -58369,7 +58369,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -58388,7 +58388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "source".to_string(),
                                         ))],
@@ -58407,7 +58407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "init".to_string(),
                                         ))],
@@ -58426,7 +58426,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -58445,7 +58445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "bound".to_string(),
                                         ))],
@@ -58466,7 +58466,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -58485,7 +58485,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -58549,7 +58549,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -58568,7 +58568,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -58589,7 +58589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -58608,7 +58608,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "params".to_string(),
                                         ))],
@@ -58627,7 +58627,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -58648,7 +58648,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "lane2_workflow".to_string(),
                                         ))],
@@ -58669,7 +58669,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -58776,7 +58776,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "declarations".to_string(),
                                         ))],
@@ -58795,7 +58795,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nodes".to_string(),
                                         ))],
@@ -58814,7 +58814,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ports".to_string(),
                                         ))],
@@ -58835,7 +58835,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2329),
+                                        constructor: DeclarationId(2330),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "clusters".to_string(),
                                         ))],
@@ -58900,7 +58900,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2328),
+                                    constructor: DeclarationId(2329),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "items".to_string(),
                                     ))],
@@ -59008,7 +59008,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -59027,7 +59027,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -59048,7 +59048,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "refinement".to_string(),
                                         ))],
@@ -59114,7 +59114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -59133,7 +59133,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -59199,7 +59199,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -59218,7 +59218,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -59237,7 +59237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -59389,7 +59389,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -59408,7 +59408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -59427,7 +59427,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -59493,7 +59493,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key".to_string(),
                                         ))],
@@ -59514,7 +59514,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key_span".to_string(),
                                         ))],
@@ -59533,7 +59533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -59552,7 +59552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -59618,7 +59618,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -59637,7 +59637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -59656,7 +59656,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -59722,7 +59722,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -59741,7 +59741,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -59760,7 +59760,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2328),
+                                        constructor: DeclarationId(2329),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -60757,7 +60757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2341),
+                            constructor: DeclarationId(2342),
                             payload: vec![],
                         },
                     ),
@@ -60794,61 +60794,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         "target".to_string(),
                         FieldValue::Reference(DeclarationId(691)),
                     ),
-                    (
-                        "strategy".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2342),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "parameters".to_string(),
-                        FieldValue::List(vec![FieldValue::Record(vec![
-                            (
-                                "slot".to_string(),
-                                FieldValue::Literal(LiteralBits::Int("0".to_string())),
-                            ),
-                            (
-                                "disposition".to_string(),
-                                FieldValue::Variant {
-                                    constructor: DeclarationId(2332),
-                                    payload: vec![],
-                                },
-                            ),
-                        ])]),
-                    ),
-                    (
-                        "cost".to_string(),
-                        FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                    ),
-                ],
-            }),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 37227, 37423),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1627),
-            name: Some("rust_cons_callable".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
-                arguments: vec![],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
-            specialization_parent: None,
-            inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![
-                    (
-                        "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
-                    ),
-                    (
-                        "target".to_string(),
-                        FieldValue::Reference(DeclarationId(689)),
-                    ),
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
@@ -60856,146 +60801,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             payload: vec![],
                         },
                     ),
-                    (
-                        "parameters".to_string(),
-                        FieldValue::List(vec![
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("0".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                        ]),
-                    ),
-                    (
-                        "cost".to_string(),
-                        FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                    ),
-                ],
-            }),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 37425, 37646),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1628),
-            name: Some("rust_concat_callable".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
-                arguments: vec![],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
-            specialization_parent: None,
-            inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![
-                    (
-                        "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
-                    ),
-                    (
-                        "target".to_string(),
-                        FieldValue::Reference(DeclarationId(699)),
-                    ),
-                    (
-                        "strategy".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2344),
-                            payload: vec![],
-                        },
-                    ),
-                    (
-                        "parameters".to_string(),
-                        FieldValue::List(vec![
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("0".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                            FieldValue::Record(vec![
-                                (
-                                    "slot".to_string(),
-                                    FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                                ),
-                                (
-                                    "disposition".to_string(),
-                                    FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
-                                        payload: vec![],
-                                    },
-                                ),
-                            ]),
-                        ]),
-                    ),
-                    (
-                        "cost".to_string(),
-                        FieldValue::Literal(LiteralBits::Int("1".to_string())),
-                    ),
-                ],
-            }),
-            refinement: None,
-            nominal_opacity: None,
-            span: SourceSpan::new("src/v3/spec/rust.dag", 37648, 37875),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1629),
-            name: Some("rust_length_callable".to_string()),
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(1023),
-                arguments: vec![],
-            },
-            type_params: vec![],
-            phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1023)),
-            specialization_parent: None,
-            inhabits: None,
-            value_body: Some(ValueBody::Structural {
-                fields: vec![
-                    (
-                        "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1663)),
-                    ),
-                    (
-                        "target".to_string(),
-                        FieldValue::Reference(DeclarationId(709)),
-                    ),
-                    (
-                        "strategy".to_string(),
-                        FieldValue::Variant {
-                            constructor: DeclarationId(2345),
-                            payload: vec![],
-                        },
-                    ),
                     (
                         "parameters".to_string(),
                         FieldValue::List(vec![FieldValue::Record(vec![
@@ -61006,7 +60811,202 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2331),
+                                    constructor: DeclarationId(2333),
+                                    payload: vec![],
+                                },
+                            ),
+                        ])]),
+                    ),
+                    (
+                        "cost".to_string(),
+                        FieldValue::Literal(LiteralBits::Int("1".to_string())),
+                    ),
+                ],
+            }),
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/spec/rust.dag", 37227, 37423),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1627),
+            name: Some("rust_cons_callable".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1023),
+                arguments: vec![],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: Some(DeclarationId(1023)),
+            specialization_parent: None,
+            inhabits: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "language".to_string(),
+                        FieldValue::Reference(DeclarationId(1663)),
+                    ),
+                    (
+                        "target".to_string(),
+                        FieldValue::Reference(DeclarationId(689)),
+                    ),
+                    (
+                        "strategy".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2344),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "parameters".to_string(),
+                        FieldValue::List(vec![
+                            FieldValue::Record(vec![
+                                (
+                                    "slot".to_string(),
+                                    FieldValue::Literal(LiteralBits::Int("0".to_string())),
+                                ),
+                                (
+                                    "disposition".to_string(),
+                                    FieldValue::Variant {
+                                        constructor: DeclarationId(2333),
+                                        payload: vec![],
+                                    },
+                                ),
+                            ]),
+                            FieldValue::Record(vec![
+                                (
+                                    "slot".to_string(),
+                                    FieldValue::Literal(LiteralBits::Int("1".to_string())),
+                                ),
+                                (
+                                    "disposition".to_string(),
+                                    FieldValue::Variant {
+                                        constructor: DeclarationId(2333),
+                                        payload: vec![],
+                                    },
+                                ),
+                            ]),
+                        ]),
+                    ),
+                    (
+                        "cost".to_string(),
+                        FieldValue::Literal(LiteralBits::Int("1".to_string())),
+                    ),
+                ],
+            }),
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/spec/rust.dag", 37425, 37646),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1628),
+            name: Some("rust_concat_callable".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1023),
+                arguments: vec![],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: Some(DeclarationId(1023)),
+            specialization_parent: None,
+            inhabits: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "language".to_string(),
+                        FieldValue::Reference(DeclarationId(1663)),
+                    ),
+                    (
+                        "target".to_string(),
+                        FieldValue::Reference(DeclarationId(699)),
+                    ),
+                    (
+                        "strategy".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2345),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "parameters".to_string(),
+                        FieldValue::List(vec![
+                            FieldValue::Record(vec![
+                                (
+                                    "slot".to_string(),
+                                    FieldValue::Literal(LiteralBits::Int("0".to_string())),
+                                ),
+                                (
+                                    "disposition".to_string(),
+                                    FieldValue::Variant {
+                                        constructor: DeclarationId(2333),
+                                        payload: vec![],
+                                    },
+                                ),
+                            ]),
+                            FieldValue::Record(vec![
+                                (
+                                    "slot".to_string(),
+                                    FieldValue::Literal(LiteralBits::Int("1".to_string())),
+                                ),
+                                (
+                                    "disposition".to_string(),
+                                    FieldValue::Variant {
+                                        constructor: DeclarationId(2333),
+                                        payload: vec![],
+                                    },
+                                ),
+                            ]),
+                        ]),
+                    ),
+                    (
+                        "cost".to_string(),
+                        FieldValue::Literal(LiteralBits::Int("1".to_string())),
+                    ),
+                ],
+            }),
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/spec/rust.dag", 37648, 37875),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1629),
+            name: Some("rust_length_callable".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1023),
+                arguments: vec![],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: Some(DeclarationId(1023)),
+            specialization_parent: None,
+            inhabits: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "language".to_string(),
+                        FieldValue::Reference(DeclarationId(1663)),
+                    ),
+                    (
+                        "target".to_string(),
+                        FieldValue::Reference(DeclarationId(709)),
+                    ),
+                    (
+                        "strategy".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(2346),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "parameters".to_string(),
+                        FieldValue::List(vec![FieldValue::Record(vec![
+                            (
+                                "slot".to_string(),
+                                FieldValue::Literal(LiteralBits::Int("0".to_string())),
+                            ),
+                            (
+                                "disposition".to_string(),
+                                FieldValue::Variant {
+                                    constructor: DeclarationId(2332),
                                     payload: vec![],
                                 },
                             ),
@@ -61379,7 +61379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2346),
+                            constructor: DeclarationId(2347),
                             payload: vec![],
                         },
                     ),
@@ -61393,7 +61393,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2331),
+                                    constructor: DeclarationId(2332),
                                     payload: vec![],
                                 },
                             ),
@@ -61434,7 +61434,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2347),
+                            constructor: DeclarationId(2348),
                             payload: vec![],
                         },
                     ),
@@ -61449,7 +61449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2331),
+                                        constructor: DeclarationId(2332),
                                         payload: vec![],
                                     },
                                 ),
@@ -61462,7 +61462,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2332),
+                                        constructor: DeclarationId(2333),
                                         payload: vec![],
                                     },
                                 ),
@@ -61475,7 +61475,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2331),
+                                        constructor: DeclarationId(2332),
                                         payload: vec![],
                                     },
                                 ),
@@ -61517,7 +61517,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2348),
+                            constructor: DeclarationId(2349),
                             payload: vec![],
                         },
                     ),
@@ -61532,7 +61532,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2331),
+                                        constructor: DeclarationId(2332),
                                         payload: vec![],
                                     },
                                 ),
@@ -61545,7 +61545,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2331),
+                                        constructor: DeclarationId(2332),
                                         payload: vec![],
                                     },
                                 ),
@@ -61587,7 +61587,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2349),
+                            constructor: DeclarationId(2350),
                             payload: vec![],
                         },
                     ),
@@ -61602,7 +61602,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2331),
+                                        constructor: DeclarationId(2332),
                                         payload: vec![],
                                     },
                                 ),
@@ -61615,7 +61615,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2331),
+                                        constructor: DeclarationId(2332),
                                         payload: vec![],
                                     },
                                 ),
@@ -61657,7 +61657,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2350),
+                            constructor: DeclarationId(2351),
                             payload: vec![],
                         },
                     ),
@@ -61672,7 +61672,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2331),
+                                        constructor: DeclarationId(2332),
                                         payload: vec![],
                                     },
                                 ),
@@ -61685,7 +61685,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2331),
+                                        constructor: DeclarationId(2332),
                                         payload: vec![],
                                     },
                                 ),
@@ -61727,17 +61727,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2352),
+                            constructor: DeclarationId(2353),
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1818)),
+                        FieldValue::Reference(DeclarationId(1819)),
                     ),
                     (
                         "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1820)),
+                        FieldValue::Reference(DeclarationId(1821)),
                     ),
                     (
                         "scrutinee".to_string(),
@@ -62171,7 +62171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{ let mut __left = {left}; __left.extend({right}); __left }"
                                     .to_string(),
@@ -62185,7 +62185,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -62225,7 +62225,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).len() as i64".to_string(),
                             ))],
@@ -62238,7 +62238,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -62276,7 +62276,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).is_empty()".to_string(),
                             ))],
@@ -62289,7 +62289,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -62329,7 +62329,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).iter().fold({init}, {body})".to_string(),
                             ))],
@@ -62342,7 +62342,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -62382,7 +62382,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2359),
+                            constructor: DeclarationId(2360),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).iter().map({body}).collect::<Vec<_>>()".to_string(),
                             ))],
@@ -62395,7 +62395,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2358),
+                            constructor: DeclarationId(2359),
                             payload: vec![],
                         },
                     ),
@@ -62467,14 +62467,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "read".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2354),
                             payload: vec![],
                         },
                     ),
                     (
                         "construct".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2355),
+                            constructor: DeclarationId(2356),
                             payload: vec![],
                         },
                     ),
@@ -62605,49 +62605,49 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2179),
+                            constructor: DeclarationId(2180),
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2182),
+                            constructor: DeclarationId(2183),
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2186),
+                            constructor: DeclarationId(2187),
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2188),
+                            constructor: DeclarationId(2189),
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2191),
+                            constructor: DeclarationId(2192),
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2194),
+                            constructor: DeclarationId(2195),
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2197),
+                            constructor: DeclarationId(2198),
                             payload: vec![],
                         },
                     ),
@@ -62685,7 +62685,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2200),
+                                    constructor: DeclarationId(2201),
                                     payload: vec![],
                                 },
                             ),
@@ -63296,15 +63296,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "SnapshotSurface".to_string(),
-                        ty: DeclarationId(2766),
+                        ty: DeclarationId(2767),
                     },
                     Field {
                         label: "SnapshotDag".to_string(),
-                        ty: DeclarationId(2767),
+                        ty: DeclarationId(2768),
                     },
                     Field {
                         label: "SnapshotText".to_string(),
-                        ty: DeclarationId(2768),
+                        ty: DeclarationId(2769),
                     },
                 ],
             },
@@ -63520,7 +63520,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2766),
+                            constructor: DeclarationId(2767),
                             payload: vec![],
                         },
                     ),
@@ -63555,7 +63555,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2767),
+                            constructor: DeclarationId(2768),
                             payload: vec![],
                         },
                     ),
@@ -63590,7 +63590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2767),
+                            constructor: DeclarationId(2768),
                             payload: vec![],
                         },
                     ),
@@ -63625,7 +63625,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2767),
+                            constructor: DeclarationId(2768),
                             payload: vec![],
                         },
                     ),
@@ -63660,7 +63660,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2767),
+                            constructor: DeclarationId(2768),
                             payload: vec![],
                         },
                     ),
@@ -63695,7 +63695,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2768),
+                            constructor: DeclarationId(2769),
                             payload: vec![],
                         },
                     ),
@@ -63845,7 +63845,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("from_symbol".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230)],
-                output: DeclarationId(2769),
+                output: DeclarationId(2770),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/compiler/operators.dag",
                     156,
@@ -64076,6 +64076,42 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         });
         declarations.push(Declaration {
             id: DeclarationId(1716),
+            name: Some("lens_parallelism_entry".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1711),
+                arguments: vec![],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: Some(DeclarationId(1711)),
+            specialization_parent: None,
+            inhabits: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "name".to_string(),
+                        FieldValue::Literal(LiteralBits::String("parallelism".to_string())),
+                    ),
+                    (
+                        "lens_file".to_string(),
+                        FieldValue::Literal(LiteralBits::String(
+                            "src/v3/lenses/parallelism.dag".to_string(),
+                        )),
+                    ),
+                    (
+                        "generated_file".to_string(),
+                        FieldValue::Literal(LiteralBits::String(
+                            "src/v3/compiler/src/lens_parallelism_generated.rs".to_string(),
+                        )),
+                    ),
+                ],
+            }),
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 3037, 3226),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1717),
             name: Some("lens_provenance_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1711),
@@ -64108,10 +64144,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 3037, 3222),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 3228, 3413),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1717),
+            id: DeclarationId(1718),
             name: Some("lens_structural_resolution_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1711),
@@ -64147,10 +64183,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 3224, 3453),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 3415, 3644),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1718),
+            id: DeclarationId(1719),
             name: Some("lens_unused_parameters_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1711),
@@ -64183,10 +64219,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 3455, 3668),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 3646, 3859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1719),
+            id: DeclarationId(1720),
             name: Some("lens_infer_helpers_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1711),
@@ -64219,10 +64255,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 4295, 4487),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 4486, 4678),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1720),
+            id: DeclarationId(1721),
             name: Some("lens_variant_payload_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1711),
@@ -64255,10 +64291,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 4489, 4689),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 4680, 4880),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1721),
+            id: DeclarationId(1722),
             name: Some("lens_lower_helpers_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1711),
@@ -64291,20 +64327,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 4939, 5131),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 5130, 5322),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1722),
+            id: DeclarationId(1723),
             name: Some("IntegerAlgebra".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "OrderedRingAlgebra".to_string(),
-                        ty: DeclarationId(2770),
+                        ty: DeclarationId(2771),
                     },
                     Field {
                         label: "SemiringAlgebra".to_string(),
-                        ty: DeclarationId(2771),
+                        ty: DeclarationId(2772),
                     },
                 ],
             },
@@ -64319,21 +64355,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6404, 6466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1723),
+            id: DeclarationId(1724),
             name: Some("NonIntegerAlgebra".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ApproximateFieldAlgebra".to_string(),
-                        ty: DeclarationId(2772),
+                        ty: DeclarationId(2773),
                     },
                     Field {
                         label: "BooleanAlgebraAlgebra".to_string(),
-                        ty: DeclarationId(2773),
+                        ty: DeclarationId(2774),
                     },
                     Field {
                         label: "TerminalAlgebra".to_string(),
-                        ty: DeclarationId(2774),
+                        ty: DeclarationId(2775),
                     },
                 ],
             },
@@ -64348,37 +64384,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6468, 6564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1724),
+            id: DeclarationId(1725),
             name: Some("TargetCarrier".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BitCarrier".to_string(),
-                        ty: DeclarationId(2775),
+                        ty: DeclarationId(2776),
                     },
                     Field {
                         label: "ByteCarrier".to_string(),
-                        ty: DeclarationId(2776),
+                        ty: DeclarationId(2777),
                     },
                     Field {
                         label: "Word16Carrier".to_string(),
-                        ty: DeclarationId(2777),
+                        ty: DeclarationId(2778),
                     },
                     Field {
                         label: "Word32Carrier".to_string(),
-                        ty: DeclarationId(2778),
+                        ty: DeclarationId(2779),
                     },
                     Field {
                         label: "Word64Carrier".to_string(),
-                        ty: DeclarationId(2779),
+                        ty: DeclarationId(2780),
                     },
                     Field {
                         label: "Word128Carrier".to_string(),
-                        ty: DeclarationId(2780),
+                        ty: DeclarationId(2781),
                     },
                     Field {
                         label: "TerminalCarrier".to_string(),
-                        ty: DeclarationId(2781),
+                        ty: DeclarationId(2782),
                     },
                 ],
             },
@@ -64393,21 +64429,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8154, 8296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1725),
+            id: DeclarationId(1726),
             name: Some("IntegerOverflow".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TwoComplementWrap".to_string(),
-                        ty: DeclarationId(2782),
+                        ty: DeclarationId(2783),
                     },
                     Field {
                         label: "Saturating".to_string(),
-                        ty: DeclarationId(2783),
+                        ty: DeclarationId(2784),
                     },
                     Field {
                         label: "Trap".to_string(),
-                        ty: DeclarationId(2784),
+                        ty: DeclarationId(2785),
                     },
                 ],
             },
@@ -64422,17 +64458,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9013, 9079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1726),
+            id: DeclarationId(1727),
             name: Some("RustPrimitive".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IntegerPrimitive".to_string(),
-                        ty: DeclarationId(2785),
+                        ty: DeclarationId(2786),
                     },
                     Field {
                         label: "NonIntegerPrimitive".to_string(),
-                        ty: DeclarationId(2786),
+                        ty: DeclarationId(2787),
                     },
                 ],
             },
@@ -64447,94 +64483,94 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9834, 10616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1727),
+            id: DeclarationId(1728),
             name: Some("rust_pilot_primitives".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1726),
+                    value: DeclarationId(1727),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2787)),
+            meta_tag: Some(DeclarationId(2788)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
                 FieldValue::Variant {
-                    constructor: DeclarationId(2785),
+                    constructor: DeclarationId(2786),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2770),
+                            constructor: DeclarationId(2771),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2776),
+                            constructor: DeclarationId(2777),
                             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(2782),
+                            constructor: DeclarationId(2783),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2785),
+                    constructor: DeclarationId(2786),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2770),
+                            constructor: DeclarationId(2771),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2777),
+                            constructor: DeclarationId(2778),
                             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(2782),
+                            constructor: DeclarationId(2783),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2785),
+                    constructor: DeclarationId(2786),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2770),
+                            constructor: DeclarationId(2771),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2778),
+                            constructor: DeclarationId(2779),
                             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(2782),
+                            constructor: DeclarationId(2783),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2785),
+                    constructor: DeclarationId(2786),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2770),
+                            constructor: DeclarationId(2771),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2779),
+                            constructor: DeclarationId(2780),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -64543,21 +64579,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         FieldValue::Literal(LiteralBits::String("9223372036854775807".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2782),
+                            constructor: DeclarationId(2783),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2785),
+                    constructor: DeclarationId(2786),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i128".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2770),
+                            constructor: DeclarationId(2771),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2780),
+                            constructor: DeclarationId(2781),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -64568,84 +64604,84 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2782),
+                            constructor: DeclarationId(2783),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2785),
+                    constructor: DeclarationId(2786),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2771),
+                            constructor: DeclarationId(2772),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2776),
+                            constructor: DeclarationId(2777),
                             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(2782),
+                            constructor: DeclarationId(2783),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2785),
+                    constructor: DeclarationId(2786),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2771),
+                            constructor: DeclarationId(2772),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2777),
+                            constructor: DeclarationId(2778),
                             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(2782),
+                            constructor: DeclarationId(2783),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2785),
+                    constructor: DeclarationId(2786),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2771),
+                            constructor: DeclarationId(2772),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2778),
+                            constructor: DeclarationId(2779),
                             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(2782),
+                            constructor: DeclarationId(2783),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2785),
+                    constructor: DeclarationId(2786),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2771),
+                            constructor: DeclarationId(2772),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2779),
+                            constructor: DeclarationId(2780),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
@@ -64654,21 +64690,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2782),
+                            constructor: DeclarationId(2783),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2785),
+                    constructor: DeclarationId(2786),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u128".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2771),
+                            constructor: DeclarationId(2772),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2780),
+                            constructor: DeclarationId(2781),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
@@ -64677,66 +64713,66 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2782),
+                            constructor: DeclarationId(2783),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2786),
+                    constructor: DeclarationId(2787),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("f32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2772),
+                            constructor: DeclarationId(2773),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2778),
+                            constructor: DeclarationId(2779),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2786),
+                    constructor: DeclarationId(2787),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("f64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2772),
+                            constructor: DeclarationId(2773),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2779),
+                            constructor: DeclarationId(2780),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2786),
+                    constructor: DeclarationId(2787),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("bool".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2773),
+                            constructor: DeclarationId(2774),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2775),
+                            constructor: DeclarationId(2776),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2786),
+                    constructor: DeclarationId(2787),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("()".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2774),
+                            constructor: DeclarationId(2775),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2781),
+                            constructor: DeclarationId(2782),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
@@ -64748,29 +64784,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10937, 15660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1728),
+            id: DeclarationId(1729),
             name: Some("CronField".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Wildcard".to_string(),
-                        ty: DeclarationId(2788),
+                        ty: DeclarationId(2789),
                     },
                     Field {
                         label: "Exact".to_string(),
-                        ty: DeclarationId(2789),
+                        ty: DeclarationId(2790),
                     },
                     Field {
                         label: "Listed".to_string(),
-                        ty: DeclarationId(2791),
+                        ty: DeclarationId(2792),
                     },
                     Field {
                         label: "Ranged".to_string(),
-                        ty: DeclarationId(2792),
+                        ty: DeclarationId(2793),
                     },
                     Field {
                         label: "Step".to_string(),
-                        ty: DeclarationId(2793),
+                        ty: DeclarationId(2794),
                     },
                 ],
             },
@@ -64785,29 +64821,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4214, 4433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1729),
+            id: DeclarationId(1730),
             name: Some("CronSchedule".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "minute".to_string(),
-                        ty: DeclarationId(1728),
+                        ty: DeclarationId(1729),
                     },
                     Field {
                         label: "hour".to_string(),
-                        ty: DeclarationId(1728),
+                        ty: DeclarationId(1729),
                     },
                     Field {
                         label: "day_of_month".to_string(),
-                        ty: DeclarationId(1728),
+                        ty: DeclarationId(1729),
                     },
                     Field {
                         label: "month".to_string(),
-                        ty: DeclarationId(1728),
+                        ty: DeclarationId(1729),
                     },
                     Field {
                         label: "day_of_week".to_string(),
-                        ty: DeclarationId(1728),
+                        ty: DeclarationId(1729),
                     },
                 ],
             },
@@ -64822,7 +64858,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4435, 4564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1730),
+            id: DeclarationId(1731),
             name: Some("CronEntry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64832,7 +64868,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "schedule".to_string(),
-                        ty: DeclarationId(1729),
+                        ty: DeclarationId(1730),
                     },
                     Field {
                         label: "command".to_string(),
@@ -64851,10 +64887,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4566, 4641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1731),
+            id: DeclarationId(1732),
             name: Some("render_cron_field".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1728)],
+                inputs: vec![DeclarationId(1729)],
                 output: DeclarationId(230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "dsl/extdeps/cron_schedule_model.dag",
@@ -64873,10 +64909,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4643, 4963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1732),
+            id: DeclarationId(1733),
             name: Some("render_cron_schedule".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1729)],
+                inputs: vec![DeclarationId(1730)],
                 output: DeclarationId(230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "dsl/extdeps/cron_schedule_model.dag",
@@ -64895,7 +64931,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4965, 5253),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1733),
+            id: DeclarationId(1734),
             name: Some("wire_contract".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(312),
@@ -64916,21 +64952,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 684, 758),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1734),
+            id: DeclarationId(1735),
             name: Some("UserType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "User".to_string(),
-                        ty: DeclarationId(2794),
+                        ty: DeclarationId(2795),
                     },
                     Field {
                         label: "Bot".to_string(),
-                        ty: DeclarationId(2795),
+                        ty: DeclarationId(2796),
                     },
                     Field {
                         label: "Organization".to_string(),
-                        ty: DeclarationId(2796),
+                        ty: DeclarationId(2797),
                     },
                 ],
             },
@@ -64945,7 +64981,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 831, 872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1735),
+            id: DeclarationId(1736),
             name: Some("GitHubUser".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64959,7 +64995,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type".to_string(),
-                        ty: DeclarationId(1734),
+                        ty: DeclarationId(1735),
                     },
                 ],
             },
@@ -64974,7 +65010,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 874, 936),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1736),
+            id: DeclarationId(1737),
             name: Some("Repository".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65011,7 +65047,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1009, 1120),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1737),
+            id: DeclarationId(1738),
             name: Some("GitHubAuthToken".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65021,11 +65057,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "scopes".to_string(),
-                        ty: DeclarationId(2797),
+                        ty: DeclarationId(2798),
                     },
                     Field {
                         label: "expires_at".to_string(),
-                        ty: DeclarationId(2798),
+                        ty: DeclarationId(2799),
                     },
                 ],
             },
@@ -65040,29 +65076,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1193, 1286),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1738),
+            id: DeclarationId(1739),
             name: Some("GitHubScope".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ScopeRepo".to_string(),
-                        ty: DeclarationId(2799),
+                        ty: DeclarationId(2800),
                     },
                     Field {
                         label: "ScopeGist".to_string(),
-                        ty: DeclarationId(2800),
+                        ty: DeclarationId(2801),
                     },
                     Field {
                         label: "ScopeWorkflow".to_string(),
-                        ty: DeclarationId(2801),
+                        ty: DeclarationId(2802),
                     },
                     Field {
                         label: "ScopeReadOrg".to_string(),
-                        ty: DeclarationId(2802),
+                        ty: DeclarationId(2803),
                     },
                     Field {
                         label: "ScopeReadUser".to_string(),
-                        ty: DeclarationId(2803),
+                        ty: DeclarationId(2804),
                     },
                 ],
             },
@@ -65077,7 +65113,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1288, 1385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1739),
+            id: DeclarationId(1740),
             name: Some("Pagination".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65087,7 +65123,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "cursor".to_string(),
-                        ty: DeclarationId(2804),
+                        ty: DeclarationId(2805),
                     },
                     Field {
                         label: "has_next".to_string(),
@@ -65106,21 +65142,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1510, 1580),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1740),
+            id: DeclarationId(1741),
             name: Some("GitHubPermission".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PermRead".to_string(),
-                        ty: DeclarationId(2805),
+                        ty: DeclarationId(2806),
                     },
                     Field {
                         label: "PermWrite".to_string(),
-                        ty: DeclarationId(2806),
+                        ty: DeclarationId(2807),
                     },
                     Field {
                         label: "PermAdmin".to_string(),
-                        ty: DeclarationId(2807),
+                        ty: DeclarationId(2808),
                     },
                 ],
             },
@@ -65135,7 +65171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1653, 1709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1741),
+            id: DeclarationId(1742),
             name: Some("default_api_base".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65154,7 +65190,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1782, 1838),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1742),
+            id: DeclarationId(1743),
             name: Some("default_per_page".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -65171,7 +65207,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1840, 1871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1743),
+            id: DeclarationId(1744),
             name: Some("max_per_page".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -65188,7 +65224,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1873, 1901),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1744),
+            id: DeclarationId(1745),
             name: Some("Workflow".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65198,23 +65234,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "on".to_string(),
-                        ty: DeclarationId(2808),
+                        ty: DeclarationId(2809),
                     },
                     Field {
                         label: "concurrency".to_string(),
-                        ty: DeclarationId(2809),
+                        ty: DeclarationId(2810),
                     },
                     Field {
                         label: "jobs".to_string(),
-                        ty: DeclarationId(2810),
+                        ty: DeclarationId(2811),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(2812),
+                        ty: DeclarationId(2813),
                     },
                     Field {
                         label: "permissions".to_string(),
-                        ty: DeclarationId(2813),
+                        ty: DeclarationId(2814),
                     },
                 ],
             },
@@ -65229,25 +65265,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1484, 1748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1745),
+            id: DeclarationId(1746),
             name: Some("WorkflowPermissions".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "contents".to_string(),
-                        ty: DeclarationId(1746),
+                        ty: DeclarationId(1747),
                     },
                     Field {
                         label: "pull_requests".to_string(),
-                        ty: DeclarationId(1746),
+                        ty: DeclarationId(1747),
                     },
                     Field {
                         label: "issues".to_string(),
-                        ty: DeclarationId(1746),
+                        ty: DeclarationId(1747),
                     },
                     Field {
                         label: "actions".to_string(),
-                        ty: DeclarationId(1746),
+                        ty: DeclarationId(1747),
                     },
                 ],
             },
@@ -65262,21 +65298,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1750, 1892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1746),
+            id: DeclarationId(1747),
             name: Some("PermissionLevel".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PermRead".to_string(),
-                        ty: DeclarationId(2814),
+                        ty: DeclarationId(2815),
                     },
                     Field {
                         label: "PermWrite".to_string(),
-                        ty: DeclarationId(2815),
+                        ty: DeclarationId(2816),
                     },
                     Field {
                         label: "PermNone".to_string(),
-                        ty: DeclarationId(2816),
+                        ty: DeclarationId(2817),
                     },
                 ],
             },
@@ -65291,29 +65327,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1894, 1948),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1747),
+            id: DeclarationId(1748),
             name: Some("WorkflowTrigger".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Push".to_string(),
-                        ty: DeclarationId(2819),
+                        ty: DeclarationId(2820),
                     },
                     Field {
                         label: "PullRequest".to_string(),
-                        ty: DeclarationId(2822),
+                        ty: DeclarationId(2823),
                     },
                     Field {
                         label: "Schedule".to_string(),
-                        ty: DeclarationId(2823),
+                        ty: DeclarationId(2824),
                     },
                     Field {
                         label: "WorkflowDispatch".to_string(),
-                        ty: DeclarationId(2825),
+                        ty: DeclarationId(2826),
                     },
                     Field {
                         label: "WorkflowCall".to_string(),
-                        ty: DeclarationId(2827),
+                        ty: DeclarationId(2828),
                     },
                 ],
             },
@@ -65328,29 +65364,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2064, 2356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1748),
+            id: DeclarationId(1749),
             name: Some("PullRequestActivity".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Opened".to_string(),
-                        ty: DeclarationId(2828),
+                        ty: DeclarationId(2829),
                     },
                     Field {
                         label: "Synchronize".to_string(),
-                        ty: DeclarationId(2829),
+                        ty: DeclarationId(2830),
                     },
                     Field {
                         label: "Reopened".to_string(),
-                        ty: DeclarationId(2830),
+                        ty: DeclarationId(2831),
                     },
                     Field {
                         label: "ReadyForReview".to_string(),
-                        ty: DeclarationId(2831),
+                        ty: DeclarationId(2832),
                     },
                     Field {
                         label: "Closed".to_string(),
-                        ty: DeclarationId(2832),
+                        ty: DeclarationId(2833),
                     },
                 ],
             },
@@ -65365,7 +65401,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2358, 2452),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1749),
+            id: DeclarationId(1750),
             name: Some("DispatchInput".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65375,7 +65411,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "description".to_string(),
-                        ty: DeclarationId(2833),
+                        ty: DeclarationId(2834),
                     },
                     Field {
                         label: "required".to_string(),
@@ -65383,11 +65419,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "default".to_string(),
-                        ty: DeclarationId(2834),
+                        ty: DeclarationId(2835),
                     },
                     Field {
                         label: "type".to_string(),
-                        ty: DeclarationId(1750),
+                        ty: DeclarationId(1751),
                     },
                 ],
             },
@@ -65402,25 +65438,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2454, 2576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1750),
+            id: DeclarationId(1751),
             name: Some("DispatchInputType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "InputString".to_string(),
-                        ty: DeclarationId(2835),
+                        ty: DeclarationId(2836),
                     },
                     Field {
                         label: "InputBoolean".to_string(),
-                        ty: DeclarationId(2836),
+                        ty: DeclarationId(2837),
                     },
                     Field {
                         label: "InputChoice".to_string(),
-                        ty: DeclarationId(2837),
+                        ty: DeclarationId(2838),
                     },
                     Field {
                         label: "InputEnvironment".to_string(),
-                        ty: DeclarationId(2838),
+                        ty: DeclarationId(2839),
                     },
                 ],
             },
@@ -65435,21 +65471,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2578, 2662),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1751),
+            id: DeclarationId(1752),
             name: Some("SecretScope".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "StepScope".to_string(),
-                        ty: DeclarationId(2839),
+                        ty: DeclarationId(2840),
                     },
                     Field {
                         label: "JobScope".to_string(),
-                        ty: DeclarationId(2840),
+                        ty: DeclarationId(2841),
                     },
                     Field {
                         label: "WorkflowScope".to_string(),
-                        ty: DeclarationId(2841),
+                        ty: DeclarationId(2842),
                     },
                 ],
             },
@@ -65464,7 +65500,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4765, 4820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1752),
+            id: DeclarationId(1753),
             name: Some("WorkflowSecret".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65474,7 +65510,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "scope".to_string(),
-                        ty: DeclarationId(1751),
+                        ty: DeclarationId(1752),
                     },
                 ],
             },
@@ -65489,7 +65525,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5095, 5158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1753),
+            id: DeclarationId(1754),
             name: Some("Job".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65499,39 +65535,39 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(2842),
+                        ty: DeclarationId(2843),
                     },
                     Field {
                         label: "runner".to_string(),
-                        ty: DeclarationId(1757),
+                        ty: DeclarationId(1758),
                     },
                     Field {
                         label: "steps".to_string(),
-                        ty: DeclarationId(2843),
+                        ty: DeclarationId(2844),
                     },
                     Field {
                         label: "needs".to_string(),
-                        ty: DeclarationId(2844),
+                        ty: DeclarationId(2845),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(2846),
+                        ty: DeclarationId(2847),
                     },
                     Field {
                         label: "outputs".to_string(),
-                        ty: DeclarationId(2848),
+                        ty: DeclarationId(2849),
                     },
                     Field {
                         label: "if_condition".to_string(),
-                        ty: DeclarationId(2849),
+                        ty: DeclarationId(2850),
                     },
                     Field {
                         label: "strategy".to_string(),
-                        ty: DeclarationId(2850),
+                        ty: DeclarationId(2851),
                     },
                     Field {
                         label: "timeout_minutes".to_string(),
-                        ty: DeclarationId(2851),
+                        ty: DeclarationId(2852),
                     },
                     Field {
                         label: "continue_on_error".to_string(),
@@ -65539,7 +65575,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "concurrency".to_string(),
-                        ty: DeclarationId(2852),
+                        ty: DeclarationId(2853),
                     },
                 ],
             },
@@ -65554,17 +65590,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5302, 5771),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1754),
+            id: DeclarationId(1755),
             name: Some("CancelInProgressSpec".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "CancelInProgressBool".to_string(),
-                        ty: DeclarationId(2853),
+                        ty: DeclarationId(2854),
                     },
                     Field {
                         label: "CancelInProgressExpression".to_string(),
-                        ty: DeclarationId(2854),
+                        ty: DeclarationId(2855),
                     },
                 ],
             },
@@ -65579,17 +65615,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6589, 6709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1755),
+            id: DeclarationId(1756),
             name: Some("CancelInProgressWhenQueueMax".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "QueueMaxCancelInProgressFalse".to_string(),
-                        ty: DeclarationId(2855),
+                        ty: DeclarationId(2856),
                     },
                     Field {
                         label: "QueueMaxCancelInProgressExpression".to_string(),
-                        ty: DeclarationId(2856),
+                        ty: DeclarationId(2857),
                     },
                 ],
             },
@@ -65604,21 +65640,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7517, 7646),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1756),
+            id: DeclarationId(1757),
             name: Some("ConcurrencySpec".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ConcurrencyScalar".to_string(),
-                        ty: DeclarationId(2857),
+                        ty: DeclarationId(2858),
                     },
                     Field {
                         label: "ConcurrencyMappingQueueMax".to_string(),
-                        ty: DeclarationId(2859),
+                        ty: DeclarationId(2860),
                     },
                     Field {
                         label: "ConcurrencyMappingQueueNotMax".to_string(),
-                        ty: DeclarationId(2862),
+                        ty: DeclarationId(2863),
                     },
                 ],
             },
@@ -65633,21 +65669,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8199, 8845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1757),
+            id: DeclarationId(1758),
             name: Some("RunnerSpec".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "HostedRunner".to_string(),
-                        ty: DeclarationId(2863),
+                        ty: DeclarationId(2864),
                     },
                     Field {
                         label: "SelfHosted".to_string(),
-                        ty: DeclarationId(2865),
+                        ty: DeclarationId(2866),
                     },
                     Field {
                         label: "RunsOnExpression".to_string(),
-                        ty: DeclarationId(2866),
+                        ty: DeclarationId(2867),
                     },
                 ],
             },
@@ -65662,33 +65698,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10017, 10240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1758),
+            id: DeclarationId(1759),
             name: Some("RunnerLabel".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "UbuntuLatest".to_string(),
-                        ty: DeclarationId(2867),
+                        ty: DeclarationId(2868),
                     },
                     Field {
                         label: "Ubuntu2404".to_string(),
-                        ty: DeclarationId(2868),
+                        ty: DeclarationId(2869),
                     },
                     Field {
                         label: "Ubuntu2204".to_string(),
-                        ty: DeclarationId(2869),
+                        ty: DeclarationId(2870),
                     },
                     Field {
                         label: "MacosLatest".to_string(),
-                        ty: DeclarationId(2870),
+                        ty: DeclarationId(2871),
                     },
                     Field {
                         label: "Macos14".to_string(),
-                        ty: DeclarationId(2871),
+                        ty: DeclarationId(2872),
                     },
                     Field {
                         label: "WindowsLatest".to_string(),
-                        ty: DeclarationId(2872),
+                        ty: DeclarationId(2873),
                     },
                 ],
             },
@@ -65703,17 +65739,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10242, 10351),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1759),
+            id: DeclarationId(1760),
             name: Some("Step".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "RunStep".to_string(),
-                        ty: DeclarationId(2880),
+                        ty: DeclarationId(2881),
                     },
                     Field {
                         label: "UsesStep".to_string(),
-                        ty: DeclarationId(2889),
+                        ty: DeclarationId(2890),
                     },
                 ],
             },
@@ -65728,29 +65764,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10496, 11091),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1760),
+            id: DeclarationId(1761),
             name: Some("ShellType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Bash".to_string(),
-                        ty: DeclarationId(2890),
+                        ty: DeclarationId(2891),
                     },
                     Field {
                         label: "Sh".to_string(),
-                        ty: DeclarationId(2891),
+                        ty: DeclarationId(2892),
                     },
                     Field {
                         label: "Pwsh".to_string(),
-                        ty: DeclarationId(2892),
+                        ty: DeclarationId(2893),
                     },
                     Field {
                         label: "Python".to_string(),
-                        ty: DeclarationId(2893),
+                        ty: DeclarationId(2894),
                     },
                     Field {
                         label: "Cmd".to_string(),
-                        ty: DeclarationId(2894),
+                        ty: DeclarationId(2895),
                     },
                 ],
             },
@@ -65765,7 +65801,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11093, 11141),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1761),
+            id: DeclarationId(1762),
             name: Some("ActionRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65794,41 +65830,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11143, 11206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1762),
+            id: DeclarationId(1763),
             name: Some("LogAnnotation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "AnnotationError".to_string(),
-                        ty: DeclarationId(2898),
+                        ty: DeclarationId(2899),
                     },
                     Field {
                         label: "AnnotationWarning".to_string(),
-                        ty: DeclarationId(2902),
+                        ty: DeclarationId(2903),
                     },
                     Field {
                         label: "AnnotationNotice".to_string(),
-                        ty: DeclarationId(2906),
+                        ty: DeclarationId(2907),
                     },
                     Field {
                         label: "AnnotationGroup".to_string(),
-                        ty: DeclarationId(2907),
+                        ty: DeclarationId(2908),
                     },
                     Field {
                         label: "AnnotationEndGroup".to_string(),
-                        ty: DeclarationId(2908),
+                        ty: DeclarationId(2909),
                     },
                     Field {
                         label: "SetOutput".to_string(),
-                        ty: DeclarationId(2909),
+                        ty: DeclarationId(2910),
                     },
                     Field {
                         label: "AddMask".to_string(),
-                        ty: DeclarationId(2910),
+                        ty: DeclarationId(2911),
                     },
                     Field {
                         label: "StopCommands".to_string(),
-                        ty: DeclarationId(2911),
+                        ty: DeclarationId(2912),
                     },
                 ],
             },
@@ -65843,7 +65879,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11440, 11867),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1763),
+            id: DeclarationId(1764),
             name: Some("annotation_error_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65862,7 +65898,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11933, 11982),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1764),
+            id: DeclarationId(1765),
             name: Some("annotation_warning_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65881,7 +65917,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11983, 12036),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1765),
+            id: DeclarationId(1766),
             name: Some("annotation_notice_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65900,7 +65936,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12037, 12088),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1766),
+            id: DeclarationId(1767),
             name: Some("annotation_group_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65919,7 +65955,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12089, 12139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1767),
+            id: DeclarationId(1768),
             name: Some("annotation_endgroup".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65938,7 +65974,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12140, 12189),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1768),
+            id: DeclarationId(1769),
             name: Some("annotation_set_output_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65957,7 +65993,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12190, 12254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1769),
+            id: DeclarationId(1770),
             name: Some("annotation_add_mask_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65976,7 +66012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12255, 12311),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1770),
+            id: DeclarationId(1771),
             name: Some("annotation_stop_commands_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -65995,17 +66031,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12312, 12378),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1771),
+            id: DeclarationId(1772),
             name: Some("ArtifactOp".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Upload".to_string(),
-                        ty: DeclarationId(2913),
+                        ty: DeclarationId(2914),
                     },
                     Field {
                         label: "Download".to_string(),
-                        ty: DeclarationId(2915),
+                        ty: DeclarationId(2916),
                     },
                 ],
             },
@@ -66020,21 +66056,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12600, 12765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1772),
+            id: DeclarationId(1773),
             name: Some("MissingFilesBehavior".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Warn".to_string(),
-                        ty: DeclarationId(2916),
+                        ty: DeclarationId(2917),
                     },
                     Field {
                         label: "ErrorOut".to_string(),
-                        ty: DeclarationId(2917),
+                        ty: DeclarationId(2918),
                     },
                     Field {
                         label: "Ignore".to_string(),
-                        ty: DeclarationId(2918),
+                        ty: DeclarationId(2919),
                     },
                 ],
             },
@@ -66049,15 +66085,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12767, 12819),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1773),
+            id: DeclarationId(1774),
             name: Some("upload_artifact_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1761),
+                template: DeclarationId(1762),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1761)),
+            meta_tag: Some(DeclarationId(1762)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -66070,15 +66106,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12870, 12979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1774),
+            id: DeclarationId(1775),
             name: Some("download_artifact_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1761),
+                template: DeclarationId(1762),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1761)),
+            meta_tag: Some(DeclarationId(1762)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -66091,21 +66127,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12981, 13094),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1775),
+            id: DeclarationId(1776),
             name: Some("MatrixStrategy".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "dimensions".to_string(),
-                        ty: DeclarationId(2920),
+                        ty: DeclarationId(2921),
                     },
                     Field {
                         label: "include".to_string(),
-                        ty: DeclarationId(2922),
+                        ty: DeclarationId(2923),
                     },
                     Field {
                         label: "exclude".to_string(),
-                        ty: DeclarationId(2924),
+                        ty: DeclarationId(2925),
                     },
                     Field {
                         label: "fail_fast".to_string(),
@@ -66113,7 +66149,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "max_parallel".to_string(),
-                        ty: DeclarationId(2925),
+                        ty: DeclarationId(2926),
                     },
                 ],
             },
@@ -66128,33 +66164,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13233, 13409),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1776),
+            id: DeclarationId(1777),
             name: Some("CheckConclusion".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Success".to_string(),
-                        ty: DeclarationId(2926),
+                        ty: DeclarationId(2927),
                     },
                     Field {
                         label: "Failure".to_string(),
-                        ty: DeclarationId(2927),
+                        ty: DeclarationId(2928),
                     },
                     Field {
                         label: "Cancelled".to_string(),
-                        ty: DeclarationId(2928),
+                        ty: DeclarationId(2929),
                     },
                     Field {
                         label: "Skipped".to_string(),
-                        ty: DeclarationId(2929),
+                        ty: DeclarationId(2930),
                     },
                     Field {
                         label: "TimedOut".to_string(),
-                        ty: DeclarationId(2930),
+                        ty: DeclarationId(2931),
                     },
                     Field {
                         label: "ActionRequired".to_string(),
-                        ty: DeclarationId(2931),
+                        ty: DeclarationId(2932),
                     },
                 ],
             },
@@ -66169,15 +66205,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13538, 13640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1777),
+            id: DeclarationId(1778),
             name: Some("checkout_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1761),
+                template: DeclarationId(1762),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1761)),
+            meta_tag: Some(DeclarationId(1762)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -66190,15 +66226,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13766, 13861),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1778),
+            id: DeclarationId(1779),
             name: Some("setup_rust_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1761),
+                template: DeclarationId(1762),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1761)),
+            meta_tag: Some(DeclarationId(1762)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -66211,15 +66247,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13863, 13987),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1779),
+            id: DeclarationId(1780),
             name: Some("cache_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1761),
+                template: DeclarationId(1762),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1761)),
+            meta_tag: Some(DeclarationId(1762)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -66232,7 +66268,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13989, 14078),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1780),
+            id: DeclarationId(1781),
             name: Some("max_job_timeout_minutes".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -66249,7 +66285,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14154, 14193),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1781),
+            id: DeclarationId(1782),
             name: Some("default_job_timeout_minutes".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -66266,7 +66302,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14195, 14238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1782),
+            id: DeclarationId(1783),
             name: Some("max_matrix_combinations".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -66283,7 +66319,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14240, 14279),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1783),
+            id: DeclarationId(1784),
             name: Some("github_actions_workflows_dir".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -66302,17 +66338,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1207, 1270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1784),
+            id: DeclarationId(1785),
             name: Some("GitHubActionsWorkflowExtension".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "GitHubActionsWorkflowYml".to_string(),
-                        ty: DeclarationId(2932),
+                        ty: DeclarationId(2933),
                     },
                     Field {
                         label: "GitHubActionsWorkflowYaml".to_string(),
-                        ty: DeclarationId(2933),
+                        ty: DeclarationId(2934),
                     },
                 ],
             },
@@ -66327,7 +66363,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1895, 1989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1785),
+            id: DeclarationId(1786),
             name: Some("GitHubActionsWorkflowStemSegment".to_string()),
             connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
@@ -66336,17 +66372,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(2934)),
+            refinement: Some(DeclarationId(2935)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2615, 2714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1786),
+            id: DeclarationId(1787),
             name: Some("GitHubActionsWorkflowStem".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "segment".to_string(),
-                    ty: DeclarationId(1785),
+                    ty: DeclarationId(1786),
                 }],
             },
             type_params: vec![],
@@ -66360,17 +66396,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2916, 2994),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1787),
+            id: DeclarationId(1788),
             name: Some("GitHubActionsWorkflowFileRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "stem".to_string(),
-                        ty: DeclarationId(1786),
+                        ty: DeclarationId(1787),
                     },
                     Field {
                         label: "extension".to_string(),
-                        ty: DeclarationId(1784),
+                        ty: DeclarationId(1785),
                     },
                 ],
             },
@@ -66385,7 +66421,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 3398, 3513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1788),
+            id: DeclarationId(1789),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66405,7 +66441,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3259, 3272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1789),
+            id: DeclarationId(1790),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66425,7 +66461,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3421, 3434),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1790),
+            id: DeclarationId(1791),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66445,7 +66481,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3439, 3452),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1791),
+            id: DeclarationId(1792),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66465,7 +66501,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3556, 3569),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1792),
+            id: DeclarationId(1793),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66485,7 +66521,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4162, 4169),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1793),
+            id: DeclarationId(1794),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(695), DeclarationId(694)],
@@ -66503,7 +66539,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1794),
+            id: DeclarationId(1795),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66523,7 +66559,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4617, 4624),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1795),
+            id: DeclarationId(1796),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(697), DeclarationId(698)],
@@ -66541,7 +66577,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4638, 4651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1796),
+            id: DeclarationId(1797),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66561,7 +66597,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5336, 5349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1797),
+            id: DeclarationId(1798),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66581,7 +66617,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5354, 5367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1798),
+            id: DeclarationId(1799),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66601,7 +66637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5372, 5385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1799),
+            id: DeclarationId(1800),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66621,7 +66657,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5686, 5693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1800),
+            id: DeclarationId(1801),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(702)],
@@ -66639,7 +66675,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5698, 5708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1801),
+            id: DeclarationId(1802),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66659,7 +66695,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5713, 5720),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1802),
+            id: DeclarationId(1803),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66679,7 +66715,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5867, 5874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1803),
+            id: DeclarationId(1804),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(705)],
@@ -66697,7 +66733,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1804),
+            id: DeclarationId(1805),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66717,7 +66753,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5897, 5904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1805),
+            id: DeclarationId(1806),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66737,7 +66773,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6130, 6137),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1806),
+            id: DeclarationId(1807),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66757,11 +66793,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6151, 6158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1807),
+            id: DeclarationId(1808),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(707)],
-                output: DeclarationId(1806),
+                output: DeclarationId(1807),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -66775,7 +66811,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6142, 6158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1808),
+            id: DeclarationId(1809),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66795,7 +66831,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6163, 6170),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1809),
+            id: DeclarationId(1810),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66815,7 +66851,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6356, 6363),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1810),
+            id: DeclarationId(1811),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66835,7 +66871,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6588, 6595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1811),
+            id: DeclarationId(1812),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66855,7 +66891,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7202, 7209),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1812),
+            id: DeclarationId(1813),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(713),
@@ -66875,13 +66911,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7219, 7236),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1813),
+            id: DeclarationId(1814),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1812),
+                    value: DeclarationId(1813),
                 }],
             },
             type_params: vec![],
@@ -66895,7 +66931,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7214, 7237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1814),
+            id: DeclarationId(1815),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66915,7 +66951,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7415, 7422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1815),
+            id: DeclarationId(1816),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(713),
@@ -66935,13 +66971,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7444, 7461),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1816),
+            id: DeclarationId(1817),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1815),
+                    value: DeclarationId(1816),
                 }],
             },
             type_params: vec![],
@@ -66955,7 +66991,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7439, 7462),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1817),
+            id: DeclarationId(1818),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -66975,7 +67011,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 8177, 8184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1818),
+            id: DeclarationId(1819),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66989,7 +67025,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 2106, 2111),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1819),
+            id: DeclarationId(1820),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67009,7 +67045,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 2144, 2157),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1820),
+            id: DeclarationId(1821),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -67019,7 +67055,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "tail".to_string(),
-                        ty: DeclarationId(1819),
+                        ty: DeclarationId(1820),
                     },
                 ],
             },
@@ -67034,7 +67070,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 2116, 2159),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1821),
+            id: DeclarationId(1822),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67054,7 +67090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1477, 1490),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1822),
+            id: DeclarationId(1823),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67074,7 +67110,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1570, 1583),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1823),
+            id: DeclarationId(1824),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -67093,7 +67129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1824),
+            id: DeclarationId(1825),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -67110,10 +67146,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20916, 20943),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20914, 20941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1825),
+            id: DeclarationId(1826),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(713),
@@ -67130,10 +67166,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20995, 21026),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20993, 21024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1826),
+            id: DeclarationId(1827),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -67150,14 +67186,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21058),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21056),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1827),
+            id: DeclarationId(1828),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1826),
+                    DeclarationId(1827),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -67169,10 +67205,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1828),
+            id: DeclarationId(1829),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67189,10 +67225,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21185, 21206),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21183, 21204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1829),
+            id: DeclarationId(1830),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -67209,14 +67245,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21238),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21236),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1830),
+            id: DeclarationId(1831),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1829),
+                    DeclarationId(1830),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -67228,10 +67264,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1831),
+            id: DeclarationId(1832),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67248,10 +67284,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 22268, 22289),
+            span: SourceSpan::new("src/v3/std/effects.dag", 22266, 22287),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1832),
+            id: DeclarationId(1833),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -67267,10 +67303,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706),
+            span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1833),
+            id: DeclarationId(1834),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -67286,10 +67322,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1834),
+            id: DeclarationId(1835),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -67305,10 +67341,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30660, 30667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1835),
+            id: DeclarationId(1836),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67325,10 +67361,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 36581, 36602),
+            span: SourceSpan::new("src/v3/std/effects.dag", 36579, 36600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1836),
+            id: DeclarationId(1837),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67345,10 +67381,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 36608, 36639),
+            span: SourceSpan::new("src/v3/std/effects.dag", 36606, 36637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1837),
+            id: DeclarationId(1838),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67367,7 +67403,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 7532, 7561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1838),
+            id: DeclarationId(1839),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67386,7 +67422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 7566, 7595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1839),
+            id: DeclarationId(1840),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67406,7 +67442,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 7627, 7645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1840),
+            id: DeclarationId(1841),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67426,12 +67462,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8066, 8084),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1841),
+            id: DeclarationId(1842),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tokens".to_string(),
-                    ty: DeclarationId(1840),
+                    ty: DeclarationId(1841),
                 }],
             },
             type_params: vec![],
@@ -67445,7 +67481,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8036, 8086),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1842),
+            id: DeclarationId(1843),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -67470,7 +67506,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8091, 8147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1843),
+            id: DeclarationId(1844),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67489,7 +67525,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8510, 8555),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1844),
+            id: DeclarationId(1845),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -67518,7 +67554,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8560, 8630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1845),
+            id: DeclarationId(1846),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67529,10 +67565,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 14355, 14365),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14353, 14363),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1846),
+            id: DeclarationId(1847),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67548,10 +67584,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 14370, 14408),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14368, 14406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1847),
+            id: DeclarationId(1848),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67567,10 +67603,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 14413, 14451),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14411, 14449),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1848),
+            id: DeclarationId(1849),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67586,10 +67622,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 14697, 14732),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14695, 14730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1849),
+            id: DeclarationId(1850),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67600,10 +67636,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 14737, 14749),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14735, 14747),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1850),
+            id: DeclarationId(1851),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67619,10 +67655,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 15171, 15200),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15169, 15198),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1851),
+            id: DeclarationId(1852),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67638,10 +67674,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 15205, 15230),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15203, 15228),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1852),
+            id: DeclarationId(1853),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67652,10 +67688,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 15743, 15753),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15741, 15751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1853),
+            id: DeclarationId(1854),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67671,10 +67707,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 15758, 15796),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15756, 15794),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1854),
+            id: DeclarationId(1855),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67690,10 +67726,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 16501, 16528),
+            span: SourceSpan::new("src/v3/std/effects.dag", 16499, 16526),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1855),
+            id: DeclarationId(1856),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67709,10 +67745,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 16533, 16561),
+            span: SourceSpan::new("src/v3/std/effects.dag", 16531, 16559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1856),
+            id: DeclarationId(1857),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67729,15 +67765,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 16589, 16601),
+            span: SourceSpan::new("src/v3/std/effects.dag", 16587, 16599),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1857),
+            id: DeclarationId(1858),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "fields".to_string(),
-                    ty: DeclarationId(1856),
+                    ty: DeclarationId(1857),
                 }],
             },
             type_params: vec![],
@@ -67748,10 +67784,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 16566, 16603),
+            span: SourceSpan::new("src/v3/std/effects.dag", 16564, 16601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1858),
+            id: DeclarationId(1859),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67762,10 +67798,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 17280, 17293),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17278, 17291),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1859),
+            id: DeclarationId(1860),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67776,10 +67812,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 17298, 17312),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17296, 17310),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1860),
+            id: DeclarationId(1861),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67795,10 +67831,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 17317, 17349),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17315, 17347),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1861),
+            id: DeclarationId(1862),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67814,10 +67850,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 19519, 19560),
+            span: SourceSpan::new("src/v3/std/effects.dag", 19517, 19558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1862),
+            id: DeclarationId(1863),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -67839,10 +67875,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 19565, 19634),
+            span: SourceSpan::new("src/v3/std/effects.dag", 19563, 19632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1863),
+            id: DeclarationId(1864),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -67876,10 +67912,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 19639, 19789),
+            span: SourceSpan::new("src/v3/std/effects.dag", 19637, 19787),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1864),
+            id: DeclarationId(1865),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67890,10 +67926,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20538, 20559),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20536, 20557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1865),
+            id: DeclarationId(1866),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -67910,15 +67946,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20590, 20617),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20588, 20615),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1866),
+            id: DeclarationId(1867),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "first_breaker".to_string(),
-                    ty: DeclarationId(1865),
+                    ty: DeclarationId(1866),
                 }],
             },
             type_params: vec![],
@@ -67929,10 +67965,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20564, 20619),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20562, 20617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1867),
+            id: DeclarationId(1868),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -67949,15 +67985,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 24543, 24564),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24541, 24562),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1868),
+            id: DeclarationId(1869),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "ops".to_string(),
-                    ty: DeclarationId(1867),
+                    ty: DeclarationId(1868),
                 }],
             },
             type_params: vec![],
@@ -67968,10 +68004,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 24523, 24566),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24521, 24564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1869),
+            id: DeclarationId(1870),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -67988,15 +68024,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 24592, 24619),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24590, 24617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1870),
+            id: DeclarationId(1871),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "arms".to_string(),
-                    ty: DeclarationId(1869),
+                    ty: DeclarationId(1870),
                 }],
             },
             type_params: vec![],
@@ -68007,10 +68043,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 24571, 24621),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24569, 24619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1871),
+            id: DeclarationId(1872),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68026,10 +68062,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 24626, 24661),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24624, 24659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1872),
+            id: DeclarationId(1873),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -68046,15 +68082,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 24693, 24725),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24691, 24723),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1873),
+            id: DeclarationId(1874),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "branches".to_string(),
-                    ty: DeclarationId(1872),
+                    ty: DeclarationId(1873),
                 }],
             },
             type_params: vec![],
@@ -68065,10 +68101,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 24666, 24727),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24664, 24725),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1874),
+            id: DeclarationId(1875),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68084,10 +68120,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 25364, 25410),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25362, 25408),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1875),
+            id: DeclarationId(1876),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68103,21 +68139,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 25415, 25467),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(1876),
-            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/effects.dag", 25964, 25984),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25413, 25465),
         });
         declarations.push(Declaration {
             id: DeclarationId(1877),
@@ -68131,7 +68153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 25989, 26010),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25962, 25982),
         });
         declarations.push(Declaration {
             id: DeclarationId(1878),
@@ -68145,7 +68167,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 26015, 26038),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25987, 26008),
         });
         declarations.push(Declaration {
             id: DeclarationId(1879),
@@ -68159,7 +68181,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 26043, 26061),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26013, 26036),
         });
         declarations.push(Declaration {
             id: DeclarationId(1880),
@@ -68173,11 +68195,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 26066, 26084),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26041, 26059),
         });
         declarations.push(Declaration {
             id: DeclarationId(1881),
             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/effects.dag", 26064, 26082),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1882),
+            name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
@@ -68192,10 +68228,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 26401, 26447),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26399, 26445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1882),
+            id: DeclarationId(1883),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68211,10 +68247,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 26452, 26504),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26450, 26502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1883),
+            id: DeclarationId(1884),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68225,10 +68261,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 32458, 32464),
+            span: SourceSpan::new("src/v3/std/effects.dag", 32456, 32462),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1884),
+            id: DeclarationId(1885),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68244,10 +68280,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 32469, 32506),
+            span: SourceSpan::new("src/v3/std/effects.dag", 32467, 32504),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1885),
+            id: DeclarationId(1886),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68263,10 +68299,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 32511, 32548),
+            span: SourceSpan::new("src/v3/std/effects.dag", 32509, 32546),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1886),
+            id: DeclarationId(1887),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68277,10 +68313,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 33022, 33041),
+            span: SourceSpan::new("src/v3/std/effects.dag", 33020, 33039),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1887),
+            id: DeclarationId(1888),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68296,10 +68332,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 33046, 33095),
+            span: SourceSpan::new("src/v3/std/effects.dag", 33044, 33093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1888),
+            id: DeclarationId(1889),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68318,7 +68354,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1889),
+            id: DeclarationId(1890),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68337,7 +68373,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1890),
+            id: DeclarationId(1891),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68356,7 +68392,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1891),
+            id: DeclarationId(1892),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68375,7 +68411,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1892),
+            id: DeclarationId(1893),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68394,7 +68430,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1893),
+            id: DeclarationId(1894),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68413,7 +68449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1894),
+            id: DeclarationId(1895),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -68433,7 +68469,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 28003, 28024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1895),
+            id: DeclarationId(1896),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -68453,7 +68489,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 28088, 28109),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1896),
+            id: DeclarationId(1897),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68467,7 +68503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 754, 764),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1897),
+            id: DeclarationId(1898),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68486,7 +68522,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 769, 788),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1898),
+            id: DeclarationId(1899),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68500,7 +68536,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 793, 803),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1899),
+            id: DeclarationId(1900),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -68519,7 +68555,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1900),
+            id: DeclarationId(1901),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68538,7 +68574,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 1379, 1393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1901),
+            id: DeclarationId(1902),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68557,7 +68593,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 1398, 1411),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1902),
+            id: DeclarationId(1903),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68576,7 +68612,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 1416, 1433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1903),
+            id: DeclarationId(1904),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68595,7 +68631,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3566, 3586),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1904),
+            id: DeclarationId(1905),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68614,7 +68650,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3591, 3619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1905),
+            id: DeclarationId(1906),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68633,7 +68669,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3624, 3658),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1906),
+            id: DeclarationId(1907),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68652,7 +68688,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3663, 3692),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1907),
+            id: DeclarationId(1908),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68671,7 +68707,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3697, 3714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1908),
+            id: DeclarationId(1909),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68685,7 +68721,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 4338, 4345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1909),
+            id: DeclarationId(1910),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68704,7 +68740,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 4350, 4400),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1910),
+            id: DeclarationId(1911),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68723,7 +68759,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 5964, 5988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1911),
+            id: DeclarationId(1912),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68737,7 +68773,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6013, 6022),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1912),
+            id: DeclarationId(1913),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68756,7 +68792,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6027, 6063),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1913),
+            id: DeclarationId(1914),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -68781,7 +68817,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6375, 6425),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1914),
+            id: DeclarationId(1915),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68795,7 +68831,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6430, 6439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1915),
+            id: DeclarationId(1916),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(786),
@@ -68815,12 +68851,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7015, 7028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1916),
+            id: DeclarationId(1917),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1915),
+                    ty: DeclarationId(1916),
                 }],
             },
             type_params: vec![],
@@ -68834,7 +68870,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7003, 7029),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1917),
+            id: DeclarationId(1918),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68848,7 +68884,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7034, 7051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1918),
+            id: DeclarationId(1919),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68867,7 +68903,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7302, 7312),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1919),
+            id: DeclarationId(1920),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68881,7 +68917,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7317, 7326),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1920),
+            id: DeclarationId(1921),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68895,7 +68931,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7331, 7340),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1921),
+            id: DeclarationId(1922),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68914,7 +68950,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7767, 7787),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1922),
+            id: DeclarationId(1923),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68933,7 +68969,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7792, 7816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1923),
+            id: DeclarationId(1924),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -68953,12 +68989,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7828, 7844),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1924),
+            id: DeclarationId(1925),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1923),
+                    ty: DeclarationId(1924),
                 }],
             },
             type_params: vec![],
@@ -68972,7 +69008,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7821, 7845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1925),
+            id: DeclarationId(1926),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -68992,12 +69028,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7855, 7871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1926),
+            id: DeclarationId(1927),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1925),
+                    ty: DeclarationId(1926),
                 }],
             },
             type_params: vec![],
@@ -69011,7 +69047,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7850, 7872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1927),
+            id: DeclarationId(1928),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69031,12 +69067,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7881, 7897),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1928),
+            id: DeclarationId(1929),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1927),
+                    ty: DeclarationId(1928),
                 }],
             },
             type_params: vec![],
@@ -69050,7 +69086,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7877, 7898),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1929),
+            id: DeclarationId(1930),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69070,7 +69106,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7961, 7977),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1930),
+            id: DeclarationId(1931),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -69080,7 +69116,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "payload".to_string(),
-                        ty: DeclarationId(1929),
+                        ty: DeclarationId(1930),
                     },
                 ],
             },
@@ -69095,7 +69131,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7903, 7983),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1931),
+            id: DeclarationId(1932),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69114,7 +69150,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9596, 9625),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1932),
+            id: DeclarationId(1933),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69134,12 +69170,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9660, 9676),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1933),
+            id: DeclarationId(1934),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "fields".to_string(),
-                    ty: DeclarationId(1932),
+                    ty: DeclarationId(1933),
                 }],
             },
             type_params: vec![],
@@ -69153,7 +69189,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9630, 9678),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1934),
+            id: DeclarationId(1935),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69172,7 +69208,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9683, 9711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1935),
+            id: DeclarationId(1936),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69192,12 +69228,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9730, 9746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1936),
+            id: DeclarationId(1937),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1935),
+                    ty: DeclarationId(1936),
                 }],
             },
             type_params: vec![],
@@ -69211,7 +69247,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9716, 9747),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1937),
+            id: DeclarationId(1938),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69231,12 +69267,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9765, 9781),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1938),
+            id: DeclarationId(1939),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1937),
+                    ty: DeclarationId(1938),
                 }],
             },
             type_params: vec![],
@@ -69250,7 +69286,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9752, 9782),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1939),
+            id: DeclarationId(1940),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69269,7 +69305,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11036, 11059),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1940),
+            id: DeclarationId(1941),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69288,7 +69324,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11064, 11098),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1941),
+            id: DeclarationId(1942),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69302,7 +69338,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11103, 11110),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1942),
+            id: DeclarationId(1943),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69316,7 +69352,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11115, 11121),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1943),
+            id: DeclarationId(1944),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69335,7 +69371,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11126, 11146),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1944),
+            id: DeclarationId(1945),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69354,7 +69390,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11375, 11392),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1945),
+            id: DeclarationId(1946),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69374,12 +69410,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11414, 11429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1946),
+            id: DeclarationId(1947),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "children".to_string(),
-                    ty: DeclarationId(1945),
+                    ty: DeclarationId(1946),
                 }],
             },
             type_params: vec![],
@@ -69393,7 +69429,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11397, 11431),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1947),
+            id: DeclarationId(1948),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69413,12 +69449,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11453, 11468),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1948),
+            id: DeclarationId(1949),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "variants".to_string(),
-                    ty: DeclarationId(1947),
+                    ty: DeclarationId(1948),
                 }],
             },
             type_params: vec![],
@@ -69432,7 +69468,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11436, 11470),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1949),
+            id: DeclarationId(1950),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69452,13 +69488,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11497, 11516),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1950),
+            id: DeclarationId(1951),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(1949),
+                        ty: DeclarationId(1950),
                     },
                     Field {
                         label: "output".to_string(),
@@ -69481,7 +69517,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11475, 11572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1951),
+            id: DeclarationId(1952),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -69506,7 +69542,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11577, 11655),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1952),
+            id: DeclarationId(1953),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69526,7 +69562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11723, 11745),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1953),
+            id: DeclarationId(1954),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -69536,7 +69572,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "arguments".to_string(),
-                        ty: DeclarationId(1952),
+                        ty: DeclarationId(1953),
                     },
                 ],
             },
@@ -69551,7 +69587,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11660, 11751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1954),
+            id: DeclarationId(1955),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -69570,7 +69606,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1955),
+            id: DeclarationId(1956),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69590,7 +69626,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11852, 11871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1956),
+            id: DeclarationId(1957),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69610,7 +69646,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11890, 11912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1957),
+            id: DeclarationId(1958),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -69629,7 +69665,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1958),
+            id: DeclarationId(1959),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -69648,7 +69684,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1959),
+            id: DeclarationId(1960),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -69667,7 +69703,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1960),
+            id: DeclarationId(1961),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -69686,7 +69722,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1961),
+            id: DeclarationId(1962),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -69706,7 +69742,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13149, 13168),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1962),
+            id: DeclarationId(1963),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69720,7 +69756,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13449, 13452),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1963),
+            id: DeclarationId(1964),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69734,7 +69770,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13457, 13460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1964),
+            id: DeclarationId(1965),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69748,7 +69784,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13465, 13468),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1965),
+            id: DeclarationId(1966),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69762,7 +69798,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13473, 13476),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1966),
+            id: DeclarationId(1967),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69776,7 +69812,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13600, 13602),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1967),
+            id: DeclarationId(1968),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69790,7 +69826,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13607, 13609),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1968),
+            id: DeclarationId(1969),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69804,7 +69840,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13614, 13616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1969),
+            id: DeclarationId(1970),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69818,7 +69854,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13621, 13623),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1970),
+            id: DeclarationId(1971),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69832,7 +69868,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13628, 13630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1971),
+            id: DeclarationId(1972),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69846,7 +69882,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 13635, 13637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1972),
+            id: DeclarationId(1973),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69860,7 +69896,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14414, 14417),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1973),
+            id: DeclarationId(1974),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69874,7 +69910,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14422, 14424),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1974),
+            id: DeclarationId(1975),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69893,7 +69929,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14660, 14684),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1975),
+            id: DeclarationId(1976),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69912,7 +69948,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14689, 14713),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1976),
+            id: DeclarationId(1977),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69931,7 +69967,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14718, 14736),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1977),
+            id: DeclarationId(1978),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69950,7 +69986,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14923, 14946),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1978),
+            id: DeclarationId(1979),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69969,7 +70005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14951, 15007),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1979),
+            id: DeclarationId(1980),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69988,7 +70024,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15012, 15066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1980),
+            id: DeclarationId(1981),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70007,7 +70043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15071, 15093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1981),
+            id: DeclarationId(1982),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -70032,7 +70068,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15218, 15270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1982),
+            id: DeclarationId(1983),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70051,7 +70087,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15275, 15305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1983),
+            id: DeclarationId(1984),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -70070,7 +70106,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1984),
+            id: DeclarationId(1985),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -70090,7 +70126,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 17460, 17491),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1985),
+            id: DeclarationId(1986),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(725),
@@ -70110,7 +70146,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 17515, 17545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1986),
+            id: DeclarationId(1987),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70129,7 +70165,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18168, 18197),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1987),
+            id: DeclarationId(1988),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -70154,7 +70190,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18202, 18249),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1988),
+            id: DeclarationId(1989),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -70173,7 +70209,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1989),
+            id: DeclarationId(1990),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70193,7 +70229,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18607, 18619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1990),
+            id: DeclarationId(1991),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70207,7 +70243,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18860, 18869),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1991),
+            id: DeclarationId(1992),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70227,7 +70263,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18927, 18943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1992),
+            id: DeclarationId(1993),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -70246,7 +70282,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1993),
+            id: DeclarationId(1994),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70260,7 +70296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19445, 19457),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1994),
+            id: DeclarationId(1995),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70280,7 +70316,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19535, 19547),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1995),
+            id: DeclarationId(1996),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -70299,7 +70335,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1996),
+            id: DeclarationId(1997),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -70318,7 +70354,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1997),
+            id: DeclarationId(1998),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70337,7 +70373,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19737, 19753),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1998),
+            id: DeclarationId(1999),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70356,7 +70392,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19758, 19782),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1999),
+            id: DeclarationId(2000),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70375,7 +70411,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19787, 19805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2000),
+            id: DeclarationId(2001),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70394,7 +70430,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19810, 19824),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2001),
+            id: DeclarationId(2002),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70413,7 +70449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19829, 19843),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2002),
+            id: DeclarationId(2003),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70433,7 +70469,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19872, 19889),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2003),
+            id: DeclarationId(2004),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70453,7 +70489,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19899, 19913),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2004),
+            id: DeclarationId(2005),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70473,7 +70509,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19923, 19936),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2005),
+            id: DeclarationId(2006),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70493,7 +70529,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19949, 19962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2006),
+            id: DeclarationId(2007),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70512,7 +70548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 26045, 26063),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2007),
+            id: DeclarationId(2008),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70526,7 +70562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 26068, 26074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2008),
+            id: DeclarationId(2009),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -70546,12 +70582,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 26107, 26131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2009),
+            id: DeclarationId(2010),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "candidates".to_string(),
-                    ty: DeclarationId(2008),
+                    ty: DeclarationId(2009),
                 }],
             },
             type_params: vec![],
@@ -70565,7 +70601,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 26079, 26133),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2010),
+            id: DeclarationId(2011),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -70585,7 +70621,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 10942, 10962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2011),
+            id: DeclarationId(2012),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -70605,7 +70641,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11026, 11046),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2012),
+            id: DeclarationId(2013),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -70625,7 +70661,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11114, 11144),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2013),
+            id: DeclarationId(2014),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70645,7 +70681,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11611, 11629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2014),
+            id: DeclarationId(2015),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -70665,7 +70701,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11635, 11665),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2015),
+            id: DeclarationId(2016),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70685,7 +70721,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 14162, 14180),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2016),
+            id: DeclarationId(2017),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -70705,7 +70741,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22217, 22247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2017),
+            id: DeclarationId(2018),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70725,7 +70761,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22252, 22270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2018),
+            id: DeclarationId(2019),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70745,7 +70781,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22530, 22548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2019),
+            id: DeclarationId(2020),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70765,7 +70801,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22553, 22571),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2020),
+            id: DeclarationId(2021),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70785,7 +70821,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23044, 23062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2021),
+            id: DeclarationId(2022),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70805,7 +70841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23067, 23085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2022),
+            id: DeclarationId(2023),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70825,7 +70861,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23186, 23204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2023),
+            id: DeclarationId(2024),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70845,7 +70881,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23524, 23542),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2024),
+            id: DeclarationId(2025),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70865,7 +70901,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23547, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2025),
+            id: DeclarationId(2026),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70885,7 +70921,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 25113, 25131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2026),
+            id: DeclarationId(2027),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70905,7 +70941,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 25384, 25402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2027),
+            id: DeclarationId(2028),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70925,7 +70961,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 25850, 25868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2028),
+            id: DeclarationId(2029),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70945,7 +70981,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 27885, 27903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2029),
+            id: DeclarationId(2030),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70965,7 +71001,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 27933, 27951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2030),
+            id: DeclarationId(2031),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -70985,7 +71021,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28238, 28256),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2031),
+            id: DeclarationId(2032),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -71005,7 +71041,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28284, 28302),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2032),
+            id: DeclarationId(2033),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -71025,7 +71061,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28662, 28680),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2033),
+            id: DeclarationId(2034),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -71045,7 +71081,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28685, 28703),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2034),
+            id: DeclarationId(2035),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71059,7 +71095,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 4953, 4965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2035),
+            id: DeclarationId(2036),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71073,7 +71109,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 4970, 4986),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2036),
+            id: DeclarationId(2037),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71087,7 +71123,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 4991, 5005),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2037),
+            id: DeclarationId(2038),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71101,7 +71137,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 5855, 5868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2038),
+            id: DeclarationId(2039),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71115,7 +71151,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 5873, 5888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2039),
+            id: DeclarationId(2040),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71129,7 +71165,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 5893, 5909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2040),
+            id: DeclarationId(2041),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71143,7 +71179,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 5914, 5927),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2041),
+            id: DeclarationId(2042),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -71162,7 +71198,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2042),
+            id: DeclarationId(2043),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -71181,7 +71217,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2043),
+            id: DeclarationId(2044),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -71200,7 +71236,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2044),
+            id: DeclarationId(2045),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -71219,7 +71255,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2045),
+            id: DeclarationId(2046),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71233,7 +71269,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 8405, 8414),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2046),
+            id: DeclarationId(2047),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71252,7 +71288,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 8419, 8465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2047),
+            id: DeclarationId(2048),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71271,7 +71307,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9506, 9523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2048),
+            id: DeclarationId(2049),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71290,7 +71326,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9528, 9552),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2049),
+            id: DeclarationId(2050),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -71315,7 +71351,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9557, 9619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2050),
+            id: DeclarationId(2051),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -71335,12 +71371,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9636, 9666),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2051),
+            id: DeclarationId(2052),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2050),
+                    ty: DeclarationId(2051),
                 }],
             },
             type_params: vec![],
@@ -71354,7 +71390,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9624, 9667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2052),
+            id: DeclarationId(2053),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -71374,12 +71410,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9680, 9710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2053),
+            id: DeclarationId(2054),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2052),
+                    ty: DeclarationId(2053),
                 }],
             },
             type_params: vec![],
@@ -71393,7 +71429,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9672, 9711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2054),
+            id: DeclarationId(2055),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71412,7 +71448,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9716, 9737),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2055),
+            id: DeclarationId(2056),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71431,7 +71467,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9742, 9761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2056),
+            id: DeclarationId(2057),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(31),
@@ -71451,7 +71487,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9479, 9501),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2057),
+            id: DeclarationId(2058),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71465,7 +71501,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18143, 18156),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2058),
+            id: DeclarationId(2059),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71479,7 +71515,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18161, 18169),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2059),
+            id: DeclarationId(2060),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71493,7 +71529,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18174, 18185),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2060),
+            id: DeclarationId(2061),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71507,7 +71543,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18190, 18207),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2061),
+            id: DeclarationId(2062),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71521,7 +71557,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18212, 18226),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2062),
+            id: DeclarationId(2063),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71540,7 +71576,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18231, 18280),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2063),
+            id: DeclarationId(2064),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71554,7 +71590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18285, 18301),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2064),
+            id: DeclarationId(2065),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71568,7 +71604,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18306, 18318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2065),
+            id: DeclarationId(2066),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(43),
@@ -71588,7 +71624,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18107, 18138),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2066),
+            id: DeclarationId(2067),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(691),
@@ -71608,7 +71644,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11495, 11507),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2067),
+            id: DeclarationId(2068),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(728)],
@@ -71626,7 +71662,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2068),
+            id: DeclarationId(2069),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(704),
@@ -71636,7 +71672,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         value: DeclarationId(849),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1803),
+                        parameter: DeclarationId(1804),
                         value: DeclarationId(856),
                     },
                 ],
@@ -71652,7 +71688,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11488, 11535),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2069),
+            id: DeclarationId(2070),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(691),
@@ -71672,7 +71708,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11795, 11810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2070),
+            id: DeclarationId(2071),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(849), DeclarationId(849)],
@@ -71690,7 +71726,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2071),
+            id: DeclarationId(2072),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
@@ -71704,7 +71740,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         value: DeclarationId(849),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1793),
+                        parameter: DeclarationId(1794),
                         value: DeclarationId(860),
                     },
                 ],
@@ -71720,7 +71756,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 14202, 14245),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2072),
+            id: DeclarationId(2073),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(850), DeclarationId(694)],
@@ -71738,7 +71774,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2073),
+            id: DeclarationId(2074),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
@@ -71748,7 +71784,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         value: DeclarationId(850),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1793),
+                        parameter: DeclarationId(1794),
                         value: DeclarationId(886),
                     },
                     TemplateArgument {
@@ -71768,7 +71804,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 16911, 17021),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2074),
+            id: DeclarationId(2075),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(850), DeclarationId(694)],
@@ -71786,7 +71822,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2075),
+            id: DeclarationId(2076),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
@@ -71796,7 +71832,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         value: DeclarationId(850),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1793),
+                        parameter: DeclarationId(1794),
                         value: DeclarationId(886),
                     },
                     TemplateArgument {
@@ -71816,7 +71852,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 17076, 17186),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2076),
+            id: DeclarationId(2077),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -71836,7 +71872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22293, 22323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2077),
+            id: DeclarationId(2078),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -71856,7 +71892,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22275, 22324),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2078),
+            id: DeclarationId(2079),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -71876,7 +71912,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22603, 22610),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2079),
+            id: DeclarationId(2080),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -71896,7 +71932,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22737, 22789),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2080),
+            id: DeclarationId(2081),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -71916,7 +71952,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23140, 23147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2081),
+            id: DeclarationId(2082),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -71936,7 +71972,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23118, 23148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2082),
+            id: DeclarationId(2083),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -71956,7 +71992,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23597, 23604),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2083),
+            id: DeclarationId(2084),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -71976,7 +72012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 23735, 23792),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2084),
+            id: DeclarationId(2085),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -71996,7 +72032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 25317, 25349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2085),
+            id: DeclarationId(2086),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -72016,7 +72052,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 27988, 27995),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2086),
+            id: DeclarationId(2087),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -72036,7 +72072,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28136, 28201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2087),
+            id: DeclarationId(2088),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(850), DeclarationId(849)],
@@ -72054,7 +72090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2088),
+            id: DeclarationId(2089),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
@@ -72068,7 +72104,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         value: DeclarationId(849),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1793),
+                        parameter: DeclarationId(1794),
                         value: DeclarationId(886),
                     },
                 ],
@@ -72084,7 +72120,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28319, 28377),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2089),
+            id: DeclarationId(2090),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -72104,7 +72140,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28403, 28449),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2090),
+            id: DeclarationId(2091),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -72124,11 +72160,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28720, 28727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2091),
+            id: DeclarationId(2092),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2033), DeclarationId(849)],
-                output: DeclarationId(2033),
+                inputs: vec![DeclarationId(2034), DeclarationId(849)],
+                output: DeclarationId(2034),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -72142,21 +72178,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2092),
+            id: DeclarationId(2093),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
                 arguments: vec![
                     TemplateArgument {
                         parameter: DeclarationId(695),
-                        value: DeclarationId(2033),
+                        value: DeclarationId(2034),
                     },
                     TemplateArgument {
                         parameter: DeclarationId(694),
                         value: DeclarationId(849),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1793),
+                        parameter: DeclarationId(1794),
                         value: DeclarationId(889),
                     },
                 ],
@@ -72172,7 +72208,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 28708, 28749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2093),
+            id: DeclarationId(2094),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -72192,7 +72228,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4503, 4529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2094),
+            id: DeclarationId(2095),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72211,7 +72247,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2095),
+            id: DeclarationId(2096),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72230,7 +72266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2096),
+            id: DeclarationId(2097),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -72250,7 +72286,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_operations.dag", 6546, 6561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2097),
+            id: DeclarationId(2098),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -72270,12 +72306,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2718, 2749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2098),
+            id: DeclarationId(2099),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "content".to_string(),
-                    ty: DeclarationId(2097),
+                    ty: DeclarationId(2098),
                 }],
             },
             type_params: vec![],
@@ -72289,7 +72325,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2690, 2751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2099),
+            id: DeclarationId(2100),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -72309,12 +72345,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2784, 2820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2100),
+            id: DeclarationId(2101),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "content".to_string(),
-                    ty: DeclarationId(2099),
+                    ty: DeclarationId(2100),
                 }],
             },
             type_params: vec![],
@@ -72328,7 +72364,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2756, 2822),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2101),
+            id: DeclarationId(2102),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72353,7 +72389,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3211, 3276),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2102),
+            id: DeclarationId(2103),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72372,7 +72408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3281, 3305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2103),
+            id: DeclarationId(2104),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72391,7 +72427,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3568, 3596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2104),
+            id: DeclarationId(2105),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72410,7 +72446,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3601, 3637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2105),
+            id: DeclarationId(2106),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72429,7 +72465,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4332, 4354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2106),
+            id: DeclarationId(2107),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -72449,12 +72485,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4376, 4406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2107),
+            id: DeclarationId(2108),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2106),
+                    ty: DeclarationId(2107),
                 }],
             },
             type_params: vec![],
@@ -72468,7 +72504,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4359, 4407),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2108),
+            id: DeclarationId(2109),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72482,7 +72518,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5616, 5623),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2109),
+            id: DeclarationId(2110),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72496,7 +72532,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5749, 5761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2110),
+            id: DeclarationId(2111),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72515,7 +72551,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5979, 6014),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2111),
+            id: DeclarationId(2112),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72534,7 +72570,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6019, 6062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2112),
+            id: DeclarationId(2113),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72553,7 +72589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6067, 6144),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2113),
+            id: DeclarationId(2114),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -72573,7 +72609,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6234, 6268),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2114),
+            id: DeclarationId(2115),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72592,7 +72628,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2115),
+            id: DeclarationId(2116),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72611,7 +72647,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2116),
+            id: DeclarationId(2117),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72625,15 +72661,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(2113),
+                        ty: DeclarationId(2114),
                     },
                     Field {
                         label: "citations".to_string(),
-                        ty: DeclarationId(2114),
+                        ty: DeclarationId(2115),
                     },
                     Field {
                         label: "cache_control".to_string(),
-                        ty: DeclarationId(2115),
+                        ty: DeclarationId(2116),
                     },
                 ],
             },
@@ -72648,7 +72684,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6149, 6364),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2117),
+            id: DeclarationId(2118),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72667,7 +72703,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6369, 6418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2118),
+            id: DeclarationId(2119),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72686,7 +72722,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6926, 6962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2119),
+            id: DeclarationId(2120),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72705,7 +72741,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2120),
+            id: DeclarationId(2121),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72724,7 +72760,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2121),
+            id: DeclarationId(2122),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72734,11 +72770,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(2119),
+                        ty: DeclarationId(2120),
                     },
                     Field {
                         label: "is_error".to_string(),
-                        ty: DeclarationId(2120),
+                        ty: DeclarationId(2121),
                     },
                 ],
             },
@@ -72753,7 +72789,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6967, 7085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2122),
+            id: DeclarationId(2123),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72772,7 +72808,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7532, 7570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2123),
+            id: DeclarationId(2124),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72801,7 +72837,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7575, 7658),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2124),
+            id: DeclarationId(2125),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72815,7 +72851,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8016, 8023),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2125),
+            id: DeclarationId(2126),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72829,7 +72865,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8028, 8037),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2126),
+            id: DeclarationId(2127),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72843,7 +72879,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8042, 8054),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2127),
+            id: DeclarationId(2128),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72857,7 +72893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8059, 8066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2128),
+            id: DeclarationId(2129),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72871,7 +72907,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8071, 8080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2129),
+            id: DeclarationId(2130),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72885,7 +72921,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8085, 8092),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2130),
+            id: DeclarationId(2131),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72899,7 +72935,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8097, 8123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2131),
+            id: DeclarationId(2132),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72918,7 +72954,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2132),
+            id: DeclarationId(2133),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72937,7 +72973,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2133),
+            id: DeclarationId(2134),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -72951,11 +72987,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "document_title".to_string(),
-                        ty: DeclarationId(2131),
+                        ty: DeclarationId(2132),
                     },
                     Field {
                         label: "file_id".to_string(),
-                        ty: DeclarationId(2132),
+                        ty: DeclarationId(2133),
                     },
                     Field {
                         label: "start_char_index".to_string(),
@@ -72978,7 +73014,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8363, 8506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2134),
+            id: DeclarationId(2135),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -72997,7 +73033,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2135),
+            id: DeclarationId(2136),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73016,7 +73052,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2136),
+            id: DeclarationId(2137),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73030,11 +73066,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "document_title".to_string(),
-                        ty: DeclarationId(2134),
+                        ty: DeclarationId(2135),
                     },
                     Field {
                         label: "file_id".to_string(),
-                        ty: DeclarationId(2135),
+                        ty: DeclarationId(2136),
                     },
                     Field {
                         label: "start_page_number".to_string(),
@@ -73057,7 +73093,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8511, 8656),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2137),
+            id: DeclarationId(2138),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73076,7 +73112,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2138),
+            id: DeclarationId(2139),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73095,7 +73131,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2139),
+            id: DeclarationId(2140),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73109,11 +73145,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "document_title".to_string(),
-                        ty: DeclarationId(2137),
+                        ty: DeclarationId(2138),
                     },
                     Field {
                         label: "file_id".to_string(),
-                        ty: DeclarationId(2138),
+                        ty: DeclarationId(2139),
                     },
                     Field {
                         label: "start_block_index".to_string(),
@@ -73136,7 +73172,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8661, 8814),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2140),
+            id: DeclarationId(2141),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73155,7 +73191,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2141),
+            id: DeclarationId(2142),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73169,7 +73205,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "title".to_string(),
-                        ty: DeclarationId(2140),
+                        ty: DeclarationId(2141),
                     },
                     Field {
                         label: "url".to_string(),
@@ -73188,7 +73224,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8819, 8919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2142),
+            id: DeclarationId(2143),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73207,7 +73243,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2143),
+            id: DeclarationId(2144),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73221,7 +73257,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "title".to_string(),
-                        ty: DeclarationId(2142),
+                        ty: DeclarationId(2143),
                     },
                     Field {
                         label: "search_result_index".to_string(),
@@ -73248,7 +73284,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8924, 9071),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2144),
+            id: DeclarationId(2145),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -73268,11 +73304,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2145),
+            id: DeclarationId(2146),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2144),
+                    DeclarationId(2145),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -73287,7 +73323,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2146),
+            id: DeclarationId(2147),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73297,7 +73333,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "citations".to_string(),
-                        ty: DeclarationId(2145),
+                        ty: DeclarationId(2146),
                     },
                 ],
             },
@@ -73312,7 +73348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9650, 9732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2147),
+            id: DeclarationId(2148),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73337,7 +73373,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9737, 9798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2148),
+            id: DeclarationId(2149),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -73356,7 +73392,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9803, 9858),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2149),
+            id: DeclarationId(2150),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73375,7 +73411,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2150),
+            id: DeclarationId(2151),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73393,7 +73429,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "caller".to_string(),
-                        ty: DeclarationId(2149),
+                        ty: DeclarationId(2150),
                     },
                 ],
             },
@@ -73408,7 +73444,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9863, 9940),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2151),
+            id: DeclarationId(2152),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73427,7 +73463,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2152),
+            id: DeclarationId(2153),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73445,7 +73481,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "caller".to_string(),
-                        ty: DeclarationId(2151),
+                        ty: DeclarationId(2152),
                     },
                 ],
             },
@@ -73460,7 +73496,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9945, 10045),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2153),
+            id: DeclarationId(2154),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73479,7 +73515,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2154),
+            id: DeclarationId(2155),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -73493,7 +73529,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "caller".to_string(),
-                        ty: DeclarationId(2153),
+                        ty: DeclarationId(2154),
                     },
                 ],
             },
@@ -73508,7 +73544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10050, 10136),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2155),
+            id: DeclarationId(2156),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73522,7 +73558,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10357, 10366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2156),
+            id: DeclarationId(2157),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73536,7 +73572,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10371, 10379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2157),
+            id: DeclarationId(2158),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73550,7 +73586,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10384, 10397),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2158),
+            id: DeclarationId(2159),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73564,7 +73600,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10402, 10419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2159),
+            id: DeclarationId(2160),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73578,7 +73614,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10424, 10447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2160),
+            id: DeclarationId(2161),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73592,7 +73628,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10452, 10471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2161),
+            id: DeclarationId(2162),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73606,7 +73642,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10476, 10494),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2162),
+            id: DeclarationId(2163),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73620,7 +73656,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10499, 10506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2163),
+            id: DeclarationId(2164),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73639,7 +73675,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2164),
+            id: DeclarationId(2165),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73658,7 +73694,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2165),
+            id: DeclarationId(2166),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73677,7 +73713,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2166),
+            id: DeclarationId(2167),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73691,7 +73727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11192, 11201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2167),
+            id: DeclarationId(2168),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -73711,7 +73747,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11687, 11725),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2168),
+            id: DeclarationId(2169),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73730,7 +73766,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2169),
+            id: DeclarationId(2170),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -73749,7 +73785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2170),
+            id: DeclarationId(2171),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73763,7 +73799,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1013, 1025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2171),
+            id: DeclarationId(2172),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73777,7 +73813,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1030, 1044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2172),
+            id: DeclarationId(2173),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73791,7 +73827,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1049, 1064),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2173),
+            id: DeclarationId(2174),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73805,7 +73841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1069, 1086),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2174),
+            id: DeclarationId(2175),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73819,7 +73855,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1091, 1114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2175),
+            id: DeclarationId(2176),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73833,7 +73869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4719, 4726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2176),
+            id: DeclarationId(2177),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73847,7 +73883,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4731, 4735),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2177),
+            id: DeclarationId(2178),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -73867,7 +73903,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6983, 7004),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2178),
+            id: DeclarationId(2179),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73881,7 +73917,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2224, 2238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2179),
+            id: DeclarationId(2180),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73895,7 +73931,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2243, 2268),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2180),
+            id: DeclarationId(2181),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73909,7 +73945,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2273, 2283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2181),
+            id: DeclarationId(2182),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73923,7 +73959,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2548, 2565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2182),
+            id: DeclarationId(2183),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73937,7 +73973,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2570, 2594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2183),
+            id: DeclarationId(2184),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73951,7 +73987,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2599, 2631),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2184),
+            id: DeclarationId(2185),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73965,7 +74001,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2636, 2663),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2185),
+            id: DeclarationId(2186),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73979,7 +74015,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3369, 3393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2186),
+            id: DeclarationId(2187),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73993,7 +74029,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3398, 3430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2187),
+            id: DeclarationId(2188),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74007,7 +74043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3564, 3588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2188),
+            id: DeclarationId(2189),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74021,7 +74057,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3593, 3614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2189),
+            id: DeclarationId(2190),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74035,7 +74071,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3619, 3637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2190),
+            id: DeclarationId(2191),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74049,7 +74085,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3781, 3796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2191),
+            id: DeclarationId(2192),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74063,7 +74099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3801, 3831),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2192),
+            id: DeclarationId(2193),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74077,7 +74113,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3836, 3857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2193),
+            id: DeclarationId(2194),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74091,7 +74127,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4024, 4044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2194),
+            id: DeclarationId(2195),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74105,7 +74141,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4049, 4076),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2195),
+            id: DeclarationId(2196),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74119,7 +74155,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4081, 4095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2196),
+            id: DeclarationId(2197),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74133,7 +74169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4354, 4362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2197),
+            id: DeclarationId(2198),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74147,7 +74183,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4367, 4393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2198),
+            id: DeclarationId(2199),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74161,7 +74197,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4398, 4423),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2199),
+            id: DeclarationId(2200),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -74181,7 +74217,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5320, 5332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2200),
+            id: DeclarationId(2201),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74195,7 +74231,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5693, 5713),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2201),
+            id: DeclarationId(2202),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74209,7 +74245,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5718, 5736),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2202),
+            id: DeclarationId(2203),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74223,7 +74259,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5741, 5759),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2203),
+            id: DeclarationId(2204),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74237,7 +74273,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5764, 5791),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2204),
+            id: DeclarationId(2205),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -74256,7 +74292,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2205),
+            id: DeclarationId(2206),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -74275,7 +74311,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2206),
+            id: DeclarationId(2207),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -74294,7 +74330,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2207),
+            id: DeclarationId(2208),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -74313,7 +74349,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2208),
+            id: DeclarationId(2209),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -74332,7 +74368,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2209),
+            id: DeclarationId(2210),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -74351,7 +74387,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2210),
+            id: DeclarationId(2211),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74370,7 +74406,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1430, 1462),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2211),
+            id: DeclarationId(2212),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74389,7 +74425,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1467, 1503),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2212),
+            id: DeclarationId(2213),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74408,7 +74444,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1508, 1545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2213),
+            id: DeclarationId(2214),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74427,7 +74463,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1550, 1576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2214),
+            id: DeclarationId(2215),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74446,7 +74482,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1581, 1614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2215),
+            id: DeclarationId(2216),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74460,7 +74496,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1619, 1636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2216),
+            id: DeclarationId(2217),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74479,7 +74515,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1641, 1695),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2217),
+            id: DeclarationId(2218),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74493,7 +74529,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1700, 1707),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2218),
+            id: DeclarationId(2219),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74512,7 +74548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2059, 2097),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2219),
+            id: DeclarationId(2220),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -74537,7 +74573,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2102, 2176),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2220),
+            id: DeclarationId(2221),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -74562,7 +74598,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2181, 2256),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2221),
+            id: DeclarationId(2222),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -74587,7 +74623,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2261, 2334),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2222),
+            id: DeclarationId(2223),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74606,7 +74642,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2339, 2376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2223),
+            id: DeclarationId(2224),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74625,7 +74661,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2381, 2418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2224),
+            id: DeclarationId(2225),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74644,7 +74680,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2423, 2464),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2225),
+            id: DeclarationId(2226),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74658,7 +74694,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2469, 2485),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2226),
+            id: DeclarationId(2227),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74672,7 +74708,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3221, 3231),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2227),
+            id: DeclarationId(2228),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74691,7 +74727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3236, 3283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2228),
+            id: DeclarationId(2229),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -74710,7 +74746,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3288, 3339),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2229),
+            id: DeclarationId(2230),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74724,7 +74760,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3529, 3533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2230),
+            id: DeclarationId(2231),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74738,7 +74774,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3538, 3545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2231),
+            id: DeclarationId(2232),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74752,7 +74788,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3550, 3556),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2232),
+            id: DeclarationId(2233),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -74771,7 +74807,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2233),
+            id: DeclarationId(2234),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74785,7 +74821,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7493, 7504),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2234),
+            id: DeclarationId(2235),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74799,7 +74835,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7553, 7567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2235),
+            id: DeclarationId(2236),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74813,7 +74849,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7632, 7648),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2236),
+            id: DeclarationId(2237),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74827,7 +74863,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 360, 369),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2237),
+            id: DeclarationId(2238),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74841,7 +74877,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 374, 381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2238),
+            id: DeclarationId(2239),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74855,7 +74891,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 614, 618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2239),
+            id: DeclarationId(2240),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74869,7 +74905,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 623, 632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2240),
+            id: DeclarationId(2241),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74883,7 +74919,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 910, 921),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2241),
+            id: DeclarationId(2242),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74897,7 +74933,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 926, 935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2242),
+            id: DeclarationId(2243),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74911,7 +74947,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 1166, 1173),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2243),
+            id: DeclarationId(2244),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74925,7 +74961,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 1178, 1187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2244),
+            id: DeclarationId(2245),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74939,7 +74975,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2035, 2044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2245),
+            id: DeclarationId(2246),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74953,7 +74989,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2049, 2065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2246),
+            id: DeclarationId(2247),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74967,7 +75003,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2070, 2080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2247),
+            id: DeclarationId(2248),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74981,7 +75017,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2085, 2099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2248),
+            id: DeclarationId(2249),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -74995,7 +75031,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2385, 2399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2249),
+            id: DeclarationId(2250),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75009,7 +75045,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2404, 2418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2250),
+            id: DeclarationId(2251),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75029,7 +75065,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2818, 2830),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2251),
+            id: DeclarationId(2252),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75049,7 +75085,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3210, 3222),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2252),
+            id: DeclarationId(2253),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75063,7 +75099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3694, 3708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2253),
+            id: DeclarationId(2254),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75077,7 +75113,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3713, 3729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2254),
+            id: DeclarationId(2255),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -75096,7 +75132,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 6759, 6786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2255),
+            id: DeclarationId(2256),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75110,7 +75146,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7611, 7616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2256),
+            id: DeclarationId(2257),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75124,7 +75160,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7621, 7630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2257),
+            id: DeclarationId(2258),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -75150,7 +75186,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 9513, 9555),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2258),
+            id: DeclarationId(2259),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75164,7 +75200,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3853, 3857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2259),
+            id: DeclarationId(2260),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75178,7 +75214,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3860, 3864),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2260),
+            id: DeclarationId(2261),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75192,7 +75228,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3867, 3871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2261),
+            id: DeclarationId(2262),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75206,7 +75242,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3874, 3879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2262),
+            id: DeclarationId(2263),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75220,7 +75256,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3882, 3893),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2263),
+            id: DeclarationId(2264),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75234,7 +75270,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3896, 3909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2264),
+            id: DeclarationId(2265),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75248,7 +75284,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4489, 4494),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2265),
+            id: DeclarationId(2266),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75262,7 +75298,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4497, 4506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2266),
+            id: DeclarationId(2267),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75276,7 +75312,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4509, 4515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2267),
+            id: DeclarationId(2268),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75290,7 +75326,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4518, 4522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2268),
+            id: DeclarationId(2269),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75304,7 +75340,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4525, 4529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2269),
+            id: DeclarationId(2270),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75324,7 +75360,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5923, 5941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2270),
+            id: DeclarationId(2271),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75344,7 +75380,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6396, 6424),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2271),
+            id: DeclarationId(2272),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75358,7 +75394,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1099, 1113),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2272),
+            id: DeclarationId(2273),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75372,7 +75408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1118, 1128),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2273),
+            id: DeclarationId(2274),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75386,7 +75422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1133, 1145),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2274),
+            id: DeclarationId(2275),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75400,7 +75436,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1150, 1163),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2275),
+            id: DeclarationId(2276),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75414,7 +75450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1168, 1180),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2276),
+            id: DeclarationId(2277),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75428,7 +75464,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1185, 1197),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2277),
+            id: DeclarationId(2278),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75442,7 +75478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1202, 1224),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2278),
+            id: DeclarationId(2279),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75456,7 +75492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1229, 1248),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2279),
+            id: DeclarationId(2280),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75470,7 +75506,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1253, 1278),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2280),
+            id: DeclarationId(2281),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75484,7 +75520,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1283, 1306),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2281),
+            id: DeclarationId(2282),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -75503,7 +75539,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5506, 5542),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2282),
+            id: DeclarationId(2283),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -75522,7 +75558,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5547, 5588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2283),
+            id: DeclarationId(2284),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75542,7 +75578,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 6047, 6063),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2284),
+            id: DeclarationId(2285),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -75561,7 +75597,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9175, 9216),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2285),
+            id: DeclarationId(2286),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75575,7 +75611,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9513, 9525),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2286),
+            id: DeclarationId(2287),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -75595,7 +75631,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9795, 9807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2287),
+            id: DeclarationId(2288),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -75605,7 +75641,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "sites".to_string(),
-                        ty: DeclarationId(2286),
+                        ty: DeclarationId(2287),
                     },
                 ],
             },
@@ -75620,7 +75656,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9752, 9809),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2288),
+            id: DeclarationId(2289),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -75639,7 +75675,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10119, 10153),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2289),
+            id: DeclarationId(2290),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -75658,7 +75694,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10556, 10607),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2290),
+            id: DeclarationId(2291),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -75672,7 +75708,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10950, 10968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2291),
+            id: DeclarationId(2292),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -75701,7 +75737,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 11357, 11469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2292),
+            id: DeclarationId(2293),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -75721,7 +75757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4846, 4866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2293),
+            id: DeclarationId(2294),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -75747,7 +75783,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4876, 4900),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2294),
+            id: DeclarationId(2295),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -75773,7 +75809,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4911, 4935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2295),
+            id: DeclarationId(2296),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -75799,7 +75835,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4941, 4965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2296),
+            id: DeclarationId(2297),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -75819,7 +75855,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5042, 5062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2297),
+            id: DeclarationId(2298),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -75845,7 +75881,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5072, 5096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2298),
+            id: DeclarationId(2299),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -75871,7 +75907,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5107, 5131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2299),
+            id: DeclarationId(2300),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -75897,7 +75933,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5137, 5161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2300),
+            id: DeclarationId(2301),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -75917,7 +75953,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5245, 5265),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2301),
+            id: DeclarationId(2302),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -75943,7 +75979,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5276, 5300),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2302),
+            id: DeclarationId(2303),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -75969,7 +76005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5325, 5349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2303),
+            id: DeclarationId(2304),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -75989,7 +76025,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5440, 5460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2304),
+            id: DeclarationId(2305),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -76015,7 +76051,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5471, 5495),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2305),
+            id: DeclarationId(2306),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -76041,7 +76077,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5520, 5544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2306),
+            id: DeclarationId(2307),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -76060,7 +76096,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1634, 1651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2307),
+            id: DeclarationId(2308),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -76085,7 +76121,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1656, 1697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2308),
+            id: DeclarationId(2309),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76099,7 +76135,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1879, 1891),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2309),
+            id: DeclarationId(2310),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -76118,7 +76154,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1896, 1932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2310),
+            id: DeclarationId(2311),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -76138,13 +76174,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2414, 2430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2311),
+            id: DeclarationId(2312),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2310),
+                    value: DeclarationId(2311),
                 }],
             },
             type_params: vec![],
@@ -76158,7 +76194,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2409, 2431),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2312),
+            id: DeclarationId(2313),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -76172,7 +76208,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "witnesses".to_string(),
-                        ty: DeclarationId(2311),
+                        ty: DeclarationId(2312),
                     },
                 ],
             },
@@ -76187,7 +76223,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2325, 2437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2313),
+            id: DeclarationId(2314),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -76207,7 +76243,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2505, 2521),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2314),
+            id: DeclarationId(2315),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -76227,13 +76263,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2544, 2560),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2315),
+            id: DeclarationId(2316),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2314),
+                    value: DeclarationId(2315),
                 }],
             },
             type_params: vec![],
@@ -76247,7 +76283,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2539, 2561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2316),
+            id: DeclarationId(2317),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -76257,11 +76293,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "violations".to_string(),
-                        ty: DeclarationId(2313),
+                        ty: DeclarationId(2314),
                     },
                     Field {
                         label: "witnesses".to_string(),
-                        ty: DeclarationId(2315),
+                        ty: DeclarationId(2316),
                     },
                 ],
             },
@@ -76276,7 +76312,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2442, 2567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2317),
+            id: DeclarationId(2318),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -76296,11 +76332,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3902, 3918),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2318),
+            id: DeclarationId(2319),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2317),
+                output: DeclarationId(2318),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -76314,7 +76350,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3881, 3918),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2319),
+            id: DeclarationId(2320),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
@@ -76334,7 +76370,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3930, 3945),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2320),
+            id: DeclarationId(2321),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(827), DeclarationId(990)],
@@ -76352,7 +76388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3966, 4009),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2321),
+            id: DeclarationId(2322),
             name: Some("DimensionUnitAbelianGroup".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(25),
@@ -76372,7 +76408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2322),
+            id: DeclarationId(2323),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76386,7 +76422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3709, 3721),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2323),
+            id: DeclarationId(2324),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -76405,7 +76441,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3726, 3762),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2324),
+            id: DeclarationId(2325),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -76425,7 +76461,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 855, 873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2325),
+            id: DeclarationId(2326),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76439,7 +76475,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4373, 4389),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2326),
+            id: DeclarationId(2327),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -76458,7 +76494,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4394, 4422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2327),
+            id: DeclarationId(2328),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76472,7 +76508,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4665, 4686),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2328),
+            id: DeclarationId(2329),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -76491,7 +76527,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5176, 5195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2329),
+            id: DeclarationId(2330),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -76510,7 +76546,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5200, 5222),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2330),
+            id: DeclarationId(2331),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -76530,7 +76566,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5591, 5614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2331),
+            id: DeclarationId(2332),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76544,7 +76580,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6611, 6619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2332),
+            id: DeclarationId(2333),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76558,7 +76594,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6624, 6632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2333),
+            id: DeclarationId(2334),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76572,7 +76608,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7073, 7078),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2334),
+            id: DeclarationId(2335),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76586,7 +76622,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7083, 7091),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2335),
+            id: DeclarationId(2336),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76600,7 +76636,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7427, 7440),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2336),
+            id: DeclarationId(2337),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76614,7 +76650,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7445, 7451),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2337),
+            id: DeclarationId(2338),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76628,7 +76664,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7709, 7717),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2338),
+            id: DeclarationId(2339),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76642,7 +76678,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7722, 7727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2339),
+            id: DeclarationId(2340),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76656,7 +76692,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7732, 7745),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2340),
+            id: DeclarationId(2341),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76670,7 +76706,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8082, 8100),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2341),
+            id: DeclarationId(2342),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76684,7 +76720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9475, 9484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2342),
+            id: DeclarationId(2343),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76698,7 +76734,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9489, 9502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2343),
+            id: DeclarationId(2344),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76712,7 +76748,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9507, 9515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2344),
+            id: DeclarationId(2345),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76726,7 +76762,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9520, 9530),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2345),
+            id: DeclarationId(2346),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76740,7 +76776,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9535, 9545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2346),
+            id: DeclarationId(2347),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76754,7 +76790,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9550, 9561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2347),
+            id: DeclarationId(2348),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76768,7 +76804,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9566, 9574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2348),
+            id: DeclarationId(2349),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76782,7 +76818,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9579, 9586),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2349),
+            id: DeclarationId(2350),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76796,7 +76832,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9591, 9601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2350),
+            id: DeclarationId(2351),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76810,7 +76846,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9606, 9618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2351),
+            id: DeclarationId(2352),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76824,7 +76860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12311, 12337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2352),
+            id: DeclarationId(2353),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76838,7 +76874,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12342, 12352),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2353),
+            id: DeclarationId(2354),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76852,7 +76888,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17117, 17123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2354),
+            id: DeclarationId(2355),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76866,7 +76902,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17128, 17139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2355),
+            id: DeclarationId(2356),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76880,7 +76916,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17459, 17470),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2356),
+            id: DeclarationId(2357),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76894,7 +76930,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17475, 17486),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2357),
+            id: DeclarationId(2358),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76908,7 +76944,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 19419, 19430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2358),
+            id: DeclarationId(2359),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -76922,7 +76958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 19435, 19443),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2359),
+            id: DeclarationId(2360),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -76941,7 +76977,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 20606, 20641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2360),
+            id: DeclarationId(2361),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -76966,7 +77002,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 20646, 20734),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2361),
+            id: DeclarationId(2362),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -76986,7 +77022,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6894, 6922),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2362),
+            id: DeclarationId(2363),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -77005,7 +77041,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2363),
+            id: DeclarationId(2364),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -77024,7 +77060,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2364),
+            id: DeclarationId(2365),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -77044,7 +77080,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27850, 27865),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2365),
+            id: DeclarationId(2366),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -77064,7 +77100,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 29879, 29895),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2366),
+            id: DeclarationId(2367),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -77084,7 +77120,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 29988, 30004),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2367),
+            id: DeclarationId(2368),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -77104,13 +77140,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 30102, 30118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2368),
+            id: DeclarationId(2369),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2367),
+                    value: DeclarationId(2368),
                 }],
             },
             type_params: vec![],
@@ -77124,7 +77160,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 30097, 30119),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2369),
+            id: DeclarationId(2370),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -77143,7 +77179,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2370),
+            id: DeclarationId(2371),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -77162,7 +77198,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2371),
+            id: DeclarationId(2372),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -77181,7 +77217,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2372),
+            id: DeclarationId(2373),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -77200,7 +77236,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2373),
+            id: DeclarationId(2374),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -77219,7 +77255,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2374),
+            id: DeclarationId(2375),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -77238,7 +77274,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2375),
+            id: DeclarationId(2376),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77252,7 +77288,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5629, 5644),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2376),
+            id: DeclarationId(2377),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77266,7 +77302,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5684, 5697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2377),
+            id: DeclarationId(2378),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77280,7 +77316,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5745, 5762),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2378),
+            id: DeclarationId(2379),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77294,7 +77330,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5801, 5813),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2379),
+            id: DeclarationId(2380),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77308,7 +77344,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5861, 5878),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2380),
+            id: DeclarationId(2381),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -77333,7 +77369,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 9971, 10033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2381),
+            id: DeclarationId(2382),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77352,7 +77388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10038, 10080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2382),
+            id: DeclarationId(2383),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -77377,7 +77413,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10085, 10142),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2383),
+            id: DeclarationId(2384),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77391,7 +77427,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10147, 10161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2384),
+            id: DeclarationId(2385),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77405,7 +77441,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10166, 10181),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2385),
+            id: DeclarationId(2386),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77419,7 +77455,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24135, 24149),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2386),
+            id: DeclarationId(2387),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77438,7 +77474,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24154, 24201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2387),
+            id: DeclarationId(2388),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -77463,7 +77499,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24206, 24283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2388),
+            id: DeclarationId(2389),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -77488,7 +77524,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24288, 24362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2389),
+            id: DeclarationId(2390),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -77513,7 +77549,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24982, 25038),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2390),
+            id: DeclarationId(2391),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77532,7 +77568,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 25054, 25079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2391),
+            id: DeclarationId(2392),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77546,7 +77582,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26728, 26741),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2392),
+            id: DeclarationId(2393),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77565,7 +77601,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26785, 26817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2393),
+            id: DeclarationId(2394),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -77585,12 +77621,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26880, 26896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2394),
+            id: DeclarationId(2395),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "factors".to_string(),
-                    ty: DeclarationId(2393),
+                    ty: DeclarationId(2394),
                 }],
             },
             type_params: vec![],
@@ -77604,7 +77640,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26856, 26898),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2395),
+            id: DeclarationId(2396),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -77624,13 +77660,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26960, 26976),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2396),
+            id: DeclarationId(2397),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2395),
+                    value: DeclarationId(2396),
                 }],
             },
             type_params: vec![],
@@ -77644,12 +77680,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26955, 26977),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2397),
+            id: DeclarationId(2398),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-                    ty: DeclarationId(2396),
+                    ty: DeclarationId(2397),
                 }],
             },
             type_params: vec![],
@@ -77663,7 +77699,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26927, 26979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2398),
+            id: DeclarationId(2399),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -77683,12 +77719,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27277, 27292),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2399),
+            id: DeclarationId(2400),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-                    ty: DeclarationId(2398),
+                    ty: DeclarationId(2399),
                 }],
             },
             type_params: vec![],
@@ -77702,7 +77738,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27259, 27294),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2400),
+            id: DeclarationId(2401),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77716,7 +77752,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27377, 27389),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2401),
+            id: DeclarationId(2402),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77730,7 +77766,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27459, 27469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2402),
+            id: DeclarationId(2403),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -77750,7 +77786,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(2403),
+            id: DeclarationId(2404),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -77770,7 +77806,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(2404),
+            id: DeclarationId(2405),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -77790,11 +77826,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4180, 4190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2405),
+            id: DeclarationId(2406),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2404),
+                output: DeclarationId(2405),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -77808,7 +77844,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4159, 4190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2406),
+            id: DeclarationId(2407),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
@@ -77828,7 +77864,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4205, 4214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2407),
+            id: DeclarationId(2408),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1129), DeclarationId(1129)],
@@ -77846,7 +77882,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4225, 4238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2408),
+            id: DeclarationId(2409),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1129), DeclarationId(818)],
@@ -77864,7 +77900,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4250, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2409),
+            id: DeclarationId(2410),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(1129)],
@@ -77882,7 +77918,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4284, 4316),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2410),
+            id: DeclarationId(2411),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -77901,7 +77937,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 3305, 3352),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2411),
+            id: DeclarationId(2412),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -77926,7 +77962,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 3357, 3418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2412),
+            id: DeclarationId(2413),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -77940,7 +77976,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 4297, 4302),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2413),
+            id: DeclarationId(2414),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1133)],
@@ -77958,7 +77994,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 5301, 5321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2414),
+            id: DeclarationId(2415),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1134), DeclarationId(1134)],
@@ -77976,7 +78012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 5334, 5360),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2415),
+            id: DeclarationId(2416),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1128),
@@ -77996,7 +78032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 7360, 7372),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2416),
+            id: DeclarationId(2417),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1132),
@@ -78022,7 +78058,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 7388, 7419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2417),
+            id: DeclarationId(2418),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1135),
@@ -78048,7 +78084,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 9093, 9124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2418),
+            id: DeclarationId(2419),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1128),
@@ -78068,7 +78104,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens_application.dag", 10144, 10156),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2419),
+            id: DeclarationId(2420),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -78088,7 +78124,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4589, 4600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2420),
+            id: DeclarationId(2421),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -78108,7 +78144,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4642, 4653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2421),
+            id: DeclarationId(2422),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -78122,7 +78158,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4544, 4548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2422),
+            id: DeclarationId(2423),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -78141,7 +78177,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4553, 4563),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2423),
+            id: DeclarationId(2424),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78161,7 +78197,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1179, 1196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2424),
+            id: DeclarationId(2425),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -78180,7 +78216,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2425),
+            id: DeclarationId(2426),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78200,12 +78236,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1747, 1764),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2426),
+            id: DeclarationId(2427),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2425),
+                    ty: DeclarationId(2426),
                 }],
             },
             type_params: vec![],
@@ -78219,7 +78255,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1736, 1765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2427),
+            id: DeclarationId(2428),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78239,12 +78275,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1777, 1795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2428),
+            id: DeclarationId(2429),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2427),
+                    ty: DeclarationId(2428),
                 }],
             },
             type_params: vec![],
@@ -78258,7 +78294,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1770, 1796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2429),
+            id: DeclarationId(2430),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -78277,7 +78313,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2089, 2117),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2430),
+            id: DeclarationId(2431),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78302,7 +78338,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2122, 2175),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2431),
+            id: DeclarationId(2432),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78327,7 +78363,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2452, 2492),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2432),
+            id: DeclarationId(2433),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78347,7 +78383,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2544, 2562),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2433),
+            id: DeclarationId(2434),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78357,7 +78393,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2432),
+                        ty: DeclarationId(2433),
                     },
                     Field {
                         label: "span".to_string(),
@@ -78376,7 +78412,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2497, 2591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2434),
+            id: DeclarationId(2435),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78401,7 +78437,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2596, 2660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2435),
+            id: DeclarationId(2436),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78421,13 +78457,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2687, 2704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2436),
+            id: DeclarationId(2437),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(2435),
+                        ty: DeclarationId(2436),
                     },
                     Field {
                         label: "output".to_string(),
@@ -78450,7 +78486,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2665, 2759),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2437),
+            id: DeclarationId(2438),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78475,7 +78511,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4129, 4175),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2438),
+            id: DeclarationId(2439),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78504,7 +78540,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4180, 4263),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2439),
+            id: DeclarationId(2440),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78524,7 +78560,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4317, 4342),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2440),
+            id: DeclarationId(2441),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78534,7 +78570,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2439),
+                        ty: DeclarationId(2440),
                     },
                     Field {
                         label: "span".to_string(),
@@ -78553,7 +78589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4268, 4371),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2441),
+            id: DeclarationId(2442),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -78572,7 +78608,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5043, 5054),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2442),
+            id: DeclarationId(2443),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -78591,7 +78627,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5059, 5069),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2443),
+            id: DeclarationId(2444),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -78610,7 +78646,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5074, 5088),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2444),
+            id: DeclarationId(2445),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78635,7 +78671,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5202, 5253),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2445),
+            id: DeclarationId(2446),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78660,7 +78696,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5258, 5296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2446),
+            id: DeclarationId(2447),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78680,7 +78716,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5324, 5336),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2447),
+            id: DeclarationId(2448),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78700,17 +78736,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5358, 5374),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2448),
+            id: DeclarationId(2449),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "segments".to_string(),
-                        ty: DeclarationId(2446),
+                        ty: DeclarationId(2447),
                     },
                     Field {
                         label: "segment_spans".to_string(),
-                        ty: DeclarationId(2447),
+                        ty: DeclarationId(2448),
                     },
                     Field {
                         label: "span".to_string(),
@@ -78729,7 +78765,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5301, 5403),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2449),
+            id: DeclarationId(2450),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78749,7 +78785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5448, 5465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2450),
+            id: DeclarationId(2451),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78759,7 +78795,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2449),
+                        ty: DeclarationId(2450),
                     },
                     Field {
                         label: "span".to_string(),
@@ -78778,7 +78814,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5408, 5494),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2451),
+            id: DeclarationId(2452),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78798,7 +78834,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6065, 6077),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2452),
+            id: DeclarationId(2453),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78818,7 +78854,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6099, 6115),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2453),
+            id: DeclarationId(2454),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78838,21 +78874,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6128, 6145),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2454),
+            id: DeclarationId(2455),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "segments".to_string(),
-                        ty: DeclarationId(2451),
+                        ty: DeclarationId(2452),
                     },
                     Field {
                         label: "segment_spans".to_string(),
-                        ty: DeclarationId(2452),
+                        ty: DeclarationId(2453),
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2453),
+                        ty: DeclarationId(2454),
                     },
                     Field {
                         label: "span".to_string(),
@@ -78871,7 +78907,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6038, 6174),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2455),
+            id: DeclarationId(2456),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78891,7 +78927,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6230, 6254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2456),
+            id: DeclarationId(2457),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78901,7 +78937,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2455),
+                        ty: DeclarationId(2456),
                     },
                     Field {
                         label: "span".to_string(),
@@ -78920,7 +78956,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6179, 6283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2457),
+            id: DeclarationId(2458),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78940,7 +78976,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6334, 6351),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2458),
+            id: DeclarationId(2459),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -78950,7 +78986,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2457),
+                        ty: DeclarationId(2458),
                     },
                     Field {
                         label: "span".to_string(),
@@ -78969,7 +79005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6288, 6380),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2459),
+            id: DeclarationId(2460),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -78989,13 +79025,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6408, 6420),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2460),
+            id: DeclarationId(2461),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(2459),
+                        ty: DeclarationId(2460),
                     },
                     Field {
                         label: "body".to_string(),
@@ -79018,7 +79054,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6385, 6473),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2461),
+            id: DeclarationId(2462),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -79051,7 +79087,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6478, 6597),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2462),
+            id: DeclarationId(2463),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79071,7 +79107,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6651, 6672),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2463),
+            id: DeclarationId(2464),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -79081,7 +79117,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "arms".to_string(),
-                        ty: DeclarationId(2462),
+                        ty: DeclarationId(2463),
                     },
                     Field {
                         label: "span".to_string(),
@@ -79100,7 +79136,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6602, 6701),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2464),
+            id: DeclarationId(2465),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79120,13 +79156,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6729, 6753),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2465),
+            id: DeclarationId(2466),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2464),
+                        ty: DeclarationId(2465),
                     },
                     Field {
                         label: "span".to_string(),
@@ -79145,7 +79181,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6706, 6782),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2466),
+            id: DeclarationId(2467),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79165,13 +79201,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6810, 6827),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2467),
+            id: DeclarationId(2468),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "elements".to_string(),
-                        ty: DeclarationId(2466),
+                        ty: DeclarationId(2467),
                     },
                     Field {
                         label: "span".to_string(),
@@ -79190,7 +79226,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6787, 6856),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2468),
+            id: DeclarationId(2469),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79210,13 +79246,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 8950, 8971),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2469),
+            id: DeclarationId(2470),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "entries".to_string(),
-                        ty: DeclarationId(2468),
+                        ty: DeclarationId(2469),
                     },
                     Field {
                         label: "span".to_string(),
@@ -79235,7 +79271,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 8929, 9000),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2470),
+            id: DeclarationId(2471),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -79254,7 +79290,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9931, 9943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2471),
+            id: DeclarationId(2472),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -79264,7 +79300,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_ann".to_string(),
-                        ty: DeclarationId(2470),
+                        ty: DeclarationId(2471),
                     },
                     Field {
                         label: "expr".to_string(),
@@ -79283,7 +79319,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9890, 9973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2472),
+            id: DeclarationId(2473),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79303,7 +79339,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10021, 10033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2473),
+            id: DeclarationId(2474),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79323,7 +79359,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10048, 10066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2474),
+            id: DeclarationId(2475),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -79333,11 +79369,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2472),
+                        ty: DeclarationId(2473),
                     },
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(2473),
+                        ty: DeclarationId(2474),
                     },
                     Field {
                         label: "return_type".to_string(),
@@ -79364,7 +79400,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9978, 10150),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2475),
+            id: DeclarationId(2476),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79384,7 +79420,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10210, 10222),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2476),
+            id: DeclarationId(2477),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79404,7 +79440,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10237, 10255),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2477),
+            id: DeclarationId(2478),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -79414,11 +79450,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2475),
+                        ty: DeclarationId(2476),
                     },
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(2476),
+                        ty: DeclarationId(2477),
                     },
                     Field {
                         label: "return_type".to_string(),
@@ -79445,7 +79481,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10155, 10343),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2478),
+            id: DeclarationId(2479),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -79464,7 +79500,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10408, 10420),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2479),
+            id: DeclarationId(2480),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -79478,7 +79514,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(2478),
+                        ty: DeclarationId(2479),
                     },
                     Field {
                         label: "body_span".to_string(),
@@ -79501,7 +79537,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10348, 10477),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2480),
+            id: DeclarationId(2481),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79521,13 +79557,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10497, 10509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2481),
+            id: DeclarationId(2482),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(2480),
+                        ty: DeclarationId(2481),
                     },
                     Field {
                         label: "span".to_string(),
@@ -79546,7 +79582,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10482, 10529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2482),
+            id: DeclarationId(2483),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79566,7 +79602,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10555, 10567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2483),
+            id: DeclarationId(2484),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79586,17 +79622,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10581, 10593),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2484),
+            id: DeclarationId(2485),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(2482),
+                        ty: DeclarationId(2483),
                     },
                     Field {
                         label: "names".to_string(),
-                        ty: DeclarationId(2483),
+                        ty: DeclarationId(2484),
                     },
                     Field {
                         label: "span".to_string(),
@@ -79615,7 +79651,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10534, 10622),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2485),
+            id: DeclarationId(2486),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79635,7 +79671,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10676, 10688),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2486),
+            id: DeclarationId(2487),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -79645,7 +79681,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2485),
+                        ty: DeclarationId(2486),
                     },
                     Field {
                         label: "span".to_string(),
@@ -79664,7 +79700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10627, 10717),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2487),
+            id: DeclarationId(2488),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79684,7 +79720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10773, 10785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2488),
+            id: DeclarationId(2489),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79704,7 +79740,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10800, 10818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2489),
+            id: DeclarationId(2490),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -79714,11 +79750,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2487),
+                        ty: DeclarationId(2488),
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2488),
+                        ty: DeclarationId(2489),
                     },
                     Field {
                         label: "span".to_string(),
@@ -79737,7 +79773,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10722, 10847),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2490),
+            id: DeclarationId(2491),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79757,7 +79793,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10900, 10912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2491),
+            id: DeclarationId(2492),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79777,7 +79813,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10929, 10949),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2492),
+            id: DeclarationId(2493),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -79796,7 +79832,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10966, 10978),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2493),
+            id: DeclarationId(2494),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -79806,15 +79842,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2490),
+                        ty: DeclarationId(2491),
                     },
                     Field {
                         label: "variants".to_string(),
-                        ty: DeclarationId(2491),
+                        ty: DeclarationId(2492),
                     },
                     Field {
                         label: "inhabits".to_string(),
-                        ty: DeclarationId(2492),
+                        ty: DeclarationId(2493),
                     },
                     Field {
                         label: "span".to_string(),
@@ -79833,7 +79869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10852, 11007),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2494),
+            id: DeclarationId(2495),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79853,7 +79889,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 11062, 11074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2495),
+            id: DeclarationId(2496),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -79872,7 +79908,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 11146, 11158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2496),
+            id: DeclarationId(2497),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -79882,7 +79918,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2494),
+                        ty: DeclarationId(2495),
                     },
                     Field {
                         label: "nominal_opaque".to_string(),
@@ -79894,7 +79930,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "refinement".to_string(),
-                        ty: DeclarationId(2495),
+                        ty: DeclarationId(2496),
                     },
                     Field {
                         label: "span".to_string(),
@@ -79913,7 +79949,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 11012, 11187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2497),
+            id: DeclarationId(2498),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79937,7 +79973,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2498),
+            id: DeclarationId(2499),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79957,7 +79993,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 11243, 11254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2499),
+            id: DeclarationId(2500),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -79976,7 +80012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2137, 2162),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2500),
+            id: DeclarationId(2501),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -79996,12 +80032,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2179, 2195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2501),
+            id: DeclarationId(2502),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2500),
+                    ty: DeclarationId(2501),
                 }],
             },
             type_params: vec![],
@@ -80015,7 +80051,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2167, 2196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2502),
+            id: DeclarationId(2503),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -80040,7 +80076,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2201, 2252),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2503),
+            id: DeclarationId(2504),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -80059,7 +80095,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2257, 2272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2504),
+            id: DeclarationId(2505),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -80078,7 +80114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2277, 2304),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2505),
+            id: DeclarationId(2506),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -80104,7 +80140,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 3936, 3954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2506),
+            id: DeclarationId(2507),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80124,7 +80160,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 4542, 4557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2507),
+            id: DeclarationId(2508),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -80143,7 +80179,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 5388, 5442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2508),
+            id: DeclarationId(2509),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -80157,7 +80193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 5682, 5691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2509),
+            id: DeclarationId(2510),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -80171,7 +80207,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 5694, 5704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2510),
+            id: DeclarationId(2511),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80191,7 +80227,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5769, 5797),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2511),
+            id: DeclarationId(2512),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -80214,10 +80250,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/services.dag", 6785, 6808),
+            span: SourceSpan::new("src/v3/std/services.dag", 6784, 6807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2512),
+            id: DeclarationId(2513),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -80237,7 +80273,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2513),
+            id: DeclarationId(2514),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -80257,7 +80293,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4626, 4652),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2514),
+            id: DeclarationId(2515),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80277,7 +80313,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4920, 4937),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2515),
+            id: DeclarationId(2516),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80297,7 +80333,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4988, 5002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2516),
+            id: DeclarationId(2517),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80317,7 +80353,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5052, 5065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2517),
+            id: DeclarationId(2518),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80337,7 +80373,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5115, 5128),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2518),
+            id: DeclarationId(2519),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80357,7 +80393,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5176, 5192),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2519),
+            id: DeclarationId(2520),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -80377,13 +80413,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5245, 5271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2520),
+            id: DeclarationId(2521),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2519),
+                    value: DeclarationId(2520),
                 }],
             },
             type_params: vec![],
@@ -80397,7 +80433,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5240, 5272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2521),
+            id: DeclarationId(2522),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -80417,13 +80453,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5346, 5372),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2522),
+            id: DeclarationId(2523),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2521),
+                    value: DeclarationId(2522),
                 }],
             },
             type_params: vec![],
@@ -80437,7 +80473,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5341, 5373),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2523),
+            id: DeclarationId(2524),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -80457,7 +80493,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5498, 5514),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2524),
+            id: DeclarationId(2525),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -80477,7 +80513,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5639, 5673),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2525),
+            id: DeclarationId(2526),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -80497,7 +80533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5885, 5919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2526),
+            id: DeclarationId(2527),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -80517,7 +80553,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6404, 6438),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2527),
+            id: DeclarationId(2528),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -80537,7 +80573,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6665, 6699),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2528),
+            id: DeclarationId(2529),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -80557,7 +80593,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6955, 6989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2529),
+            id: DeclarationId(2530),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -80577,7 +80613,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7169, 7195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2530),
+            id: DeclarationId(2531),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -80597,7 +80633,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7200, 7234),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2531),
+            id: DeclarationId(2532),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -80617,10 +80653,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8469, 8503),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2532),
+            id: DeclarationId(2533),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2306),
+                template: DeclarationId(2307),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
@@ -80637,10 +80673,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2533),
+            id: DeclarationId(2534),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2306),
+                template: DeclarationId(2307),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
@@ -80657,10 +80693,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2534),
+            id: DeclarationId(2535),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2306),
+                template: DeclarationId(2307),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
@@ -80677,10 +80713,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2535),
+            id: DeclarationId(2536),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2306),
+                template: DeclarationId(2307),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
@@ -80697,10 +80733,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2536),
+            id: DeclarationId(2537),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2306),
+                template: DeclarationId(2307),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
@@ -80717,10 +80753,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2537),
+            id: DeclarationId(2538),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2306),
+                template: DeclarationId(2307),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
@@ -80737,10 +80773,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2538),
+            id: DeclarationId(2539),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2306),
+                template: DeclarationId(2307),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
@@ -80757,10 +80793,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2539),
+            id: DeclarationId(2540),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2306),
+                template: DeclarationId(2307),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
@@ -80777,10 +80813,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2540),
+            id: DeclarationId(2541),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2306),
+                template: DeclarationId(2307),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
@@ -80797,10 +80833,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2541),
+            id: DeclarationId(2542),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2306),
+                template: DeclarationId(2307),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
@@ -80817,10 +80853,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2542),
+            id: DeclarationId(2543),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1818),
+                template: DeclarationId(1819),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(799),
@@ -80837,10 +80873,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4920, 4937),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2543),
+            id: DeclarationId(2544),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1818),
+                template: DeclarationId(1819),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(827),
@@ -80857,10 +80893,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4988, 5002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2544),
+            id: DeclarationId(2545),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1818),
+                template: DeclarationId(1819),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(781),
@@ -80877,10 +80913,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5052, 5065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2545),
+            id: DeclarationId(2546),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1818),
+                template: DeclarationId(1819),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(817),
@@ -80897,10 +80933,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5115, 5128),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2546),
+            id: DeclarationId(2547),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1818),
+                template: DeclarationId(1819),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(982),
@@ -80917,13 +80953,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5176, 5192),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2547),
+            id: DeclarationId(2548),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1818),
+                template: DeclarationId(1819),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2519),
+                    value: DeclarationId(2520),
                 }],
             },
             type_params: vec![],
@@ -80937,13 +80973,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5240, 5272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2548),
+            id: DeclarationId(2549),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1820),
+                template: DeclarationId(1821),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2521),
+                    value: DeclarationId(2522),
                 }],
             },
             type_params: vec![],
@@ -80957,10 +80993,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5341, 5373),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2549),
+            id: DeclarationId(2550),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2306),
+                template: DeclarationId(2307),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
@@ -80977,10 +81013,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5346, 5372),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2550),
+            id: DeclarationId(2551),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1820),
+                template: DeclarationId(1821),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(982),
@@ -80997,10 +81033,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5498, 5514),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2551),
+            id: DeclarationId(2552),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2312),
+                template: DeclarationId(2313),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(988),
                     value: DeclarationId(1238),
@@ -81017,10 +81053,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5639, 5673),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2552),
+            id: DeclarationId(2553),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2316),
+                template: DeclarationId(2317),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(988),
                     value: DeclarationId(1238),
@@ -81037,7 +81073,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5885, 5919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2553),
+            id: DeclarationId(2554),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -81056,7 +81092,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2554),
+            id: DeclarationId(2555),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -81075,7 +81111,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2555),
+            id: DeclarationId(2556),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -81094,7 +81130,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2556),
+            id: DeclarationId(2557),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -81120,7 +81156,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2732, 2760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2557),
+            id: DeclarationId(2558),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -81146,7 +81182,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2804, 2832),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2558),
+            id: DeclarationId(2559),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -81165,7 +81201,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2559),
+            id: DeclarationId(2560),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -81184,7 +81220,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2560),
+            id: DeclarationId(2561),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(11),
@@ -81210,7 +81246,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 12353, 12399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2561),
+            id: DeclarationId(2562),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81224,7 +81260,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 767, 773),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2562),
+            id: DeclarationId(2563),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81238,7 +81274,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 778, 791),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2563),
+            id: DeclarationId(2564),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81252,7 +81288,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 796, 810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2564),
+            id: DeclarationId(2565),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81271,7 +81307,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3332, 3358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2565),
+            id: DeclarationId(2566),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81290,7 +81326,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3363, 3391),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2566),
+            id: DeclarationId(2567),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81309,7 +81345,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3396, 3429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2567),
+            id: DeclarationId(2568),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81328,7 +81364,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3434, 3465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2568),
+            id: DeclarationId(2569),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81347,7 +81383,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3470, 3502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2569),
+            id: DeclarationId(2570),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81361,7 +81397,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4509, 4516),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2570),
+            id: DeclarationId(2571),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81380,7 +81416,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4521, 4571),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2571),
+            id: DeclarationId(2572),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81394,7 +81430,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 5484, 5495),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2572),
+            id: DeclarationId(2573),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81413,7 +81449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 5500, 5545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2573),
+            id: DeclarationId(2574),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81432,7 +81468,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7649, 7683),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2574),
+            id: DeclarationId(2575),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81451,7 +81487,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7688, 7732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2575),
+            id: DeclarationId(2576),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81470,7 +81506,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7737, 7795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2576),
+            id: DeclarationId(2577),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81489,7 +81525,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7800, 7856),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2577),
+            id: DeclarationId(2578),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81508,7 +81544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7861, 7894),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2578),
+            id: DeclarationId(2579),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81527,7 +81563,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7899, 7929),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2579),
+            id: DeclarationId(2580),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81541,7 +81577,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7934, 7947),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2580),
+            id: DeclarationId(2581),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -81561,7 +81597,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7987, 8009),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2581),
+            id: DeclarationId(2582),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -81581,7 +81617,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 8219, 8240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2582),
+            id: DeclarationId(2583),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81595,7 +81631,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 8740, 8746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2583),
+            id: DeclarationId(2584),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81609,7 +81645,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 9139, 9152),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2584),
+            id: DeclarationId(2585),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81623,7 +81659,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 9157, 9171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2585),
+            id: DeclarationId(2586),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81642,7 +81678,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 10263, 10297),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2586),
+            id: DeclarationId(2587),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81656,7 +81692,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 10302, 10320),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2587),
+            id: DeclarationId(2588),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -81682,7 +81718,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 11234, 11261),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2588),
+            id: DeclarationId(2589),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -81702,7 +81738,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9931, 9947),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2589),
+            id: DeclarationId(2590),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -81722,7 +81758,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2590),
+            id: DeclarationId(2591),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -81741,7 +81777,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4032, 4066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2591),
+            id: DeclarationId(2592),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81755,7 +81791,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4071, 4081),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2592),
+            id: DeclarationId(2593),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81769,7 +81805,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4086, 4095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2593),
+            id: DeclarationId(2594),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -81783,7 +81819,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4100, 4105),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2594),
+            id: DeclarationId(2595),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -81803,10 +81839,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7603, 7631),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2595),
+            id: DeclarationId(2596),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1818),
+                template: DeclarationId(1819),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(978),
@@ -81822,31 +81858,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9931, 9947),
         });
-        declarations.push(Declaration {
-            id: DeclarationId(2596),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(2306),
-                arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(985),
-                    value: DeclarationId(1238),
-                }],
-            },
-            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/timing_lens.dag", 13840, 13866),
-        });
         declarations.push(Declaration {
             id: DeclarationId(2597),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2306),
+                template: DeclarationId(2307),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
@@ -81866,7 +81882,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2598),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2306),
+                template: DeclarationId(2307),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
@@ -81886,7 +81902,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2599),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2306),
+                template: DeclarationId(2307),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
@@ -81906,7 +81922,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2600),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2306),
+                template: DeclarationId(2307),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
@@ -81926,7 +81942,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2601),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2306),
+                template: DeclarationId(2307),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
@@ -81946,7 +81962,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2602),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2306),
+                template: DeclarationId(2307),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
@@ -81966,7 +81982,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2603),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2306),
+                template: DeclarationId(2307),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
@@ -81986,7 +82002,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2604),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2306),
+                template: DeclarationId(2307),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
@@ -82006,7 +82022,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(2605),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(2306),
+                template: DeclarationId(2307),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1238),
@@ -82025,6 +82041,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         declarations.push(Declaration {
             id: DeclarationId(2606),
             name: None,
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(2307),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(985),
+                    value: DeclarationId(1238),
+                }],
+            },
+            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/timing_lens.dag", 13840, 13866),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2607),
+            name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -82037,7 +82073,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 646, 651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2607),
+            id: DeclarationId(2608),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82051,7 +82087,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 656, 660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2608),
+            id: DeclarationId(2609),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82065,7 +82101,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 665, 671),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2609),
+            id: DeclarationId(2610),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82079,7 +82115,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 676, 682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2610),
+            id: DeclarationId(2611),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82093,7 +82129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 687, 691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2611),
+            id: DeclarationId(2612),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82107,7 +82143,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 696, 702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2612),
+            id: DeclarationId(2613),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82121,7 +82157,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 707, 715),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2613),
+            id: DeclarationId(2614),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82135,7 +82171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 720, 728),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2614),
+            id: DeclarationId(2615),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82149,7 +82185,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 733, 740),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2615),
+            id: DeclarationId(2616),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82163,7 +82199,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 745, 751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2616),
+            id: DeclarationId(2617),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82177,7 +82213,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 756, 763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2617),
+            id: DeclarationId(2618),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82191,7 +82227,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 768, 774),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2618),
+            id: DeclarationId(2619),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82205,7 +82241,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 779, 786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2619),
+            id: DeclarationId(2620),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -82224,7 +82260,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 791, 804),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2620),
+            id: DeclarationId(2621),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -82243,7 +82279,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 889, 903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2621),
+            id: DeclarationId(2622),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -82262,7 +82298,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 908, 925),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2622),
+            id: DeclarationId(2623),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82276,7 +82312,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 930, 932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2623),
+            id: DeclarationId(2624),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82290,7 +82326,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 937, 941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2624),
+            id: DeclarationId(2625),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82304,7 +82340,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 946, 951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2625),
+            id: DeclarationId(2626),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82318,7 +82354,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 956, 958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2626),
+            id: DeclarationId(2627),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82332,7 +82368,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 963, 965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2627),
+            id: DeclarationId(2628),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82346,7 +82382,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 970, 972),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2628),
+            id: DeclarationId(2629),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82360,7 +82396,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 977, 979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2629),
+            id: DeclarationId(2630),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82374,7 +82410,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 984, 988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2630),
+            id: DeclarationId(2631),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82388,7 +82424,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 993, 998),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2631),
+            id: DeclarationId(2632),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82402,7 +82438,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1003, 1007),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2632),
+            id: DeclarationId(2633),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82416,7 +82452,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1012, 1017),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2633),
+            id: DeclarationId(2634),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82430,7 +82466,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1022, 1028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2634),
+            id: DeclarationId(2635),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82444,7 +82480,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1033, 1041),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2635),
+            id: DeclarationId(2636),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82458,7 +82494,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1046, 1051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2636),
+            id: DeclarationId(2637),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82472,7 +82508,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1056, 1061),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2637),
+            id: DeclarationId(2638),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82486,7 +82522,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1066, 1074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2638),
+            id: DeclarationId(2639),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82500,7 +82536,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1079, 1088),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2639),
+            id: DeclarationId(2640),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82514,7 +82550,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1093, 1096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2640),
+            id: DeclarationId(2641),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82528,7 +82564,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1101, 1107),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2641),
+            id: DeclarationId(2642),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82542,7 +82578,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1112, 1118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2642),
+            id: DeclarationId(2643),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82556,7 +82592,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1123, 1129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2643),
+            id: DeclarationId(2644),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82570,7 +82606,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1134, 1140),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2644),
+            id: DeclarationId(2645),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82584,7 +82620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1145, 1153),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2645),
+            id: DeclarationId(2646),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82598,7 +82634,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1158, 1166),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2646),
+            id: DeclarationId(2647),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82612,7 +82648,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1171, 1176),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2647),
+            id: DeclarationId(2648),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82626,7 +82662,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1181, 1190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2648),
+            id: DeclarationId(2649),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82640,7 +82676,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1195, 1199),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2649),
+            id: DeclarationId(2650),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82654,7 +82690,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1204, 1212),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2650),
+            id: DeclarationId(2651),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82668,7 +82704,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1217, 1220),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2651),
+            id: DeclarationId(2652),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82682,7 +82718,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1791, 1796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2652),
+            id: DeclarationId(2653),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82696,7 +82732,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1801, 1805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2653),
+            id: DeclarationId(2654),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82710,7 +82746,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1810, 1816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2654),
+            id: DeclarationId(2655),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82724,7 +82760,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1821, 1827),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2655),
+            id: DeclarationId(2656),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82738,7 +82774,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1832, 1836),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2656),
+            id: DeclarationId(2657),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82752,7 +82788,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1841, 1847),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2657),
+            id: DeclarationId(2658),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82766,7 +82802,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1852, 1860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2658),
+            id: DeclarationId(2659),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82780,7 +82816,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1865, 1873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2659),
+            id: DeclarationId(2660),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82794,7 +82830,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1878, 1885),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2660),
+            id: DeclarationId(2661),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82808,7 +82844,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1890, 1896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2661),
+            id: DeclarationId(2662),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82822,7 +82858,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1901, 1908),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2662),
+            id: DeclarationId(2663),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82836,7 +82872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1913, 1919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2663),
+            id: DeclarationId(2664),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82850,7 +82886,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1924, 1931),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2664),
+            id: DeclarationId(2665),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82864,7 +82900,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2371, 2373),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2665),
+            id: DeclarationId(2666),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82878,7 +82914,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2378, 2382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2666),
+            id: DeclarationId(2667),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82892,7 +82928,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2387, 2392),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2667),
+            id: DeclarationId(2668),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82906,7 +82942,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2397, 2399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2668),
+            id: DeclarationId(2669),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82920,7 +82956,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2404, 2406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2669),
+            id: DeclarationId(2670),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82934,7 +82970,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2411, 2413),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2670),
+            id: DeclarationId(2671),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82948,7 +82984,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2418, 2420),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2671),
+            id: DeclarationId(2672),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82962,7 +82998,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2425, 2429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2672),
+            id: DeclarationId(2673),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82976,7 +83012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2434, 2439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2673),
+            id: DeclarationId(2674),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -82990,7 +83026,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2444, 2448),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2674),
+            id: DeclarationId(2675),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83004,7 +83040,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2453, 2458),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2675),
+            id: DeclarationId(2676),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83018,7 +83054,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2463, 2469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2676),
+            id: DeclarationId(2677),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83032,7 +83068,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2474, 2482),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2677),
+            id: DeclarationId(2678),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83046,7 +83082,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2487, 2492),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2678),
+            id: DeclarationId(2679),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83060,7 +83096,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2497, 2502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2679),
+            id: DeclarationId(2680),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83074,7 +83110,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2507, 2515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2680),
+            id: DeclarationId(2681),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83088,7 +83124,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2520, 2529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2681),
+            id: DeclarationId(2682),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83102,7 +83138,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2534, 2537),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2682),
+            id: DeclarationId(2683),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83116,7 +83152,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2542, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2683),
+            id: DeclarationId(2684),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83130,7 +83166,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2553, 2559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2684),
+            id: DeclarationId(2685),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83144,7 +83180,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2564, 2570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2685),
+            id: DeclarationId(2686),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83158,7 +83194,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2575, 2581),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2686),
+            id: DeclarationId(2687),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83172,7 +83208,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2586, 2594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2687),
+            id: DeclarationId(2688),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83186,7 +83222,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2599, 2607),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2688),
+            id: DeclarationId(2689),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83200,7 +83236,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2612, 2617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2689),
+            id: DeclarationId(2690),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83214,7 +83250,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2622, 2631),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2690),
+            id: DeclarationId(2691),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83228,7 +83264,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2636, 2640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2691),
+            id: DeclarationId(2692),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83242,7 +83278,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2645, 2653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2692),
+            id: DeclarationId(2693),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -83259,10 +83295,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 27581, 27604),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27585, 27608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2693),
+            id: DeclarationId(2694),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -83279,10 +83315,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 28673, 28689),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28677, 28693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2694),
+            id: DeclarationId(2695),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -83299,10 +83335,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 28694, 28714),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28698, 28718),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2695),
+            id: DeclarationId(2696),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83316,7 +83352,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2826, 2840),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2696),
+            id: DeclarationId(2697),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83330,7 +83366,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2845, 2855),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2697),
+            id: DeclarationId(2698),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83344,7 +83380,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2860, 2872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2698),
+            id: DeclarationId(2699),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83358,7 +83394,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2877, 2890),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2699),
+            id: DeclarationId(2700),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83372,7 +83408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2895, 2907),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2700),
+            id: DeclarationId(2701),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83386,7 +83422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2912, 2924),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2701),
+            id: DeclarationId(2702),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83400,7 +83436,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2929, 2951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2702),
+            id: DeclarationId(2703),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83414,7 +83450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2956, 2975),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2703),
+            id: DeclarationId(2704),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83428,7 +83464,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2980, 3005),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2704),
+            id: DeclarationId(2705),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83442,7 +83478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3010, 3033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2705),
+            id: DeclarationId(2706),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83456,7 +83492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3439, 3448),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2706),
+            id: DeclarationId(2707),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -83475,7 +83511,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3453, 3469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2707),
+            id: DeclarationId(2708),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83489,7 +83525,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4128, 4136),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2708),
+            id: DeclarationId(2709),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83503,7 +83539,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4141, 4151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2709),
+            id: DeclarationId(2710),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83517,7 +83553,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4376, 4388),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2710),
+            id: DeclarationId(2711),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83531,7 +83567,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5203, 5216),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2711),
+            id: DeclarationId(2712),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83545,7 +83581,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5221, 5234),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2712),
+            id: DeclarationId(2713),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83559,7 +83595,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5239, 5247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2713),
+            id: DeclarationId(2714),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83584,7 +83620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5792, 5859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2714),
+            id: DeclarationId(2715),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -83603,7 +83639,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5900, 5953),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2715),
+            id: DeclarationId(2716),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83617,7 +83653,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5986, 6015),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2716),
+            id: DeclarationId(2717),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83631,7 +83667,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6617, 6649),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2717),
+            id: DeclarationId(2718),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83645,7 +83681,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6654, 6685),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2718),
+            id: DeclarationId(2719),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83659,7 +83695,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6727, 6759),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2719),
+            id: DeclarationId(2720),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83673,7 +83709,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6764, 6795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2720),
+            id: DeclarationId(2721),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83687,7 +83723,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6800, 6828),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2721),
+            id: DeclarationId(2722),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83701,7 +83737,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6833, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2722),
+            id: DeclarationId(2723),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83715,7 +83751,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6898, 6920),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2723),
+            id: DeclarationId(2724),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83729,7 +83765,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6925, 6953),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2724),
+            id: DeclarationId(2725),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83743,7 +83779,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6958, 6987),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2725),
+            id: DeclarationId(2726),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -83754,10 +83790,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9793, 9801),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9797, 9805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2726),
+            id: DeclarationId(2727),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -83773,10 +83809,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9806, 9846),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9810, 9850),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2727),
+            id: DeclarationId(2728),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -83792,10 +83828,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9851, 9884),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9855, 9888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2728),
+            id: DeclarationId(2729),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83817,10 +83853,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 9889, 9967),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9893, 9971),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2729),
+            id: DeclarationId(2730),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -83836,10 +83872,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 10133, 10196),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10137, 10200),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2730),
+            id: DeclarationId(2731),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83865,10 +83901,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 10201, 10292),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10205, 10296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2731),
+            id: DeclarationId(2732),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83894,10 +83930,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 10297, 10429),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10301, 10433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2732),
+            id: DeclarationId(2733),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83919,10 +83955,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 10644, 10733),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10648, 10737),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2733),
+            id: DeclarationId(2734),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -83939,10 +83975,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 11533, 11545),
+            span: SourceSpan::new("src/v3/std/verification.dag", 11537, 11549),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2734),
+            id: DeclarationId(2735),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -83952,7 +83988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2733),
+                        ty: DeclarationId(2734),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -83968,10 +84004,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 11482, 11579),
+            span: SourceSpan::new("src/v3/std/verification.dag", 11486, 11583),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2735),
+            id: DeclarationId(2736),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -83988,10 +84024,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 12294, 12306),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12298, 12310),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2736),
+            id: DeclarationId(2737),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84001,7 +84037,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2735),
+                        ty: DeclarationId(2736),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -84021,10 +84057,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 12244, 12372),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12248, 12376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2737),
+            id: DeclarationId(2738),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84050,10 +84086,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 12670, 12792),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12674, 12796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2738),
+            id: DeclarationId(2739),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84079,10 +84115,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 13054, 13179),
+            span: SourceSpan::new("src/v3/std/verification.dag", 13058, 13183),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2739),
+            id: DeclarationId(2740),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -84098,10 +84134,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 15232, 15293),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15236, 15297),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2740),
+            id: DeclarationId(2741),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84123,10 +84159,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 15298, 15397),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15302, 15401),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2741),
+            id: DeclarationId(2742),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84152,10 +84188,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 15751, 15883),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15755, 15887),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2742),
+            id: DeclarationId(2743),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84177,10 +84213,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 16450, 16562),
+            span: SourceSpan::new("src/v3/std/verification.dag", 16454, 16566),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2743),
+            id: DeclarationId(2744),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84202,10 +84238,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 17259, 17338),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17263, 17342),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2744),
+            id: DeclarationId(2745),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84231,10 +84267,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 17558, 17671),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17562, 17675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2745),
+            id: DeclarationId(2746),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84260,10 +84296,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 17676, 17812),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17680, 17816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2746),
+            id: DeclarationId(2747),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84285,10 +84321,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 18298, 18380),
+            span: SourceSpan::new("src/v3/std/verification.dag", 18302, 18384),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2747),
+            id: DeclarationId(2748),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84310,10 +84346,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 18385, 18471),
+            span: SourceSpan::new("src/v3/std/verification.dag", 18389, 18475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2748),
+            id: DeclarationId(2749),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -84330,10 +84366,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 18550, 18560),
+            span: SourceSpan::new("src/v3/std/verification.dag", 18554, 18564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2749),
+            id: DeclarationId(2750),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84343,7 +84379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "generated_paths".to_string(),
-                        ty: DeclarationId(2748),
+                        ty: DeclarationId(2749),
                     },
                 ],
             },
@@ -84355,10 +84391,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 18476, 18566),
+            span: SourceSpan::new("src/v3/std/verification.dag", 18480, 18570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2750),
+            id: DeclarationId(2751),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84380,10 +84416,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 19780, 19905),
+            span: SourceSpan::new("src/v3/std/verification.dag", 19784, 19909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2751),
+            id: DeclarationId(2752),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84409,10 +84445,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 20847, 20981),
+            span: SourceSpan::new("src/v3/std/verification.dag", 20851, 20985),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2752),
+            id: DeclarationId(2753),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84438,10 +84474,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 21620, 21764),
+            span: SourceSpan::new("src/v3/std/verification.dag", 21624, 21768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2753),
+            id: DeclarationId(2754),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -84457,10 +84493,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 22609, 22663),
+            span: SourceSpan::new("src/v3/std/verification.dag", 22613, 22667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2754),
+            id: DeclarationId(2755),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -84477,10 +84513,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 23707, 23730),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23711, 23734),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2755),
+            id: DeclarationId(2756),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84491,10 +84527,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 23933, 23939),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23937, 23943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2756),
+            id: DeclarationId(2757),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84505,10 +84541,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 23944, 23950),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23948, 23954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2757),
+            id: DeclarationId(2758),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -84525,10 +84561,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 24088, 24111),
+            span: SourceSpan::new("src/v3/std/verification.dag", 24092, 24115),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2758),
+            id: DeclarationId(2759),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -84544,10 +84580,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 25834, 25863),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25838, 25867),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2759),
+            id: DeclarationId(2760),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -84563,10 +84599,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 25868, 25907),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25872, 25911),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2760),
+            id: DeclarationId(2761),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -84582,10 +84618,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26765, 26786),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26769, 26790),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2761),
+            id: DeclarationId(2762),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -84601,10 +84637,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26791, 26822),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26795, 26826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2762),
+            id: DeclarationId(2763),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -84621,10 +84657,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 26866, 26882),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26870, 26886),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2763),
+            id: DeclarationId(2764),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -84641,10 +84677,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 27138, 27161),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27142, 27165),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2764),
+            id: DeclarationId(2765),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -84664,7 +84700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 7221, 7252),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2765),
+            id: DeclarationId(2766),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -84684,7 +84720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/workflows.dag", 992, 1006),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2766),
+            id: DeclarationId(2767),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84698,7 +84734,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 532, 547),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2767),
+            id: DeclarationId(2768),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84712,7 +84748,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 550, 561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2768),
+            id: DeclarationId(2769),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84726,7 +84762,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 564, 576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2769),
+            id: DeclarationId(2770),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -84745,7 +84781,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2770),
+            id: DeclarationId(2771),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84759,7 +84795,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6428, 6446),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2771),
+            id: DeclarationId(2772),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84773,7 +84809,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6451, 6466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2772),
+            id: DeclarationId(2773),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84787,7 +84823,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6495, 6518),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2773),
+            id: DeclarationId(2774),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84801,7 +84837,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6523, 6544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2774),
+            id: DeclarationId(2775),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84815,7 +84851,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6549, 6564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2775),
+            id: DeclarationId(2776),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84829,7 +84865,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8177, 8187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2776),
+            id: DeclarationId(2777),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84843,7 +84879,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8192, 8203),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2777),
+            id: DeclarationId(2778),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84857,7 +84893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8208, 8221),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2778),
+            id: DeclarationId(2779),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84871,7 +84907,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8226, 8239),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2779),
+            id: DeclarationId(2780),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84885,7 +84921,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8244, 8257),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2780),
+            id: DeclarationId(2781),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84899,7 +84935,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8262, 8276),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2781),
+            id: DeclarationId(2782),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84913,7 +84949,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8281, 8296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2782),
+            id: DeclarationId(2783),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84927,7 +84963,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9038, 9055),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2783),
+            id: DeclarationId(2784),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84941,7 +84977,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9060, 9070),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2784),
+            id: DeclarationId(2785),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -84955,7 +84991,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9075, 9079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2785),
+            id: DeclarationId(2786),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -84965,11 +85001,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1722),
+                        ty: DeclarationId(1723),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(1724),
+                        ty: DeclarationId(1725),
                     },
                     Field {
                         label: "range_min_inclusive".to_string(),
@@ -84985,7 +85021,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "overflow".to_string(),
-                        ty: DeclarationId(1725),
+                        ty: DeclarationId(1726),
                     },
                 ],
             },
@@ -85000,7 +85036,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9857, 10429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2786),
+            id: DeclarationId(2787),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -85010,11 +85046,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1723),
+                        ty: DeclarationId(1724),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(1724),
+                        ty: DeclarationId(1725),
                     },
                     Field {
                         label: "is_copy".to_string(),
@@ -85033,13 +85069,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10434, 10616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2787),
+            id: DeclarationId(2788),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1726),
+                    value: DeclarationId(1727),
                 }],
             },
             type_params: vec![],
@@ -85053,7 +85089,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10965, 10984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2788),
+            id: DeclarationId(2789),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85067,7 +85103,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4233, 4241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2789),
+            id: DeclarationId(2790),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -85086,7 +85122,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4246, 4277),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2790),
+            id: DeclarationId(2791),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -85106,12 +85142,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4299, 4319),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2791),
+            id: DeclarationId(2792),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "values".to_string(),
-                    ty: DeclarationId(2790),
+                    ty: DeclarationId(2791),
                 }],
             },
             type_params: vec![],
@@ -85125,7 +85161,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4282, 4321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2792),
+            id: DeclarationId(2793),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -85150,7 +85186,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4326, 4379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2793),
+            id: DeclarationId(2794),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -85175,7 +85211,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4384, 4433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2794),
+            id: DeclarationId(2795),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85189,7 +85225,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 847, 851),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2795),
+            id: DeclarationId(2796),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85203,7 +85239,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 854, 857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2796),
+            id: DeclarationId(2797),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85217,13 +85253,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 860, 872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2797),
+            id: DeclarationId(2798),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1738),
+                    value: DeclarationId(1739),
                 }],
             },
             type_params: vec![],
@@ -85237,7 +85273,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1242, 1259),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2798),
+            id: DeclarationId(2799),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -85256,7 +85292,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2799),
+            id: DeclarationId(2800),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85270,7 +85306,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1309, 1318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2800),
+            id: DeclarationId(2801),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85284,7 +85320,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1323, 1332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2801),
+            id: DeclarationId(2802),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85298,7 +85334,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1337, 1350),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2802),
+            id: DeclarationId(2803),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85312,7 +85348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1355, 1367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2803),
+            id: DeclarationId(2804),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85326,7 +85362,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1372, 1385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2804),
+            id: DeclarationId(2805),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -85345,7 +85381,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2805),
+            id: DeclarationId(2806),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85359,7 +85395,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1677, 1685),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2806),
+            id: DeclarationId(2807),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85373,7 +85409,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1688, 1697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2807),
+            id: DeclarationId(2808),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85387,13 +85423,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1700, 1709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2808),
+            id: DeclarationId(2809),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1747),
+                    value: DeclarationId(1748),
                 }],
             },
             type_params: vec![],
@@ -85407,11 +85443,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1521, 1542),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2809),
+            id: DeclarationId(2810),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1756),
+                    DeclarationId(1757),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -85426,13 +85462,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2810),
+            id: DeclarationId(2811),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1753),
+                    value: DeclarationId(1754),
                 }],
             },
             type_params: vec![],
@@ -85446,7 +85482,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1583, 1592),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2811),
+            id: DeclarationId(2812),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -85472,11 +85508,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2812),
+            id: DeclarationId(2813),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2811),
+                    DeclarationId(2812),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -85491,11 +85527,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2813),
+            id: DeclarationId(2814),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1745),
+                    DeclarationId(1746),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -85510,7 +85546,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2814),
+            id: DeclarationId(2815),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85524,7 +85560,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1917, 1925),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2815),
+            id: DeclarationId(2816),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85538,7 +85574,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1928, 1937),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2816),
+            id: DeclarationId(2817),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85552,7 +85588,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1940, 1948),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2817),
+            id: DeclarationId(2818),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -85572,7 +85608,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2106, 2118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2818),
+            id: DeclarationId(2819),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -85592,17 +85628,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2127, 2139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2819),
+            id: DeclarationId(2820),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "branches".to_string(),
-                        ty: DeclarationId(2817),
+                        ty: DeclarationId(2818),
                     },
                     Field {
                         label: "paths".to_string(),
-                        ty: DeclarationId(2818),
+                        ty: DeclarationId(2819),
                     },
                 ],
             },
@@ -85617,7 +85653,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2089, 2141),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2820),
+            id: DeclarationId(2821),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -85637,13 +85673,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2170, 2182),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2821),
+            id: DeclarationId(2822),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1748),
+                    value: DeclarationId(1749),
                 }],
             },
             type_params: vec![],
@@ -85657,17 +85693,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2191, 2216),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2822),
+            id: DeclarationId(2823),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "branches".to_string(),
-                        ty: DeclarationId(2820),
+                        ty: DeclarationId(2821),
                     },
                     Field {
                         label: "types".to_string(),
-                        ty: DeclarationId(2821),
+                        ty: DeclarationId(2822),
                     },
                 ],
             },
@@ -85682,12 +85718,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2146, 2218),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2823),
+            id: DeclarationId(2824),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "cron".to_string(),
-                    ty: DeclarationId(1729),
+                    ty: DeclarationId(1730),
                 }],
             },
             type_params: vec![],
@@ -85701,13 +85737,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2223, 2254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2824),
+            id: DeclarationId(2825),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1749),
+                    value: DeclarationId(1750),
                 }],
             },
             type_params: vec![],
@@ -85721,12 +85757,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2286, 2305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2825),
+            id: DeclarationId(2826),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "inputs".to_string(),
-                    ty: DeclarationId(2824),
+                    ty: DeclarationId(2825),
                 }],
             },
             type_params: vec![],
@@ -85740,13 +85776,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2259, 2307),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2826),
+            id: DeclarationId(2827),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1749),
+                    value: DeclarationId(1750),
                 }],
             },
             type_params: vec![],
@@ -85760,12 +85796,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2335, 2354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2827),
+            id: DeclarationId(2828),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "inputs".to_string(),
-                    ty: DeclarationId(2826),
+                    ty: DeclarationId(2827),
                 }],
             },
             type_params: vec![],
@@ -85779,7 +85815,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2312, 2356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2828),
+            id: DeclarationId(2829),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85793,7 +85829,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2387, 2393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2829),
+            id: DeclarationId(2830),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85807,7 +85843,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2398, 2409),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2830),
+            id: DeclarationId(2831),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85821,7 +85857,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2414, 2422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2831),
+            id: DeclarationId(2832),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85835,7 +85871,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2427, 2441),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2832),
+            id: DeclarationId(2833),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85849,7 +85885,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2446, 2452),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2833),
+            id: DeclarationId(2834),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -85868,7 +85904,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2834),
+            id: DeclarationId(2835),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -85887,7 +85923,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2835),
+            id: DeclarationId(2836),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85901,7 +85937,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2603, 2614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2836),
+            id: DeclarationId(2837),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85915,7 +85951,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2617, 2629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2837),
+            id: DeclarationId(2838),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85929,7 +85965,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2632, 2643),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2838),
+            id: DeclarationId(2839),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85943,7 +85979,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2646, 2662),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2839),
+            id: DeclarationId(2840),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85957,7 +85993,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4784, 4793),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2840),
+            id: DeclarationId(2841),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85971,7 +86007,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4796, 4804),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2841),
+            id: DeclarationId(2842),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -85985,7 +86021,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4807, 4820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2842),
+            id: DeclarationId(2843),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86004,13 +86040,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2843),
+            id: DeclarationId(2844),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1759),
+                    value: DeclarationId(1760),
                 }],
             },
             type_params: vec![],
@@ -86024,7 +86060,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5372, 5382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2844),
+            id: DeclarationId(2845),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -86044,7 +86080,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5392, 5404),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2845),
+            id: DeclarationId(2846),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -86070,11 +86106,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2846),
+            id: DeclarationId(2847),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2845),
+                    DeclarationId(2846),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -86089,7 +86125,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2847),
+            id: DeclarationId(2848),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -86115,11 +86151,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2848),
+            id: DeclarationId(2849),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2847),
+                    DeclarationId(2848),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -86134,7 +86170,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2849),
+            id: DeclarationId(2850),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86153,11 +86189,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2850),
+            id: DeclarationId(2851),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1775),
+                    DeclarationId(1776),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -86172,7 +86208,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2851),
+            id: DeclarationId(2852),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86191,11 +86227,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2852),
+            id: DeclarationId(2853),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1756),
+                    DeclarationId(1757),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -86210,7 +86246,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2853),
+            id: DeclarationId(2854),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -86229,7 +86265,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6619, 6655),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2854),
+            id: DeclarationId(2855),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -86248,7 +86284,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6660, 6709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2855),
+            id: DeclarationId(2856),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86262,7 +86298,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7555, 7584),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2856),
+            id: DeclarationId(2857),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -86281,7 +86317,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7589, 7646),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2857),
+            id: DeclarationId(2858),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -86300,11 +86336,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8224, 8259),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2858),
+            id: DeclarationId(2859),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1755),
+                    DeclarationId(1756),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -86319,7 +86355,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2859),
+            id: DeclarationId(2860),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -86329,7 +86365,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "cancel_in_progress".to_string(),
-                        ty: DeclarationId(2858),
+                        ty: DeclarationId(2859),
                     },
                 ],
             },
@@ -86344,11 +86380,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8264, 8453),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2860),
+            id: DeclarationId(2861),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1754),
+                    DeclarationId(1755),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -86363,7 +86399,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2861),
+            id: DeclarationId(2862),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86382,7 +86418,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2862),
+            id: DeclarationId(2863),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -86392,11 +86428,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "cancel_in_progress".to_string(),
-                        ty: DeclarationId(2860),
+                        ty: DeclarationId(2861),
                     },
                     Field {
                         label: "explicit_single".to_string(),
-                        ty: DeclarationId(2861),
+                        ty: DeclarationId(2862),
                     },
                 ],
             },
@@ -86411,12 +86447,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8458, 8845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2863),
+            id: DeclarationId(2864),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "label".to_string(),
-                    ty: DeclarationId(1758),
+                    ty: DeclarationId(1759),
                 }],
             },
             type_params: vec![],
@@ -86430,7 +86466,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10037, 10072),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2864),
+            id: DeclarationId(2865),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -86450,12 +86486,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10098, 10110),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2865),
+            id: DeclarationId(2866),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "labels".to_string(),
-                    ty: DeclarationId(2864),
+                    ty: DeclarationId(2865),
                 }],
             },
             type_params: vec![],
@@ -86469,7 +86505,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10077, 10112),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2866),
+            id: DeclarationId(2867),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -86488,7 +86524,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10201, 10240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2867),
+            id: DeclarationId(2868),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86502,7 +86538,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10263, 10275),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2868),
+            id: DeclarationId(2869),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86516,7 +86552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10280, 10290),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2869),
+            id: DeclarationId(2870),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86530,7 +86566,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10295, 10305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2870),
+            id: DeclarationId(2871),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86544,7 +86580,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10310, 10321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2871),
+            id: DeclarationId(2872),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86558,7 +86594,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10326, 10333),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2872),
+            id: DeclarationId(2873),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86572,7 +86608,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10338, 10351),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2873),
+            id: DeclarationId(2874),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86591,7 +86627,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2874),
+            id: DeclarationId(2875),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86609,202 +86645,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             nominal_opacity: None,
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
-        declarations.push(Declaration {
-            id: DeclarationId(2875),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(137),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(138),
-                        value: DeclarationId(230),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(139),
-                        value: DeclarationId(230),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/actions.dag", 10614, 10633),
-        });
         declarations.push(Declaration {
             id: DeclarationId(2876),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2875),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 10614, 10634),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2877),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 10661, 10668),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2878),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 10690, 10697),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2879),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(93),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 10753, 10757),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2880),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(2873),
-                    },
-                    Field {
-                        label: "id".to_string(),
-                        ty: DeclarationId(2874),
-                    },
-                    Field {
-                        label: "run".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "shell".to_string(),
-                        ty: DeclarationId(1760),
-                    },
-                    Field {
-                        label: "env".to_string(),
-                        ty: DeclarationId(2876),
-                    },
-                    Field {
-                        label: "working_directory".to_string(),
-                        ty: DeclarationId(2877),
-                    },
-                    Field {
-                        label: "if_condition".to_string(),
-                        ty: DeclarationId(2878),
-                    },
-                    Field {
-                        label: "continue_on_error".to_string(),
-                        ty: DeclarationId(128),
-                    },
-                    Field {
-                        label: "timeout_minutes".to_string(),
-                        ty: DeclarationId(2879),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/actions.dag", 10510, 10763),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2881),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 10791, 10798),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2882),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 10810, 10817),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2883),
-            name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
                 arguments: vec![
@@ -86826,14 +86669,207 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10962),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10633),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2877),
+            name: None,
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(2876),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
+            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("dsl/extdeps/github/actions.dag", 10614, 10634),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2878),
+            name: None,
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
+            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("dsl/extdeps/github/actions.dag", 10661, 10668),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2879),
+            name: None,
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
+            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("dsl/extdeps/github/actions.dag", 10690, 10697),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2880),
+            name: None,
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(93),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
+            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("dsl/extdeps/github/actions.dag", 10753, 10757),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2881),
+            name: None,
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "name".to_string(),
+                        ty: DeclarationId(2874),
+                    },
+                    Field {
+                        label: "id".to_string(),
+                        ty: DeclarationId(2875),
+                    },
+                    Field {
+                        label: "run".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "shell".to_string(),
+                        ty: DeclarationId(1761),
+                    },
+                    Field {
+                        label: "env".to_string(),
+                        ty: DeclarationId(2877),
+                    },
+                    Field {
+                        label: "working_directory".to_string(),
+                        ty: DeclarationId(2878),
+                    },
+                    Field {
+                        label: "if_condition".to_string(),
+                        ty: DeclarationId(2879),
+                    },
+                    Field {
+                        label: "continue_on_error".to_string(),
+                        ty: DeclarationId(128),
+                    },
+                    Field {
+                        label: "timeout_minutes".to_string(),
+                        ty: DeclarationId(2880),
+                    },
+                ],
+            },
+            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("dsl/extdeps/github/actions.dag", 10510, 10763),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2882),
+            name: None,
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
+            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("dsl/extdeps/github/actions.dag", 10791, 10798),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2883),
+            name: None,
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
+            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("dsl/extdeps/github/actions.dag", 10810, 10817),
         });
         declarations.push(Declaration {
             id: DeclarationId(2884),
             name: None,
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(137),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(230),
+                    },
+                ],
+            },
+            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("dsl/extdeps/github/actions.dag", 10943, 10962),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2885),
+            name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2883),
+                    DeclarationId(2884),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -86848,7 +86884,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2885),
+            id: DeclarationId(2886),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -86874,11 +86910,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10995),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2886),
+            id: DeclarationId(2887),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2885),
+                    DeclarationId(2886),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -86893,7 +86929,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10996),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2887),
+            id: DeclarationId(2888),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86912,7 +86948,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2888),
+            id: DeclarationId(2889),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -86931,33 +86967,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2889),
+            id: DeclarationId(2890),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(2881),
+                        ty: DeclarationId(2882),
                     },
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(2882),
+                        ty: DeclarationId(2883),
                     },
                     Field {
                         label: "uses".to_string(),
-                        ty: DeclarationId(1761),
+                        ty: DeclarationId(1762),
                     },
                     Field {
                         label: "with".to_string(),
-                        ty: DeclarationId(2884),
+                        ty: DeclarationId(2885),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(2886),
+                        ty: DeclarationId(2887),
                     },
                     Field {
                         label: "if_condition".to_string(),
-                        ty: DeclarationId(2887),
+                        ty: DeclarationId(2888),
                     },
                     Field {
                         label: "continue_on_error".to_string(),
@@ -86965,7 +87001,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "timeout_minutes".to_string(),
-                        ty: DeclarationId(2888),
+                        ty: DeclarationId(2889),
                     },
                 ],
             },
@@ -86980,7 +87016,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10768, 11091),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2890),
+            id: DeclarationId(2891),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -86994,7 +87030,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11110, 11114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2891),
+            id: DeclarationId(2892),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87008,7 +87044,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11117, 11119),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2892),
+            id: DeclarationId(2893),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87022,7 +87058,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11122, 11126),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2893),
+            id: DeclarationId(2894),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87036,7 +87072,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11129, 11135),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2894),
+            id: DeclarationId(2895),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87050,7 +87086,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11138, 11141),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2895),
+            id: DeclarationId(2896),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87069,7 +87105,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2896),
+            id: DeclarationId(2897),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87088,7 +87124,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2897),
+            id: DeclarationId(2898),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87107,7 +87143,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11530, 11534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2898),
+            id: DeclarationId(2899),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -87117,15 +87153,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "file".to_string(),
-                        ty: DeclarationId(2895),
+                        ty: DeclarationId(2896),
                     },
                     Field {
                         label: "line".to_string(),
-                        ty: DeclarationId(2896),
+                        ty: DeclarationId(2897),
                     },
                     Field {
                         label: "col".to_string(),
-                        ty: DeclarationId(2897),
+                        ty: DeclarationId(2898),
                     },
                 ],
             },
@@ -87140,7 +87176,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11463, 11536),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2899),
+            id: DeclarationId(2900),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87159,7 +87195,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11584, 11591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2900),
+            id: DeclarationId(2901),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87178,7 +87214,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2901),
+            id: DeclarationId(2902),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87197,7 +87233,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11610, 11614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2902),
+            id: DeclarationId(2903),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -87207,15 +87243,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "file".to_string(),
-                        ty: DeclarationId(2899),
+                        ty: DeclarationId(2900),
                     },
                     Field {
                         label: "line".to_string(),
-                        ty: DeclarationId(2900),
+                        ty: DeclarationId(2901),
                     },
                     Field {
                         label: "col".to_string(),
-                        ty: DeclarationId(2901),
+                        ty: DeclarationId(2902),
                     },
                 ],
             },
@@ -87230,7 +87266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11541, 11616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2903),
+            id: DeclarationId(2904),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87249,7 +87285,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11663, 11670),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2904),
+            id: DeclarationId(2905),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87268,7 +87304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11678, 11682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2905),
+            id: DeclarationId(2906),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87287,7 +87323,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11689, 11693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2906),
+            id: DeclarationId(2907),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -87297,15 +87333,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "file".to_string(),
-                        ty: DeclarationId(2903),
+                        ty: DeclarationId(2904),
                     },
                     Field {
                         label: "line".to_string(),
-                        ty: DeclarationId(2904),
+                        ty: DeclarationId(2905),
                     },
                     Field {
                         label: "col".to_string(),
-                        ty: DeclarationId(2905),
+                        ty: DeclarationId(2906),
                     },
                 ],
             },
@@ -87320,7 +87356,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11621, 11695),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2907),
+            id: DeclarationId(2908),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87339,7 +87375,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11700, 11733),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2908),
+            id: DeclarationId(2909),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87353,7 +87389,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11738, 11756),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2909),
+            id: DeclarationId(2910),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -87378,7 +87414,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11761, 11802),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2910),
+            id: DeclarationId(2911),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87397,7 +87433,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11807, 11832),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2911),
+            id: DeclarationId(2912),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87416,7 +87452,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11837, 11867),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2912),
+            id: DeclarationId(2913),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87435,7 +87471,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12673, 12677),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2913),
+            id: DeclarationId(2914),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -87449,11 +87485,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "retention_days".to_string(),
-                        ty: DeclarationId(2912),
+                        ty: DeclarationId(2913),
                     },
                     Field {
                         label: "if_no_files_found".to_string(),
-                        ty: DeclarationId(1772),
+                        ty: DeclarationId(1773),
                     },
                 ],
             },
@@ -87468,7 +87504,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12620, 12720),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2914),
+            id: DeclarationId(2915),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87487,7 +87523,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12756, 12763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2915),
+            id: DeclarationId(2916),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -87497,7 +87533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(2914),
+                        ty: DeclarationId(2915),
                     },
                 ],
             },
@@ -87512,7 +87548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12725, 12765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2916),
+            id: DeclarationId(2917),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87526,7 +87562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12795, 12799),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2917),
+            id: DeclarationId(2918),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87540,7 +87576,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12802, 12810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2918),
+            id: DeclarationId(2919),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87554,7 +87590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12813, 12819),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2919),
+            id: DeclarationId(2920),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -87574,7 +87610,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13281, 13293),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2920),
+            id: DeclarationId(2921),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -87585,7 +87621,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(139),
-                        value: DeclarationId(2919),
+                        value: DeclarationId(2920),
                     },
                 ],
             },
@@ -87600,7 +87636,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13269, 13294),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2921),
+            id: DeclarationId(2922),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -87626,13 +87662,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13311, 13330),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2922),
+            id: DeclarationId(2923),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2921),
+                    value: DeclarationId(2922),
                 }],
             },
             type_params: vec![],
@@ -87646,7 +87682,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13306, 13331),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2923),
+            id: DeclarationId(2924),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -87672,13 +87708,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13348, 13367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2924),
+            id: DeclarationId(2925),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2923),
+                    value: DeclarationId(2924),
                 }],
             },
             type_params: vec![],
@@ -87692,7 +87728,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13343, 13368),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2925),
+            id: DeclarationId(2926),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -87711,7 +87747,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13403, 13407),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2926),
+            id: DeclarationId(2927),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87725,7 +87761,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13563, 13570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2927),
+            id: DeclarationId(2928),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87739,7 +87775,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13575, 13582),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2928),
+            id: DeclarationId(2929),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87753,7 +87789,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13587, 13596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2929),
+            id: DeclarationId(2930),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87767,7 +87803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13601, 13608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2930),
+            id: DeclarationId(2931),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87781,7 +87817,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13613, 13621),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2931),
+            id: DeclarationId(2932),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87795,7 +87831,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13626, 13640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2932),
+            id: DeclarationId(2933),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87809,7 +87845,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1935, 1959),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2933),
+            id: DeclarationId(2934),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87823,7 +87859,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1964, 1989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2934),
+            id: DeclarationId(2935),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(151)],
@@ -87841,7 +87877,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2673, 2714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2935),
+            id: DeclarationId(2936),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87860,7 +87896,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2936),
+            id: DeclarationId(2937),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87874,17 +87910,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2937),
+            id: DeclarationId(2938),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2935),
+                        ty: DeclarationId(2936),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2936),
+                        ty: DeclarationId(2937),
                     },
                 ],
             },
@@ -87899,7 +87935,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2938),
+            id: DeclarationId(2939),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87918,7 +87954,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2939),
+            id: DeclarationId(2940),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87932,17 +87968,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2940),
+            id: DeclarationId(2941),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2938),
+                        ty: DeclarationId(2939),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2939),
+                        ty: DeclarationId(2940),
                     },
                 ],
             },
@@ -87957,7 +87993,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2941),
+            id: DeclarationId(2942),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -87976,7 +88012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2942),
+            id: DeclarationId(2943),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -87990,17 +88026,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2943),
+            id: DeclarationId(2944),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2941),
+                        ty: DeclarationId(2942),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2942),
+                        ty: DeclarationId(2943),
                     },
                 ],
             },
@@ -88015,7 +88051,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2944),
+            id: DeclarationId(2945),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88034,7 +88070,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2945),
+            id: DeclarationId(2946),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88048,17 +88084,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2946),
+            id: DeclarationId(2947),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2944),
+                        ty: DeclarationId(2945),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2945),
+                        ty: DeclarationId(2946),
                     },
                 ],
             },
@@ -88073,7 +88109,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2947),
+            id: DeclarationId(2948),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88092,7 +88128,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2948),
+            id: DeclarationId(2949),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88106,17 +88142,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2949),
+            id: DeclarationId(2950),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2947),
+                        ty: DeclarationId(2948),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2948),
+                        ty: DeclarationId(2949),
                     },
                 ],
             },
@@ -88131,7 +88167,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2950),
+            id: DeclarationId(2951),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88150,7 +88186,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2951),
+            id: DeclarationId(2952),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88164,17 +88200,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2952),
+            id: DeclarationId(2953),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2950),
+                        ty: DeclarationId(2951),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2951),
+                        ty: DeclarationId(2952),
                     },
                 ],
             },
@@ -88189,7 +88225,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2953),
+            id: DeclarationId(2954),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88208,7 +88244,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2954),
+            id: DeclarationId(2955),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88222,17 +88258,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2955),
+            id: DeclarationId(2956),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2953),
+                        ty: DeclarationId(2954),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2954),
+                        ty: DeclarationId(2955),
                     },
                 ],
             },
@@ -88247,7 +88283,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2956),
+            id: DeclarationId(2957),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88266,7 +88302,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 3781, 3785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2957),
+            id: DeclarationId(2958),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88280,17 +88316,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 3781, 3785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2958),
+            id: DeclarationId(2959),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2956),
+                        ty: DeclarationId(2957),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2957),
+                        ty: DeclarationId(2958),
                     },
                 ],
             },
@@ -88305,7 +88341,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 3781, 3785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2959),
+            id: DeclarationId(2960),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88324,7 +88360,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 4264, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2960),
+            id: DeclarationId(2961),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88338,17 +88374,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 4264, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2961),
+            id: DeclarationId(2962),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2959),
+                        ty: DeclarationId(2960),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2960),
+                        ty: DeclarationId(2961),
                     },
                 ],
             },
@@ -88363,7 +88399,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 4264, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2962),
+            id: DeclarationId(2963),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88382,7 +88418,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 6172, 6179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2963),
+            id: DeclarationId(2964),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88396,17 +88432,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 6172, 6179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2964),
+            id: DeclarationId(2965),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2962),
+                        ty: DeclarationId(2963),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2963),
+                        ty: DeclarationId(2964),
                     },
                 ],
             },
@@ -88421,7 +88457,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 6172, 6179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2965),
+            id: DeclarationId(2966),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88440,7 +88476,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16964, 16984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2966),
+            id: DeclarationId(2967),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88454,17 +88490,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16964, 16984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2967),
+            id: DeclarationId(2968),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2965),
+                        ty: DeclarationId(2966),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2966),
+                        ty: DeclarationId(2967),
                     },
                 ],
             },
@@ -88479,7 +88515,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 16964, 16984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2968),
+            id: DeclarationId(2969),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88498,7 +88534,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17620, 17627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2969),
+            id: DeclarationId(2970),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88512,17 +88548,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17620, 17627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2970),
+            id: DeclarationId(2971),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2968),
+                        ty: DeclarationId(2969),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2969),
+                        ty: DeclarationId(2970),
                     },
                 ],
             },
@@ -88537,7 +88573,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 17620, 17627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2971),
+            id: DeclarationId(2972),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88556,7 +88592,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21380, 21390),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2972),
+            id: DeclarationId(2973),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88570,17 +88606,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21380, 21390),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2973),
+            id: DeclarationId(2974),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2971),
+                        ty: DeclarationId(2972),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2972),
+                        ty: DeclarationId(2973),
                     },
                 ],
             },
@@ -88595,7 +88631,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21380, 21390),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2974),
+            id: DeclarationId(2975),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88614,7 +88650,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21515, 21522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2975),
+            id: DeclarationId(2976),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88628,17 +88664,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21515, 21522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2976),
+            id: DeclarationId(2977),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2974),
+                        ty: DeclarationId(2975),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2975),
+                        ty: DeclarationId(2976),
                     },
                 ],
             },
@@ -88653,7 +88689,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21515, 21522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2977),
+            id: DeclarationId(2978),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88672,7 +88708,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21589, 21593),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2978),
+            id: DeclarationId(2979),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88686,17 +88722,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21589, 21593),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2979),
+            id: DeclarationId(2980),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2977),
+                        ty: DeclarationId(2978),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2978),
+                        ty: DeclarationId(2979),
                     },
                 ],
             },
@@ -88711,7 +88747,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 21589, 21593),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2980),
+            id: DeclarationId(2981),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88730,7 +88766,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23360, 23367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2981),
+            id: DeclarationId(2982),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88744,17 +88780,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23360, 23367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2982),
+            id: DeclarationId(2983),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2980),
+                        ty: DeclarationId(2981),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2981),
+                        ty: DeclarationId(2982),
                     },
                 ],
             },
@@ -88769,7 +88805,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23360, 23367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2983),
+            id: DeclarationId(2984),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88788,7 +88824,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23872, 23879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2984),
+            id: DeclarationId(2985),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88802,17 +88838,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23872, 23879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2985),
+            id: DeclarationId(2986),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2983),
+                        ty: DeclarationId(2984),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2984),
+                        ty: DeclarationId(2985),
                     },
                 ],
             },
@@ -88827,7 +88863,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23872, 23879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2986),
+            id: DeclarationId(2987),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88846,7 +88882,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23966, 23973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2987),
+            id: DeclarationId(2988),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88860,17 +88896,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23966, 23973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2988),
+            id: DeclarationId(2989),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2986),
+                        ty: DeclarationId(2987),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2987),
+                        ty: DeclarationId(2988),
                     },
                 ],
             },
@@ -88885,7 +88921,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 23966, 23973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2989),
+            id: DeclarationId(2990),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88904,7 +88940,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24196, 24211),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2990),
+            id: DeclarationId(2991),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88918,17 +88954,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24196, 24211),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2991),
+            id: DeclarationId(2992),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2989),
+                        ty: DeclarationId(2990),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2990),
+                        ty: DeclarationId(2991),
                     },
                 ],
             },
@@ -88943,7 +88979,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24196, 24211),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2992),
+            id: DeclarationId(2993),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -88962,7 +88998,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24222, 24235),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2993),
+            id: DeclarationId(2994),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -88976,17 +89012,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24222, 24235),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2994),
+            id: DeclarationId(2995),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2992),
+                        ty: DeclarationId(2993),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2993),
+                        ty: DeclarationId(2994),
                     },
                 ],
             },
@@ -89001,7 +89037,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24222, 24235),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2995),
+            id: DeclarationId(2996),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89020,7 +89056,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24251, 24264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2996),
+            id: DeclarationId(2997),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89034,17 +89070,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24251, 24264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2997),
+            id: DeclarationId(2998),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2995),
+                        ty: DeclarationId(2996),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2996),
+                        ty: DeclarationId(2997),
                     },
                 ],
             },
@@ -89059,7 +89095,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24251, 24264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2998),
+            id: DeclarationId(2999),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89078,7 +89114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24374, 24381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2999),
+            id: DeclarationId(3000),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89092,17 +89128,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24374, 24381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3000),
+            id: DeclarationId(3001),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2998),
+                        ty: DeclarationId(2999),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2999),
+                        ty: DeclarationId(3000),
                     },
                 ],
             },
@@ -89117,7 +89153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/std/types.dag", 24374, 24381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3001),
+            id: DeclarationId(3002),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89136,7 +89172,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3002),
+            id: DeclarationId(3003),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89150,17 +89186,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3003),
+            id: DeclarationId(3004),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3001),
+                        ty: DeclarationId(3002),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3002),
+                        ty: DeclarationId(3003),
                     },
                 ],
             },
@@ -89175,12 +89211,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3004),
+            id: DeclarationId(3005),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1826),
+                    ty: DeclarationId(1827),
                 }],
             },
             type_params: vec![],
@@ -89191,10 +89227,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3005),
+            id: DeclarationId(3006),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89205,20 +89241,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3006),
+            id: DeclarationId(3007),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3004),
+                        ty: DeclarationId(3005),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3005),
+                        ty: DeclarationId(3006),
                     },
                 ],
             },
@@ -89230,15 +89266,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3007),
+            id: DeclarationId(3008),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1829),
+                    ty: DeclarationId(1830),
                 }],
             },
             type_params: vec![],
@@ -89249,10 +89285,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3008),
+            id: DeclarationId(3009),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89263,20 +89299,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3009),
+            id: DeclarationId(3010),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3007),
+                        ty: DeclarationId(3008),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3008),
+                        ty: DeclarationId(3009),
                     },
                 ],
             },
@@ -89288,10 +89324,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3010),
+            id: DeclarationId(3011),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89307,10 +89343,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706),
+            span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3011),
+            id: DeclarationId(3012),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89321,20 +89357,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706),
+            span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3012),
+            id: DeclarationId(3013),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3010),
+                        ty: DeclarationId(3011),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3011),
+                        ty: DeclarationId(3012),
                     },
                 ],
             },
@@ -89346,10 +89382,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706),
+            span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3013),
+            id: DeclarationId(3014),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89365,10 +89401,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3014),
+            id: DeclarationId(3015),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89379,20 +89415,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3015),
+            id: DeclarationId(3016),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3013),
+                        ty: DeclarationId(3014),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3014),
+                        ty: DeclarationId(3015),
                     },
                 ],
             },
@@ -89404,10 +89440,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3016),
+            id: DeclarationId(3017),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89423,10 +89459,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30660, 30667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3017),
+            id: DeclarationId(3018),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89437,20 +89473,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30660, 30667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3018),
+            id: DeclarationId(3019),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3016),
+                        ty: DeclarationId(3017),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3017),
+                        ty: DeclarationId(3018),
                     },
                 ],
             },
@@ -89462,10 +89498,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30660, 30667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3019),
+            id: DeclarationId(3020),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89484,7 +89520,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3020),
+            id: DeclarationId(3021),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89498,17 +89534,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3021),
+            id: DeclarationId(3022),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3019),
+                        ty: DeclarationId(3020),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3020),
+                        ty: DeclarationId(3021),
                     },
                 ],
             },
@@ -89523,7 +89559,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3022),
+            id: DeclarationId(3023),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89542,7 +89578,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3023),
+            id: DeclarationId(3024),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89556,17 +89592,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3024),
+            id: DeclarationId(3025),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3022),
+                        ty: DeclarationId(3023),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3023),
+                        ty: DeclarationId(3024),
                     },
                 ],
             },
@@ -89581,7 +89617,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3025),
+            id: DeclarationId(3026),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89600,7 +89636,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3026),
+            id: DeclarationId(3027),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89614,17 +89650,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3027),
+            id: DeclarationId(3028),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3025),
+                        ty: DeclarationId(3026),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3026),
+                        ty: DeclarationId(3027),
                     },
                 ],
             },
@@ -89639,7 +89675,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3028),
+            id: DeclarationId(3029),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89658,7 +89694,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3029),
+            id: DeclarationId(3030),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89672,17 +89708,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3030),
+            id: DeclarationId(3031),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3028),
+                        ty: DeclarationId(3029),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3029),
+                        ty: DeclarationId(3030),
                     },
                 ],
             },
@@ -89697,7 +89733,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3031),
+            id: DeclarationId(3032),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89716,7 +89752,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3032),
+            id: DeclarationId(3033),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89730,17 +89766,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3033),
+            id: DeclarationId(3034),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3031),
+                        ty: DeclarationId(3032),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3032),
+                        ty: DeclarationId(3033),
                     },
                 ],
             },
@@ -89755,7 +89791,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3034),
+            id: DeclarationId(3035),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89774,7 +89810,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3035),
+            id: DeclarationId(3036),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89788,17 +89824,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3036),
+            id: DeclarationId(3037),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3034),
+                        ty: DeclarationId(3035),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3035),
+                        ty: DeclarationId(3036),
                     },
                 ],
             },
@@ -89813,7 +89849,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3037),
+            id: DeclarationId(3038),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89832,7 +89868,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3038),
+            id: DeclarationId(3039),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89846,17 +89882,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3039),
+            id: DeclarationId(3040),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3037),
+                        ty: DeclarationId(3038),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3038),
+                        ty: DeclarationId(3039),
                     },
                 ],
             },
@@ -89871,7 +89907,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3040),
+            id: DeclarationId(3041),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89890,7 +89926,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3041),
+            id: DeclarationId(3042),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89904,17 +89940,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3042),
+            id: DeclarationId(3043),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3040),
+                        ty: DeclarationId(3041),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3041),
+                        ty: DeclarationId(3042),
                     },
                 ],
             },
@@ -89929,7 +89965,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3043),
+            id: DeclarationId(3044),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -89948,7 +89984,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3044),
+            id: DeclarationId(3045),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -89962,17 +89998,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3045),
+            id: DeclarationId(3046),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3043),
+                        ty: DeclarationId(3044),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3044),
+                        ty: DeclarationId(3045),
                     },
                 ],
             },
@@ -89987,7 +90023,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3046),
+            id: DeclarationId(3047),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90006,7 +90042,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3047),
+            id: DeclarationId(3048),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90020,17 +90056,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3048),
+            id: DeclarationId(3049),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3046),
+                        ty: DeclarationId(3047),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3047),
+                        ty: DeclarationId(3048),
                     },
                 ],
             },
@@ -90045,7 +90081,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3049),
+            id: DeclarationId(3050),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90064,7 +90100,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3050),
+            id: DeclarationId(3051),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90078,17 +90114,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3051),
+            id: DeclarationId(3052),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3049),
+                        ty: DeclarationId(3050),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3050),
+                        ty: DeclarationId(3051),
                     },
                 ],
             },
@@ -90103,7 +90139,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3052),
+            id: DeclarationId(3053),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90122,7 +90158,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3053),
+            id: DeclarationId(3054),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90136,17 +90172,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3054),
+            id: DeclarationId(3055),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3052),
+                        ty: DeclarationId(3053),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3053),
+                        ty: DeclarationId(3054),
                     },
                 ],
             },
@@ -90161,7 +90197,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3055),
+            id: DeclarationId(3056),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90180,7 +90216,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3056),
+            id: DeclarationId(3057),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90194,17 +90230,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3057),
+            id: DeclarationId(3058),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3055),
+                        ty: DeclarationId(3056),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3056),
+                        ty: DeclarationId(3057),
                     },
                 ],
             },
@@ -90219,7 +90255,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3058),
+            id: DeclarationId(3059),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90238,7 +90274,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3059),
+            id: DeclarationId(3060),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90252,17 +90288,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3060),
+            id: DeclarationId(3061),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3058),
+                        ty: DeclarationId(3059),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3059),
+                        ty: DeclarationId(3060),
                     },
                 ],
             },
@@ -90277,7 +90313,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3061),
+            id: DeclarationId(3062),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90296,7 +90332,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3062),
+            id: DeclarationId(3063),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90310,17 +90346,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3063),
+            id: DeclarationId(3064),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3061),
+                        ty: DeclarationId(3062),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3062),
+                        ty: DeclarationId(3063),
                     },
                 ],
             },
@@ -90335,7 +90371,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3064),
+            id: DeclarationId(3065),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90354,7 +90390,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3065),
+            id: DeclarationId(3066),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90368,17 +90404,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3066),
+            id: DeclarationId(3067),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3064),
+                        ty: DeclarationId(3065),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3065),
+                        ty: DeclarationId(3066),
                     },
                 ],
             },
@@ -90393,7 +90429,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3067),
+            id: DeclarationId(3068),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90412,7 +90448,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3068),
+            id: DeclarationId(3069),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90426,17 +90462,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3069),
+            id: DeclarationId(3070),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3067),
+                        ty: DeclarationId(3068),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3068),
+                        ty: DeclarationId(3069),
                     },
                 ],
             },
@@ -90451,7 +90487,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3070),
+            id: DeclarationId(3071),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90470,7 +90506,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3071),
+            id: DeclarationId(3072),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90484,17 +90520,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3072),
+            id: DeclarationId(3073),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3070),
+                        ty: DeclarationId(3071),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3071),
+                        ty: DeclarationId(3072),
                     },
                 ],
             },
@@ -90509,7 +90545,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3073),
+            id: DeclarationId(3074),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90528,7 +90564,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3074),
+            id: DeclarationId(3075),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90542,17 +90578,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3075),
+            id: DeclarationId(3076),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3073),
+                        ty: DeclarationId(3074),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3074),
+                        ty: DeclarationId(3075),
                     },
                 ],
             },
@@ -90567,7 +90603,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3076),
+            id: DeclarationId(3077),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90586,7 +90622,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3077),
+            id: DeclarationId(3078),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90600,17 +90636,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3078),
+            id: DeclarationId(3079),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3076),
+                        ty: DeclarationId(3077),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3077),
+                        ty: DeclarationId(3078),
                     },
                 ],
             },
@@ -90625,7 +90661,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3079),
+            id: DeclarationId(3080),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90644,7 +90680,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3080),
+            id: DeclarationId(3081),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90658,17 +90694,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3081),
+            id: DeclarationId(3082),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3079),
+                        ty: DeclarationId(3080),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3080),
+                        ty: DeclarationId(3081),
                     },
                 ],
             },
@@ -90683,7 +90719,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3082),
+            id: DeclarationId(3083),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90702,7 +90738,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3083),
+            id: DeclarationId(3084),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90716,17 +90752,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3084),
+            id: DeclarationId(3085),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3082),
+                        ty: DeclarationId(3083),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3083),
+                        ty: DeclarationId(3084),
                     },
                 ],
             },
@@ -90741,7 +90777,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3085),
+            id: DeclarationId(3086),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90760,7 +90796,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3086),
+            id: DeclarationId(3087),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90774,17 +90810,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3087),
+            id: DeclarationId(3088),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3085),
+                        ty: DeclarationId(3086),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3086),
+                        ty: DeclarationId(3087),
                     },
                 ],
             },
@@ -90799,7 +90835,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3088),
+            id: DeclarationId(3089),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90818,7 +90854,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3089),
+            id: DeclarationId(3090),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90832,17 +90868,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3090),
+            id: DeclarationId(3091),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3088),
+                        ty: DeclarationId(3089),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3089),
+                        ty: DeclarationId(3090),
                     },
                 ],
             },
@@ -90857,7 +90893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3091),
+            id: DeclarationId(3092),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90876,7 +90912,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3092),
+            id: DeclarationId(3093),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90890,17 +90926,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3093),
+            id: DeclarationId(3094),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3091),
+                        ty: DeclarationId(3092),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3092),
+                        ty: DeclarationId(3093),
                     },
                 ],
             },
@@ -90915,7 +90951,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3094),
+            id: DeclarationId(3095),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90934,7 +90970,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3095),
+            id: DeclarationId(3096),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -90948,17 +90984,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3096),
+            id: DeclarationId(3097),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3094),
+                        ty: DeclarationId(3095),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3095),
+                        ty: DeclarationId(3096),
                     },
                 ],
             },
@@ -90973,7 +91009,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3097),
+            id: DeclarationId(3098),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -90992,7 +91028,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3098),
+            id: DeclarationId(3099),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91006,17 +91042,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3099),
+            id: DeclarationId(3100),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3097),
+                        ty: DeclarationId(3098),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3098),
+                        ty: DeclarationId(3099),
                     },
                 ],
             },
@@ -91031,7 +91067,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3100),
+            id: DeclarationId(3101),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91050,7 +91086,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3101),
+            id: DeclarationId(3102),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91064,17 +91100,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3102),
+            id: DeclarationId(3103),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3100),
+                        ty: DeclarationId(3101),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3101),
+                        ty: DeclarationId(3102),
                     },
                 ],
             },
@@ -91089,7 +91125,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3103),
+            id: DeclarationId(3104),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91108,7 +91144,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3104),
+            id: DeclarationId(3105),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91122,17 +91158,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3105),
+            id: DeclarationId(3106),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3103),
+                        ty: DeclarationId(3104),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3104),
+                        ty: DeclarationId(3105),
                     },
                 ],
             },
@@ -91147,7 +91183,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3106),
+            id: DeclarationId(3107),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91166,7 +91202,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3107),
+            id: DeclarationId(3108),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91180,17 +91216,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3108),
+            id: DeclarationId(3109),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3106),
+                        ty: DeclarationId(3107),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3107),
+                        ty: DeclarationId(3108),
                     },
                 ],
             },
@@ -91205,7 +91241,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3109),
+            id: DeclarationId(3110),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91224,7 +91260,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3110),
+            id: DeclarationId(3111),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91238,17 +91274,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3111),
+            id: DeclarationId(3112),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3109),
+                        ty: DeclarationId(3110),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3110),
+                        ty: DeclarationId(3111),
                     },
                 ],
             },
@@ -91263,7 +91299,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3112),
+            id: DeclarationId(3113),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91282,7 +91318,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3113),
+            id: DeclarationId(3114),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91296,17 +91332,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3114),
+            id: DeclarationId(3115),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3112),
+                        ty: DeclarationId(3113),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3113),
+                        ty: DeclarationId(3114),
                     },
                 ],
             },
@@ -91321,7 +91357,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3115),
+            id: DeclarationId(3116),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91340,7 +91376,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3116),
+            id: DeclarationId(3117),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91354,17 +91390,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3117),
+            id: DeclarationId(3118),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3115),
+                        ty: DeclarationId(3116),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3116),
+                        ty: DeclarationId(3117),
                     },
                 ],
             },
@@ -91379,7 +91415,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3118),
+            id: DeclarationId(3119),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91398,7 +91434,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3119),
+            id: DeclarationId(3120),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91412,17 +91448,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3120),
+            id: DeclarationId(3121),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3118),
+                        ty: DeclarationId(3119),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3119),
+                        ty: DeclarationId(3120),
                     },
                 ],
             },
@@ -91437,7 +91473,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3121),
+            id: DeclarationId(3122),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91456,7 +91492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3122),
+            id: DeclarationId(3123),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91470,17 +91506,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3123),
+            id: DeclarationId(3124),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3121),
+                        ty: DeclarationId(3122),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3122),
+                        ty: DeclarationId(3123),
                     },
                 ],
             },
@@ -91495,12 +91531,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3124),
+            id: DeclarationId(3125),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2144),
+                    ty: DeclarationId(2145),
                 }],
             },
             type_params: vec![],
@@ -91514,7 +91550,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3125),
+            id: DeclarationId(3126),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91528,17 +91564,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3126),
+            id: DeclarationId(3127),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3124),
+                        ty: DeclarationId(3125),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3125),
+                        ty: DeclarationId(3126),
                     },
                 ],
             },
@@ -91553,7 +91589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3127),
+            id: DeclarationId(3128),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91572,7 +91608,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3128),
+            id: DeclarationId(3129),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91586,17 +91622,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3129),
+            id: DeclarationId(3130),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3127),
+                        ty: DeclarationId(3128),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3128),
+                        ty: DeclarationId(3129),
                     },
                 ],
             },
@@ -91611,7 +91647,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3130),
+            id: DeclarationId(3131),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91630,7 +91666,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3131),
+            id: DeclarationId(3132),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91644,17 +91680,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3132),
+            id: DeclarationId(3133),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3130),
+                        ty: DeclarationId(3131),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3131),
+                        ty: DeclarationId(3132),
                     },
                 ],
             },
@@ -91669,7 +91705,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3133),
+            id: DeclarationId(3134),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91688,7 +91724,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3134),
+            id: DeclarationId(3135),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91702,17 +91738,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3135),
+            id: DeclarationId(3136),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3133),
+                        ty: DeclarationId(3134),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3134),
+                        ty: DeclarationId(3135),
                     },
                 ],
             },
@@ -91727,7 +91763,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3136),
+            id: DeclarationId(3137),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91746,7 +91782,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3137),
+            id: DeclarationId(3138),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91760,17 +91796,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3138),
+            id: DeclarationId(3139),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3136),
+                        ty: DeclarationId(3137),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3137),
+                        ty: DeclarationId(3138),
                     },
                 ],
             },
@@ -91785,7 +91821,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3139),
+            id: DeclarationId(3140),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91804,7 +91840,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3140),
+            id: DeclarationId(3141),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91818,17 +91854,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3141),
+            id: DeclarationId(3142),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3139),
+                        ty: DeclarationId(3140),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3140),
+                        ty: DeclarationId(3141),
                     },
                 ],
             },
@@ -91843,7 +91879,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3142),
+            id: DeclarationId(3143),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91862,7 +91898,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3143),
+            id: DeclarationId(3144),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91876,17 +91912,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3144),
+            id: DeclarationId(3145),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3142),
+                        ty: DeclarationId(3143),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3143),
+                        ty: DeclarationId(3144),
                     },
                 ],
             },
@@ -91901,7 +91937,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3145),
+            id: DeclarationId(3146),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91920,7 +91956,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3146),
+            id: DeclarationId(3147),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91934,17 +91970,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3147),
+            id: DeclarationId(3148),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3145),
+                        ty: DeclarationId(3146),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3146),
+                        ty: DeclarationId(3147),
                     },
                 ],
             },
@@ -91959,7 +91995,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3148),
+            id: DeclarationId(3149),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -91978,7 +92014,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3149),
+            id: DeclarationId(3150),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -91992,17 +92028,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3150),
+            id: DeclarationId(3151),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3148),
+                        ty: DeclarationId(3149),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3149),
+                        ty: DeclarationId(3150),
                     },
                 ],
             },
@@ -92017,7 +92053,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3151),
+            id: DeclarationId(3152),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92036,7 +92072,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3152),
+            id: DeclarationId(3153),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92050,17 +92086,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3153),
+            id: DeclarationId(3154),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3151),
+                        ty: DeclarationId(3152),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3152),
+                        ty: DeclarationId(3153),
                     },
                 ],
             },
@@ -92075,7 +92111,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3154),
+            id: DeclarationId(3155),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92094,7 +92130,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3155),
+            id: DeclarationId(3156),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92108,17 +92144,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3156),
+            id: DeclarationId(3157),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3154),
+                        ty: DeclarationId(3155),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3155),
+                        ty: DeclarationId(3156),
                     },
                 ],
             },
@@ -92133,7 +92169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3157),
+            id: DeclarationId(3158),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92152,7 +92188,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3158),
+            id: DeclarationId(3159),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92166,17 +92202,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3159),
+            id: DeclarationId(3160),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3157),
+                        ty: DeclarationId(3158),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3158),
+                        ty: DeclarationId(3159),
                     },
                 ],
             },
@@ -92191,7 +92227,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3160),
+            id: DeclarationId(3161),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92210,7 +92246,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3161),
+            id: DeclarationId(3162),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92224,17 +92260,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3162),
+            id: DeclarationId(3163),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3160),
+                        ty: DeclarationId(3161),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3161),
+                        ty: DeclarationId(3162),
                     },
                 ],
             },
@@ -92249,7 +92285,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3163),
+            id: DeclarationId(3164),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92268,7 +92304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3164),
+            id: DeclarationId(3165),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92282,17 +92318,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3165),
+            id: DeclarationId(3166),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3163),
+                        ty: DeclarationId(3164),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3164),
+                        ty: DeclarationId(3165),
                     },
                 ],
             },
@@ -92307,7 +92343,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3166),
+            id: DeclarationId(3167),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92326,7 +92362,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3167),
+            id: DeclarationId(3168),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92340,17 +92376,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3168),
+            id: DeclarationId(3169),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3166),
+                        ty: DeclarationId(3167),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3167),
+                        ty: DeclarationId(3168),
                     },
                 ],
             },
@@ -92365,7 +92401,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3169),
+            id: DeclarationId(3170),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92384,7 +92420,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3170),
+            id: DeclarationId(3171),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92398,17 +92434,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3171),
+            id: DeclarationId(3172),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3169),
+                        ty: DeclarationId(3170),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3170),
+                        ty: DeclarationId(3171),
                     },
                 ],
             },
@@ -92423,7 +92459,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3172),
+            id: DeclarationId(3173),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92442,7 +92478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3173),
+            id: DeclarationId(3174),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92456,17 +92492,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3174),
+            id: DeclarationId(3175),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3172),
+                        ty: DeclarationId(3173),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3173),
+                        ty: DeclarationId(3174),
                     },
                 ],
             },
@@ -92481,7 +92517,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3175),
+            id: DeclarationId(3176),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92500,7 +92536,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3176),
+            id: DeclarationId(3177),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92514,17 +92550,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3177),
+            id: DeclarationId(3178),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3175),
+                        ty: DeclarationId(3176),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3176),
+                        ty: DeclarationId(3177),
                     },
                 ],
             },
@@ -92539,7 +92575,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3178),
+            id: DeclarationId(3179),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92558,7 +92594,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3179),
+            id: DeclarationId(3180),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92572,17 +92608,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3180),
+            id: DeclarationId(3181),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3178),
+                        ty: DeclarationId(3179),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3179),
+                        ty: DeclarationId(3180),
                     },
                 ],
             },
@@ -92597,7 +92633,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3181),
+            id: DeclarationId(3182),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92616,7 +92652,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3182),
+            id: DeclarationId(3183),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92630,17 +92666,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3183),
+            id: DeclarationId(3184),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3181),
+                        ty: DeclarationId(3182),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3182),
+                        ty: DeclarationId(3183),
                     },
                 ],
             },
@@ -92655,7 +92691,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3184),
+            id: DeclarationId(3185),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92674,7 +92710,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3185),
+            id: DeclarationId(3186),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92688,17 +92724,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3186),
+            id: DeclarationId(3187),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3184),
+                        ty: DeclarationId(3185),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3185),
+                        ty: DeclarationId(3186),
                     },
                 ],
             },
@@ -92713,7 +92749,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3187),
+            id: DeclarationId(3188),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92732,7 +92768,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3188),
+            id: DeclarationId(3189),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92746,17 +92782,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3189),
+            id: DeclarationId(3190),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3187),
+                        ty: DeclarationId(3188),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3188),
+                        ty: DeclarationId(3189),
                     },
                 ],
             },
@@ -92771,7 +92807,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3190),
+            id: DeclarationId(3191),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92790,7 +92826,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3191),
+            id: DeclarationId(3192),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92804,17 +92840,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3192),
+            id: DeclarationId(3193),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3190),
+                        ty: DeclarationId(3191),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3191),
+                        ty: DeclarationId(3192),
                     },
                 ],
             },
@@ -92829,7 +92865,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3193),
+            id: DeclarationId(3194),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92848,7 +92884,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3194),
+            id: DeclarationId(3195),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92862,17 +92898,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3195),
+            id: DeclarationId(3196),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3193),
+                        ty: DeclarationId(3194),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3194),
+                        ty: DeclarationId(3195),
                     },
                 ],
             },
@@ -92887,7 +92923,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3196),
+            id: DeclarationId(3197),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92906,7 +92942,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3197),
+            id: DeclarationId(3198),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92920,17 +92956,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3198),
+            id: DeclarationId(3199),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3196),
+                        ty: DeclarationId(3197),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3197),
+                        ty: DeclarationId(3198),
                     },
                 ],
             },
@@ -92945,7 +92981,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3199),
+            id: DeclarationId(3200),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -92964,7 +93000,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9931, 9943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3200),
+            id: DeclarationId(3201),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -92978,17 +93014,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9931, 9943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3201),
+            id: DeclarationId(3202),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3199),
+                        ty: DeclarationId(3200),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3200),
+                        ty: DeclarationId(3201),
                     },
                 ],
             },
@@ -93003,7 +93039,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9931, 9943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3202),
+            id: DeclarationId(3203),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93022,7 +93058,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10408, 10420),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3203),
+            id: DeclarationId(3204),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93036,17 +93072,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10408, 10420),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3204),
+            id: DeclarationId(3205),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3202),
+                        ty: DeclarationId(3203),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3203),
+                        ty: DeclarationId(3204),
                     },
                 ],
             },
@@ -93061,7 +93097,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10408, 10420),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3205),
+            id: DeclarationId(3206),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93080,7 +93116,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10966, 10978),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3206),
+            id: DeclarationId(3207),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93094,17 +93130,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10966, 10978),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3207),
+            id: DeclarationId(3208),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3205),
+                        ty: DeclarationId(3206),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3206),
+                        ty: DeclarationId(3207),
                     },
                 ],
             },
@@ -93119,7 +93155,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10966, 10978),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3208),
+            id: DeclarationId(3209),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93138,7 +93174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 11146, 11158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3209),
+            id: DeclarationId(3210),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93152,17 +93188,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 11146, 11158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3210),
+            id: DeclarationId(3211),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3208),
+                        ty: DeclarationId(3209),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3209),
+                        ty: DeclarationId(3210),
                     },
                 ],
             },
@@ -93177,7 +93213,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 11146, 11158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3211),
+            id: DeclarationId(3212),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93196,7 +93232,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3212),
+            id: DeclarationId(3213),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93210,17 +93246,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3213),
+            id: DeclarationId(3214),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3211),
+                        ty: DeclarationId(3212),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3212),
+                        ty: DeclarationId(3213),
                     },
                 ],
             },
@@ -93235,7 +93271,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3214),
+            id: DeclarationId(3215),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93254,7 +93290,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3215),
+            id: DeclarationId(3216),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93268,17 +93304,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3216),
+            id: DeclarationId(3217),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3214),
+                        ty: DeclarationId(3215),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3215),
+                        ty: DeclarationId(3216),
                     },
                 ],
             },
@@ -93293,7 +93329,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3217),
+            id: DeclarationId(3218),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93312,7 +93348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3218),
+            id: DeclarationId(3219),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93326,17 +93362,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3219),
+            id: DeclarationId(3220),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3217),
+                        ty: DeclarationId(3218),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3218),
+                        ty: DeclarationId(3219),
                     },
                 ],
             },
@@ -93351,7 +93387,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3220),
+            id: DeclarationId(3221),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93370,7 +93406,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3221),
+            id: DeclarationId(3222),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93384,17 +93420,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3222),
+            id: DeclarationId(3223),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3220),
+                        ty: DeclarationId(3221),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3221),
+                        ty: DeclarationId(3222),
                     },
                 ],
             },
@@ -93409,7 +93445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3223),
+            id: DeclarationId(3224),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93428,7 +93464,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3224),
+            id: DeclarationId(3225),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93442,17 +93478,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3225),
+            id: DeclarationId(3226),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3223),
+                        ty: DeclarationId(3224),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3224),
+                        ty: DeclarationId(3225),
                     },
                 ],
             },
@@ -93467,7 +93503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3226),
+            id: DeclarationId(3227),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93486,7 +93522,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3227),
+            id: DeclarationId(3228),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93500,17 +93536,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3228),
+            id: DeclarationId(3229),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3226),
+                        ty: DeclarationId(3227),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3227),
+                        ty: DeclarationId(3228),
                     },
                 ],
             },
@@ -93525,7 +93561,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3229),
+            id: DeclarationId(3230),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93544,7 +93580,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3230),
+            id: DeclarationId(3231),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93558,17 +93594,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3231),
+            id: DeclarationId(3232),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3229),
+                        ty: DeclarationId(3230),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3230),
+                        ty: DeclarationId(3231),
                     },
                 ],
             },
@@ -93583,7 +93619,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3232),
+            id: DeclarationId(3233),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93602,7 +93638,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3233),
+            id: DeclarationId(3234),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93616,17 +93652,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3234),
+            id: DeclarationId(3235),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3232),
+                        ty: DeclarationId(3233),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3233),
+                        ty: DeclarationId(3234),
                     },
                 ],
             },
@@ -93641,12 +93677,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3235),
+            id: DeclarationId(3236),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1756),
+                    ty: DeclarationId(1757),
                 }],
             },
             type_params: vec![],
@@ -93660,7 +93696,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3236),
+            id: DeclarationId(3237),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93674,17 +93710,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3237),
+            id: DeclarationId(3238),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3235),
+                        ty: DeclarationId(3236),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3236),
+                        ty: DeclarationId(3237),
                     },
                 ],
             },
@@ -93699,12 +93735,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3238),
+            id: DeclarationId(3239),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2811),
+                    ty: DeclarationId(2812),
                 }],
             },
             type_params: vec![],
@@ -93718,7 +93754,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3239),
+            id: DeclarationId(3240),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93732,17 +93768,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3240),
+            id: DeclarationId(3241),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3238),
+                        ty: DeclarationId(3239),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3239),
+                        ty: DeclarationId(3240),
                     },
                 ],
             },
@@ -93757,12 +93793,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3241),
+            id: DeclarationId(3242),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1745),
+                    ty: DeclarationId(1746),
                 }],
             },
             type_params: vec![],
@@ -93776,7 +93812,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3242),
+            id: DeclarationId(3243),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93790,17 +93826,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3243),
+            id: DeclarationId(3244),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3241),
+                        ty: DeclarationId(3242),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3242),
+                        ty: DeclarationId(3243),
                     },
                 ],
             },
@@ -93815,7 +93851,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3244),
+            id: DeclarationId(3245),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93834,7 +93870,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3245),
+            id: DeclarationId(3246),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93848,17 +93884,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3246),
+            id: DeclarationId(3247),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3244),
+                        ty: DeclarationId(3245),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3245),
+                        ty: DeclarationId(3246),
                     },
                 ],
             },
@@ -93873,7 +93909,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3247),
+            id: DeclarationId(3248),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93892,7 +93928,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3248),
+            id: DeclarationId(3249),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93906,17 +93942,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3249),
+            id: DeclarationId(3250),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3247),
+                        ty: DeclarationId(3248),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3248),
+                        ty: DeclarationId(3249),
                     },
                 ],
             },
@@ -93931,7 +93967,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3250),
+            id: DeclarationId(3251),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -93950,7 +93986,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3251),
+            id: DeclarationId(3252),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -93964,17 +94000,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3252),
+            id: DeclarationId(3253),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3250),
+                        ty: DeclarationId(3251),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3251),
+                        ty: DeclarationId(3252),
                     },
                 ],
             },
@@ -93989,12 +94025,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3253),
+            id: DeclarationId(3254),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2845),
+                    ty: DeclarationId(2846),
                 }],
             },
             type_params: vec![],
@@ -94008,7 +94044,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3254),
+            id: DeclarationId(3255),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94022,17 +94058,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3255),
+            id: DeclarationId(3256),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3253),
+                        ty: DeclarationId(3254),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3254),
+                        ty: DeclarationId(3255),
                     },
                 ],
             },
@@ -94047,12 +94083,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3256),
+            id: DeclarationId(3257),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2847),
+                    ty: DeclarationId(2848),
                 }],
             },
             type_params: vec![],
@@ -94066,7 +94102,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3257),
+            id: DeclarationId(3258),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94080,17 +94116,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3258),
+            id: DeclarationId(3259),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3256),
+                        ty: DeclarationId(3257),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3257),
+                        ty: DeclarationId(3258),
                     },
                 ],
             },
@@ -94105,7 +94141,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3259),
+            id: DeclarationId(3260),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94124,7 +94160,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3260),
+            id: DeclarationId(3261),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94138,17 +94174,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3261),
+            id: DeclarationId(3262),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3259),
+                        ty: DeclarationId(3260),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3260),
+                        ty: DeclarationId(3261),
                     },
                 ],
             },
@@ -94163,12 +94199,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3262),
+            id: DeclarationId(3263),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1775),
+                    ty: DeclarationId(1776),
                 }],
             },
             type_params: vec![],
@@ -94182,7 +94218,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3263),
+            id: DeclarationId(3264),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94196,17 +94232,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3264),
+            id: DeclarationId(3265),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3262),
+                        ty: DeclarationId(3263),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3263),
+                        ty: DeclarationId(3264),
                     },
                 ],
             },
@@ -94221,7 +94257,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3265),
+            id: DeclarationId(3266),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94240,7 +94276,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3266),
+            id: DeclarationId(3267),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94254,17 +94290,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3267),
+            id: DeclarationId(3268),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3265),
+                        ty: DeclarationId(3266),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3266),
+                        ty: DeclarationId(3267),
                     },
                 ],
             },
@@ -94279,12 +94315,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3268),
+            id: DeclarationId(3269),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1756),
+                    ty: DeclarationId(1757),
                 }],
             },
             type_params: vec![],
@@ -94298,7 +94334,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3269),
+            id: DeclarationId(3270),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94312,17 +94348,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3270),
+            id: DeclarationId(3271),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3268),
+                        ty: DeclarationId(3269),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3269),
+                        ty: DeclarationId(3270),
                     },
                 ],
             },
@@ -94337,12 +94373,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3271),
+            id: DeclarationId(3272),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1755),
+                    ty: DeclarationId(1756),
                 }],
             },
             type_params: vec![],
@@ -94356,7 +94392,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3272),
+            id: DeclarationId(3273),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94370,17 +94406,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3273),
+            id: DeclarationId(3274),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3271),
+                        ty: DeclarationId(3272),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3272),
+                        ty: DeclarationId(3273),
                     },
                 ],
             },
@@ -94395,12 +94431,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3274),
+            id: DeclarationId(3275),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1754),
+                    ty: DeclarationId(1755),
                 }],
             },
             type_params: vec![],
@@ -94414,7 +94450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3275),
+            id: DeclarationId(3276),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94428,17 +94464,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3276),
+            id: DeclarationId(3277),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3274),
+                        ty: DeclarationId(3275),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3275),
+                        ty: DeclarationId(3276),
                     },
                 ],
             },
@@ -94453,7 +94489,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3277),
+            id: DeclarationId(3278),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94472,7 +94508,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3278),
+            id: DeclarationId(3279),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94486,17 +94522,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3279),
+            id: DeclarationId(3280),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3277),
+                        ty: DeclarationId(3278),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3278),
+                        ty: DeclarationId(3279),
                     },
                 ],
             },
@@ -94511,7 +94547,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3280),
+            id: DeclarationId(3281),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94530,7 +94566,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3281),
+            id: DeclarationId(3282),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94544,17 +94580,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3282),
+            id: DeclarationId(3283),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3280),
+                        ty: DeclarationId(3281),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3281),
+                        ty: DeclarationId(3282),
                     },
                 ],
             },
@@ -94569,7 +94605,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3283),
+            id: DeclarationId(3284),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94588,7 +94624,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3284),
+            id: DeclarationId(3285),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94602,17 +94638,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3285),
+            id: DeclarationId(3286),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3283),
+                        ty: DeclarationId(3284),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3284),
+                        ty: DeclarationId(3285),
                     },
                 ],
             },
@@ -94627,12 +94663,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3286),
+            id: DeclarationId(3287),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2875),
+                    ty: DeclarationId(2876),
                 }],
             },
             type_params: vec![],
@@ -94646,7 +94682,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3287),
+            id: DeclarationId(3288),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94660,17 +94696,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3288),
+            id: DeclarationId(3289),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3286),
+                        ty: DeclarationId(3287),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3287),
+                        ty: DeclarationId(3288),
                     },
                 ],
             },
@@ -94685,7 +94721,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3289),
+            id: DeclarationId(3290),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94704,7 +94740,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3290),
+            id: DeclarationId(3291),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94718,17 +94754,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3291),
+            id: DeclarationId(3292),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3289),
+                        ty: DeclarationId(3290),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3290),
+                        ty: DeclarationId(3291),
                     },
                 ],
             },
@@ -94743,7 +94779,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3292),
+            id: DeclarationId(3293),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94762,7 +94798,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3293),
+            id: DeclarationId(3294),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94776,17 +94812,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3294),
+            id: DeclarationId(3295),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3292),
+                        ty: DeclarationId(3293),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3293),
+                        ty: DeclarationId(3294),
                     },
                 ],
             },
@@ -94801,7 +94837,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3295),
+            id: DeclarationId(3296),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94820,7 +94856,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3296),
+            id: DeclarationId(3297),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94834,17 +94870,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3297),
+            id: DeclarationId(3298),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3295),
+                        ty: DeclarationId(3296),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3296),
+                        ty: DeclarationId(3297),
                     },
                 ],
             },
@@ -94859,7 +94895,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3298),
+            id: DeclarationId(3299),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94878,7 +94914,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3299),
+            id: DeclarationId(3300),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94892,17 +94928,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3300),
+            id: DeclarationId(3301),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3298),
+                        ty: DeclarationId(3299),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3299),
+                        ty: DeclarationId(3300),
                     },
                 ],
             },
@@ -94917,7 +94953,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3301),
+            id: DeclarationId(3302),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -94936,7 +94972,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3302),
+            id: DeclarationId(3303),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -94950,17 +94986,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3303),
+            id: DeclarationId(3304),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3301),
+                        ty: DeclarationId(3302),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3302),
+                        ty: DeclarationId(3303),
                     },
                 ],
             },
@@ -94975,12 +95011,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3304),
+            id: DeclarationId(3305),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2883),
+                    ty: DeclarationId(2884),
                 }],
             },
             type_params: vec![],
@@ -94994,7 +95030,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3305),
+            id: DeclarationId(3306),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95008,17 +95044,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3306),
+            id: DeclarationId(3307),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3304),
+                        ty: DeclarationId(3305),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3305),
+                        ty: DeclarationId(3306),
                     },
                 ],
             },
@@ -95033,12 +95069,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3307),
+            id: DeclarationId(3308),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2885),
+                    ty: DeclarationId(2886),
                 }],
             },
             type_params: vec![],
@@ -95052,7 +95088,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10996),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3308),
+            id: DeclarationId(3309),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95066,17 +95102,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10996),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3309),
+            id: DeclarationId(3310),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3307),
+                        ty: DeclarationId(3308),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3308),
+                        ty: DeclarationId(3309),
                     },
                 ],
             },
@@ -95091,7 +95127,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10996),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3310),
+            id: DeclarationId(3311),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95110,7 +95146,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3311),
+            id: DeclarationId(3312),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95124,17 +95160,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3312),
+            id: DeclarationId(3313),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3310),
+                        ty: DeclarationId(3311),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3311),
+                        ty: DeclarationId(3312),
                     },
                 ],
             },
@@ -95149,7 +95185,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3313),
+            id: DeclarationId(3314),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95168,7 +95204,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3314),
+            id: DeclarationId(3315),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95182,17 +95218,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3315),
+            id: DeclarationId(3316),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3313),
+                        ty: DeclarationId(3314),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3314),
+                        ty: DeclarationId(3315),
                     },
                 ],
             },
@@ -95207,7 +95243,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3316),
+            id: DeclarationId(3317),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95226,7 +95262,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3317),
+            id: DeclarationId(3318),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95240,17 +95276,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3318),
+            id: DeclarationId(3319),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3316),
+                        ty: DeclarationId(3317),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3317),
+                        ty: DeclarationId(3318),
                     },
                 ],
             },
@@ -95265,7 +95301,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3319),
+            id: DeclarationId(3320),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95284,7 +95320,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3320),
+            id: DeclarationId(3321),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95298,17 +95334,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3321),
+            id: DeclarationId(3322),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3319),
+                        ty: DeclarationId(3320),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3320),
+                        ty: DeclarationId(3321),
                     },
                 ],
             },
@@ -95323,7 +95359,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3322),
+            id: DeclarationId(3323),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95342,7 +95378,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11530, 11534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3323),
+            id: DeclarationId(3324),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95356,17 +95392,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11530, 11534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3324),
+            id: DeclarationId(3325),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3322),
+                        ty: DeclarationId(3323),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3323),
+                        ty: DeclarationId(3324),
                     },
                 ],
             },
@@ -95381,7 +95417,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11530, 11534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3325),
+            id: DeclarationId(3326),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95400,7 +95436,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11584, 11591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3326),
+            id: DeclarationId(3327),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95414,17 +95450,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11584, 11591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3327),
+            id: DeclarationId(3328),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3325),
+                        ty: DeclarationId(3326),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3326),
+                        ty: DeclarationId(3327),
                     },
                 ],
             },
@@ -95439,7 +95475,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11584, 11591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3328),
+            id: DeclarationId(3329),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95458,7 +95494,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3329),
+            id: DeclarationId(3330),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95472,17 +95508,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3330),
+            id: DeclarationId(3331),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3328),
+                        ty: DeclarationId(3329),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3329),
+                        ty: DeclarationId(3330),
                     },
                 ],
             },
@@ -95497,7 +95533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3331),
+            id: DeclarationId(3332),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95516,7 +95552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11610, 11614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3332),
+            id: DeclarationId(3333),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95530,17 +95566,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11610, 11614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3333),
+            id: DeclarationId(3334),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3331),
+                        ty: DeclarationId(3332),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3332),
+                        ty: DeclarationId(3333),
                     },
                 ],
             },
@@ -95555,7 +95591,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11610, 11614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3334),
+            id: DeclarationId(3335),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95574,7 +95610,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11663, 11670),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3335),
+            id: DeclarationId(3336),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95588,17 +95624,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11663, 11670),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3336),
+            id: DeclarationId(3337),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3334),
+                        ty: DeclarationId(3335),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3335),
+                        ty: DeclarationId(3336),
                     },
                 ],
             },
@@ -95613,7 +95649,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11663, 11670),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3337),
+            id: DeclarationId(3338),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95632,7 +95668,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11678, 11682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3338),
+            id: DeclarationId(3339),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95646,17 +95682,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11678, 11682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3339),
+            id: DeclarationId(3340),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3337),
+                        ty: DeclarationId(3338),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3338),
+                        ty: DeclarationId(3339),
                     },
                 ],
             },
@@ -95671,7 +95707,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11678, 11682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3340),
+            id: DeclarationId(3341),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95690,7 +95726,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11689, 11693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3341),
+            id: DeclarationId(3342),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95704,17 +95740,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11689, 11693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3342),
+            id: DeclarationId(3343),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3340),
+                        ty: DeclarationId(3341),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3341),
+                        ty: DeclarationId(3342),
                     },
                 ],
             },
@@ -95729,7 +95765,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11689, 11693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3343),
+            id: DeclarationId(3344),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95748,7 +95784,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12673, 12677),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3344),
+            id: DeclarationId(3345),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95762,17 +95798,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12673, 12677),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3345),
+            id: DeclarationId(3346),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3343),
+                        ty: DeclarationId(3344),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3344),
+                        ty: DeclarationId(3345),
                     },
                 ],
             },
@@ -95787,7 +95823,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12673, 12677),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3346),
+            id: DeclarationId(3347),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95806,7 +95842,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12756, 12763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3347),
+            id: DeclarationId(3348),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95820,17 +95856,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12756, 12763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3348),
+            id: DeclarationId(3349),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3346),
+                        ty: DeclarationId(3347),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3347),
+                        ty: DeclarationId(3348),
                     },
                 ],
             },
@@ -95845,7 +95881,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12756, 12763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3349),
+            id: DeclarationId(3350),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -95864,7 +95900,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13403, 13407),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3350),
+            id: DeclarationId(3351),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -95878,17 +95914,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13403, 13407),
         });
         declarations.push(Declaration {
-            id: DeclarationId(3351),
+            id: DeclarationId(3352),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(3349),
+                        ty: DeclarationId(3350),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(3350),
+                        ty: DeclarationId(3351),
                     },
                 ],
             },
@@ -97425,7 +97461,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(189),
             Port {
                 id: PortId(189),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2012))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2013))),
                 produced_by: Some(NodeId(184)),
             },
         );
@@ -97449,7 +97485,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(192),
             Port {
                 id: PortId(192),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2013))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2014))),
                 produced_by: None,
             },
         );
@@ -97457,7 +97493,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(193),
             Port {
                 id: PortId(193),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2014))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2015))),
                 produced_by: Some(NodeId(186)),
             },
         );
@@ -97745,7 +97781,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(229),
             Port {
                 id: PortId(229),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2015))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2016))),
                 produced_by: None,
             },
         );
@@ -99297,7 +99333,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(423),
             Port {
                 id: PortId(423),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2016))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2017))),
                 produced_by: None,
             },
         );
@@ -99321,7 +99357,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(426),
             Port {
                 id: PortId(426),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2013))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2014))),
                 produced_by: Some(NodeId(363)),
             },
         );
@@ -99337,7 +99373,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(428),
             Port {
                 id: PortId(428),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2017))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2018))),
                 produced_by: Some(NodeId(365)),
             },
         );
@@ -99345,7 +99381,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(429),
             Port {
                 id: PortId(429),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2018))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2019))),
                 produced_by: None,
             },
         );
@@ -99449,7 +99485,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(442),
             Port {
                 id: PortId(442),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2019))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2020))),
                 produced_by: Some(NodeId(378)),
             },
         );
@@ -99457,7 +99493,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(443),
             Port {
                 id: PortId(443),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2020))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2021))),
                 produced_by: None,
             },
         );
@@ -99505,7 +99541,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(449),
             Port {
                 id: PortId(449),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2021))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2022))),
                 produced_by: Some(NodeId(385)),
             },
         );
@@ -99513,7 +99549,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(450),
             Port {
                 id: PortId(450),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2022))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2023))),
                 produced_by: None,
             },
         );
@@ -99593,7 +99629,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(460),
             Port {
                 id: PortId(460),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2023))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2024))),
                 produced_by: None,
             },
         );
@@ -99697,7 +99733,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(473),
             Port {
                 id: PortId(473),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2024))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2025))),
                 produced_by: Some(NodeId(407)),
             },
         );
@@ -99977,7 +100013,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(508),
             Port {
                 id: PortId(508),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2025))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2026))),
                 produced_by: None,
             },
         );
@@ -100089,7 +100125,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(522),
             Port {
                 id: PortId(522),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2026))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2027))),
                 produced_by: None,
             },
         );
@@ -100201,7 +100237,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(536),
             Port {
                 id: PortId(536),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2027))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2028))),
                 produced_by: None,
             },
         );
@@ -100817,7 +100853,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(613),
             Port {
                 id: PortId(613),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2028))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2029))),
                 produced_by: None,
             },
         );
@@ -100929,7 +100965,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(627),
             Port {
                 id: PortId(627),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2029))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2030))),
                 produced_by: Some(NodeId(516)),
             },
         );
@@ -100937,7 +100973,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(628),
             Port {
                 id: PortId(628),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2030))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2031))),
                 produced_by: None,
             },
         );
@@ -100993,7 +101029,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(635),
             Port {
                 id: PortId(635),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2031))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2032))),
                 produced_by: Some(NodeId(523)),
             },
         );
@@ -101001,7 +101037,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(636),
             Port {
                 id: PortId(636),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2032))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2033))),
                 produced_by: None,
             },
         );
@@ -101017,7 +101053,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(638),
             Port {
                 id: PortId(638),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2033))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2034))),
                 produced_by: Some(NodeId(526)),
             },
         );
@@ -101281,7 +101317,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(671),
             Port {
                 id: PortId(671),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2366))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2367))),
                 produced_by: None,
             },
         );
@@ -101713,7 +101749,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(725),
             Port {
                 id: PortId(725),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2512))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2513))),
                 produced_by: Some(NodeId(596)),
             },
         );
@@ -101737,7 +101773,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(728),
             Port {
                 id: PortId(728),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2513))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2514))),
                 produced_by: Some(NodeId(598)),
             },
         );
@@ -101745,7 +101781,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(729),
             Port {
                 id: PortId(729),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2514))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2515))),
                 produced_by: Some(NodeId(600)),
             },
         );
@@ -101753,7 +101789,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(730),
             Port {
                 id: PortId(730),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2515))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2516))),
                 produced_by: Some(NodeId(602)),
             },
         );
@@ -101761,7 +101797,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(731),
             Port {
                 id: PortId(731),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2516))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2517))),
                 produced_by: Some(NodeId(604)),
             },
         );
@@ -101769,7 +101805,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(732),
             Port {
                 id: PortId(732),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2517))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2518))),
                 produced_by: Some(NodeId(606)),
             },
         );
@@ -101777,7 +101813,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(733),
             Port {
                 id: PortId(733),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2518))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2519))),
                 produced_by: Some(NodeId(608)),
             },
         );
@@ -101785,7 +101821,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(734),
             Port {
                 id: PortId(734),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2520))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2521))),
                 produced_by: Some(NodeId(610)),
             },
         );
@@ -101817,7 +101853,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(738),
             Port {
                 id: PortId(738),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2522))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2523))),
                 produced_by: Some(NodeId(614)),
             },
         );
@@ -101841,7 +101877,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(741),
             Port {
                 id: PortId(741),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2523))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2524))),
                 produced_by: Some(NodeId(617)),
             },
         );
@@ -101873,7 +101909,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(745),
             Port {
                 id: PortId(745),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2524))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2525))),
                 produced_by: Some(NodeId(621)),
             },
         );
@@ -101921,7 +101957,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(751),
             Port {
                 id: PortId(751),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2525))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2526))),
                 produced_by: Some(NodeId(626)),
             },
         );
@@ -101993,7 +102029,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(760),
             Port {
                 id: PortId(760),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2526))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2527))),
                 produced_by: Some(NodeId(633)),
             },
         );
@@ -102073,7 +102109,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(770),
             Port {
                 id: PortId(770),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2527))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2528))),
                 produced_by: Some(NodeId(640)),
             },
         );
@@ -102137,7 +102173,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(778),
             Port {
                 id: PortId(778),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2528))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2529))),
                 produced_by: Some(NodeId(645)),
             },
         );
@@ -102153,7 +102189,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(780),
             Port {
                 id: PortId(780),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2529))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2530))),
                 produced_by: None,
             },
         );
@@ -102241,7 +102277,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(791),
             Port {
                 id: PortId(791),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2530))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2531))),
                 produced_by: Some(NodeId(655)),
             },
         );
@@ -102313,7 +102349,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(800),
             Port {
                 id: PortId(800),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2531))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2532))),
                 produced_by: Some(NodeId(663)),
             },
         );
@@ -102785,7 +102821,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(859),
             Port {
                 id: PortId(859),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2588))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2589))),
                 produced_by: Some(NodeId(715)),
             },
         );
@@ -102993,7 +103029,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(885),
             Port {
                 id: PortId(885),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2002))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2003))),
                 produced_by: Some(NodeId(735)),
             },
         );
@@ -103561,7 +103597,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(956),
             Port {
                 id: PortId(956),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2589))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2590))),
                 produced_by: Some(NodeId(794)),
             },
         );
@@ -103753,7 +103789,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(980),
             Port {
                 id: PortId(980),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2765))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2766))),
                 produced_by: Some(NodeId(814)),
             },
         );
@@ -104140,145 +104176,145 @@ fn bootstrapped_fixture_dag_clusters() -> Vec<Cluster> {
 fn bootstrapped_fixture_dag_optional_match_disjs() -> HashMap<DeclarationId, DeclarationId> {
     {
         let mut map = HashMap::new();
-        map.insert(DeclarationId(389), DeclarationId(2937));
-        map.insert(DeclarationId(391), DeclarationId(2940));
-        map.insert(DeclarationId(423), DeclarationId(2943));
-        map.insert(DeclarationId(426), DeclarationId(2946));
-        map.insert(DeclarationId(471), DeclarationId(2949));
-        map.insert(DeclarationId(472), DeclarationId(2952));
-        map.insert(DeclarationId(473), DeclarationId(2955));
-        map.insert(DeclarationId(513), DeclarationId(2958));
-        map.insert(DeclarationId(515), DeclarationId(2961));
-        map.insert(DeclarationId(516), DeclarationId(2964));
-        map.insert(DeclarationId(539), DeclarationId(2967));
-        map.insert(DeclarationId(582), DeclarationId(2970));
-        map.insert(DeclarationId(602), DeclarationId(2973));
-        map.insert(DeclarationId(603), DeclarationId(2976));
-        map.insert(DeclarationId(605), DeclarationId(2979));
-        map.insert(DeclarationId(608), DeclarationId(2982));
-        map.insert(DeclarationId(613), DeclarationId(2985));
-        map.insert(DeclarationId(614), DeclarationId(2988));
-        map.insert(DeclarationId(618), DeclarationId(2991));
-        map.insert(DeclarationId(619), DeclarationId(2994));
-        map.insert(DeclarationId(620), DeclarationId(2997));
-        map.insert(DeclarationId(625), DeclarationId(3000));
-        map.insert(DeclarationId(1823), DeclarationId(3003));
-        map.insert(DeclarationId(1827), DeclarationId(3006));
-        map.insert(DeclarationId(1830), DeclarationId(3009));
-        map.insert(DeclarationId(1832), DeclarationId(3012));
-        map.insert(DeclarationId(1833), DeclarationId(3015));
-        map.insert(DeclarationId(1834), DeclarationId(3018));
-        map.insert(DeclarationId(1888), DeclarationId(3021));
-        map.insert(DeclarationId(1889), DeclarationId(3024));
-        map.insert(DeclarationId(1890), DeclarationId(3027));
-        map.insert(DeclarationId(1891), DeclarationId(3030));
-        map.insert(DeclarationId(1892), DeclarationId(3033));
-        map.insert(DeclarationId(1893), DeclarationId(3036));
-        map.insert(DeclarationId(1899), DeclarationId(3039));
-        map.insert(DeclarationId(1954), DeclarationId(3042));
-        map.insert(DeclarationId(1957), DeclarationId(3045));
-        map.insert(DeclarationId(1958), DeclarationId(3048));
-        map.insert(DeclarationId(1959), DeclarationId(3051));
-        map.insert(DeclarationId(1960), DeclarationId(3054));
-        map.insert(DeclarationId(1983), DeclarationId(3057));
-        map.insert(DeclarationId(1988), DeclarationId(3060));
-        map.insert(DeclarationId(1992), DeclarationId(3063));
-        map.insert(DeclarationId(1995), DeclarationId(3066));
-        map.insert(DeclarationId(1996), DeclarationId(3069));
-        map.insert(DeclarationId(2041), DeclarationId(3072));
-        map.insert(DeclarationId(2042), DeclarationId(3075));
-        map.insert(DeclarationId(2043), DeclarationId(3078));
-        map.insert(DeclarationId(2044), DeclarationId(3081));
-        map.insert(DeclarationId(2094), DeclarationId(3084));
-        map.insert(DeclarationId(2095), DeclarationId(3087));
-        map.insert(DeclarationId(2114), DeclarationId(3090));
-        map.insert(DeclarationId(2115), DeclarationId(3093));
-        map.insert(DeclarationId(2119), DeclarationId(3096));
-        map.insert(DeclarationId(2120), DeclarationId(3099));
-        map.insert(DeclarationId(2131), DeclarationId(3102));
-        map.insert(DeclarationId(2132), DeclarationId(3105));
-        map.insert(DeclarationId(2134), DeclarationId(3108));
-        map.insert(DeclarationId(2135), DeclarationId(3111));
-        map.insert(DeclarationId(2137), DeclarationId(3114));
-        map.insert(DeclarationId(2138), DeclarationId(3117));
-        map.insert(DeclarationId(2140), DeclarationId(3120));
-        map.insert(DeclarationId(2142), DeclarationId(3123));
-        map.insert(DeclarationId(2145), DeclarationId(3126));
-        map.insert(DeclarationId(2149), DeclarationId(3129));
-        map.insert(DeclarationId(2151), DeclarationId(3132));
-        map.insert(DeclarationId(2153), DeclarationId(3135));
-        map.insert(DeclarationId(2163), DeclarationId(3138));
-        map.insert(DeclarationId(2164), DeclarationId(3141));
-        map.insert(DeclarationId(2165), DeclarationId(3144));
-        map.insert(DeclarationId(2168), DeclarationId(3147));
-        map.insert(DeclarationId(2169), DeclarationId(3150));
-        map.insert(DeclarationId(2204), DeclarationId(3153));
-        map.insert(DeclarationId(2205), DeclarationId(3156));
-        map.insert(DeclarationId(2206), DeclarationId(3159));
-        map.insert(DeclarationId(2207), DeclarationId(3162));
-        map.insert(DeclarationId(2208), DeclarationId(3165));
-        map.insert(DeclarationId(2209), DeclarationId(3168));
-        map.insert(DeclarationId(2232), DeclarationId(3171));
-        map.insert(DeclarationId(2362), DeclarationId(3174));
-        map.insert(DeclarationId(2363), DeclarationId(3177));
-        map.insert(DeclarationId(2369), DeclarationId(3180));
-        map.insert(DeclarationId(2370), DeclarationId(3183));
-        map.insert(DeclarationId(2371), DeclarationId(3186));
-        map.insert(DeclarationId(2372), DeclarationId(3189));
-        map.insert(DeclarationId(2373), DeclarationId(3192));
-        map.insert(DeclarationId(2374), DeclarationId(3195));
-        map.insert(DeclarationId(2424), DeclarationId(3198));
-        map.insert(DeclarationId(2470), DeclarationId(3201));
-        map.insert(DeclarationId(2478), DeclarationId(3204));
-        map.insert(DeclarationId(2492), DeclarationId(3207));
-        map.insert(DeclarationId(2495), DeclarationId(3210));
-        map.insert(DeclarationId(2553), DeclarationId(3213));
-        map.insert(DeclarationId(2554), DeclarationId(3216));
-        map.insert(DeclarationId(2555), DeclarationId(3219));
-        map.insert(DeclarationId(2558), DeclarationId(3222));
-        map.insert(DeclarationId(2559), DeclarationId(3225));
-        map.insert(DeclarationId(2769), DeclarationId(3228));
-        map.insert(DeclarationId(2798), DeclarationId(3231));
-        map.insert(DeclarationId(2804), DeclarationId(3234));
-        map.insert(DeclarationId(2809), DeclarationId(3237));
-        map.insert(DeclarationId(2812), DeclarationId(3240));
-        map.insert(DeclarationId(2813), DeclarationId(3243));
-        map.insert(DeclarationId(2833), DeclarationId(3246));
-        map.insert(DeclarationId(2834), DeclarationId(3249));
-        map.insert(DeclarationId(2842), DeclarationId(3252));
-        map.insert(DeclarationId(2846), DeclarationId(3255));
-        map.insert(DeclarationId(2848), DeclarationId(3258));
-        map.insert(DeclarationId(2849), DeclarationId(3261));
-        map.insert(DeclarationId(2850), DeclarationId(3264));
-        map.insert(DeclarationId(2851), DeclarationId(3267));
-        map.insert(DeclarationId(2852), DeclarationId(3270));
-        map.insert(DeclarationId(2858), DeclarationId(3273));
-        map.insert(DeclarationId(2860), DeclarationId(3276));
-        map.insert(DeclarationId(2861), DeclarationId(3279));
-        map.insert(DeclarationId(2873), DeclarationId(3282));
-        map.insert(DeclarationId(2874), DeclarationId(3285));
-        map.insert(DeclarationId(2876), DeclarationId(3288));
-        map.insert(DeclarationId(2877), DeclarationId(3291));
-        map.insert(DeclarationId(2878), DeclarationId(3294));
-        map.insert(DeclarationId(2879), DeclarationId(3297));
-        map.insert(DeclarationId(2881), DeclarationId(3300));
-        map.insert(DeclarationId(2882), DeclarationId(3303));
-        map.insert(DeclarationId(2884), DeclarationId(3306));
-        map.insert(DeclarationId(2886), DeclarationId(3309));
-        map.insert(DeclarationId(2887), DeclarationId(3312));
-        map.insert(DeclarationId(2888), DeclarationId(3315));
-        map.insert(DeclarationId(2895), DeclarationId(3318));
-        map.insert(DeclarationId(2896), DeclarationId(3321));
-        map.insert(DeclarationId(2897), DeclarationId(3324));
-        map.insert(DeclarationId(2899), DeclarationId(3327));
-        map.insert(DeclarationId(2900), DeclarationId(3330));
-        map.insert(DeclarationId(2901), DeclarationId(3333));
-        map.insert(DeclarationId(2903), DeclarationId(3336));
-        map.insert(DeclarationId(2904), DeclarationId(3339));
-        map.insert(DeclarationId(2905), DeclarationId(3342));
-        map.insert(DeclarationId(2912), DeclarationId(3345));
-        map.insert(DeclarationId(2914), DeclarationId(3348));
-        map.insert(DeclarationId(2925), DeclarationId(3351));
+        map.insert(DeclarationId(389), DeclarationId(2938));
+        map.insert(DeclarationId(391), DeclarationId(2941));
+        map.insert(DeclarationId(423), DeclarationId(2944));
+        map.insert(DeclarationId(426), DeclarationId(2947));
+        map.insert(DeclarationId(471), DeclarationId(2950));
+        map.insert(DeclarationId(472), DeclarationId(2953));
+        map.insert(DeclarationId(473), DeclarationId(2956));
+        map.insert(DeclarationId(513), DeclarationId(2959));
+        map.insert(DeclarationId(515), DeclarationId(2962));
+        map.insert(DeclarationId(516), DeclarationId(2965));
+        map.insert(DeclarationId(539), DeclarationId(2968));
+        map.insert(DeclarationId(582), DeclarationId(2971));
+        map.insert(DeclarationId(602), DeclarationId(2974));
+        map.insert(DeclarationId(603), DeclarationId(2977));
+        map.insert(DeclarationId(605), DeclarationId(2980));
+        map.insert(DeclarationId(608), DeclarationId(2983));
+        map.insert(DeclarationId(613), DeclarationId(2986));
+        map.insert(DeclarationId(614), DeclarationId(2989));
+        map.insert(DeclarationId(618), DeclarationId(2992));
+        map.insert(DeclarationId(619), DeclarationId(2995));
+        map.insert(DeclarationId(620), DeclarationId(2998));
+        map.insert(DeclarationId(625), DeclarationId(3001));
+        map.insert(DeclarationId(1824), DeclarationId(3004));
+        map.insert(DeclarationId(1828), DeclarationId(3007));
+        map.insert(DeclarationId(1831), DeclarationId(3010));
+        map.insert(DeclarationId(1833), DeclarationId(3013));
+        map.insert(DeclarationId(1834), DeclarationId(3016));
+        map.insert(DeclarationId(1835), DeclarationId(3019));
+        map.insert(DeclarationId(1889), DeclarationId(3022));
+        map.insert(DeclarationId(1890), DeclarationId(3025));
+        map.insert(DeclarationId(1891), DeclarationId(3028));
+        map.insert(DeclarationId(1892), DeclarationId(3031));
+        map.insert(DeclarationId(1893), DeclarationId(3034));
+        map.insert(DeclarationId(1894), DeclarationId(3037));
+        map.insert(DeclarationId(1900), DeclarationId(3040));
+        map.insert(DeclarationId(1955), DeclarationId(3043));
+        map.insert(DeclarationId(1958), DeclarationId(3046));
+        map.insert(DeclarationId(1959), DeclarationId(3049));
+        map.insert(DeclarationId(1960), DeclarationId(3052));
+        map.insert(DeclarationId(1961), DeclarationId(3055));
+        map.insert(DeclarationId(1984), DeclarationId(3058));
+        map.insert(DeclarationId(1989), DeclarationId(3061));
+        map.insert(DeclarationId(1993), DeclarationId(3064));
+        map.insert(DeclarationId(1996), DeclarationId(3067));
+        map.insert(DeclarationId(1997), DeclarationId(3070));
+        map.insert(DeclarationId(2042), DeclarationId(3073));
+        map.insert(DeclarationId(2043), DeclarationId(3076));
+        map.insert(DeclarationId(2044), DeclarationId(3079));
+        map.insert(DeclarationId(2045), DeclarationId(3082));
+        map.insert(DeclarationId(2095), DeclarationId(3085));
+        map.insert(DeclarationId(2096), DeclarationId(3088));
+        map.insert(DeclarationId(2115), DeclarationId(3091));
+        map.insert(DeclarationId(2116), DeclarationId(3094));
+        map.insert(DeclarationId(2120), DeclarationId(3097));
+        map.insert(DeclarationId(2121), DeclarationId(3100));
+        map.insert(DeclarationId(2132), DeclarationId(3103));
+        map.insert(DeclarationId(2133), DeclarationId(3106));
+        map.insert(DeclarationId(2135), DeclarationId(3109));
+        map.insert(DeclarationId(2136), DeclarationId(3112));
+        map.insert(DeclarationId(2138), DeclarationId(3115));
+        map.insert(DeclarationId(2139), DeclarationId(3118));
+        map.insert(DeclarationId(2141), DeclarationId(3121));
+        map.insert(DeclarationId(2143), DeclarationId(3124));
+        map.insert(DeclarationId(2146), DeclarationId(3127));
+        map.insert(DeclarationId(2150), DeclarationId(3130));
+        map.insert(DeclarationId(2152), DeclarationId(3133));
+        map.insert(DeclarationId(2154), DeclarationId(3136));
+        map.insert(DeclarationId(2164), DeclarationId(3139));
+        map.insert(DeclarationId(2165), DeclarationId(3142));
+        map.insert(DeclarationId(2166), DeclarationId(3145));
+        map.insert(DeclarationId(2169), DeclarationId(3148));
+        map.insert(DeclarationId(2170), DeclarationId(3151));
+        map.insert(DeclarationId(2205), DeclarationId(3154));
+        map.insert(DeclarationId(2206), DeclarationId(3157));
+        map.insert(DeclarationId(2207), DeclarationId(3160));
+        map.insert(DeclarationId(2208), DeclarationId(3163));
+        map.insert(DeclarationId(2209), DeclarationId(3166));
+        map.insert(DeclarationId(2210), DeclarationId(3169));
+        map.insert(DeclarationId(2233), DeclarationId(3172));
+        map.insert(DeclarationId(2363), DeclarationId(3175));
+        map.insert(DeclarationId(2364), DeclarationId(3178));
+        map.insert(DeclarationId(2370), DeclarationId(3181));
+        map.insert(DeclarationId(2371), DeclarationId(3184));
+        map.insert(DeclarationId(2372), DeclarationId(3187));
+        map.insert(DeclarationId(2373), DeclarationId(3190));
+        map.insert(DeclarationId(2374), DeclarationId(3193));
+        map.insert(DeclarationId(2375), DeclarationId(3196));
+        map.insert(DeclarationId(2425), DeclarationId(3199));
+        map.insert(DeclarationId(2471), DeclarationId(3202));
+        map.insert(DeclarationId(2479), DeclarationId(3205));
+        map.insert(DeclarationId(2493), DeclarationId(3208));
+        map.insert(DeclarationId(2496), DeclarationId(3211));
+        map.insert(DeclarationId(2554), DeclarationId(3214));
+        map.insert(DeclarationId(2555), DeclarationId(3217));
+        map.insert(DeclarationId(2556), DeclarationId(3220));
+        map.insert(DeclarationId(2559), DeclarationId(3223));
+        map.insert(DeclarationId(2560), DeclarationId(3226));
+        map.insert(DeclarationId(2770), DeclarationId(3229));
+        map.insert(DeclarationId(2799), DeclarationId(3232));
+        map.insert(DeclarationId(2805), DeclarationId(3235));
+        map.insert(DeclarationId(2810), DeclarationId(3238));
+        map.insert(DeclarationId(2813), DeclarationId(3241));
+        map.insert(DeclarationId(2814), DeclarationId(3244));
+        map.insert(DeclarationId(2834), DeclarationId(3247));
+        map.insert(DeclarationId(2835), DeclarationId(3250));
+        map.insert(DeclarationId(2843), DeclarationId(3253));
+        map.insert(DeclarationId(2847), DeclarationId(3256));
+        map.insert(DeclarationId(2849), DeclarationId(3259));
+        map.insert(DeclarationId(2850), DeclarationId(3262));
+        map.insert(DeclarationId(2851), DeclarationId(3265));
+        map.insert(DeclarationId(2852), DeclarationId(3268));
+        map.insert(DeclarationId(2853), DeclarationId(3271));
+        map.insert(DeclarationId(2859), DeclarationId(3274));
+        map.insert(DeclarationId(2861), DeclarationId(3277));
+        map.insert(DeclarationId(2862), DeclarationId(3280));
+        map.insert(DeclarationId(2874), DeclarationId(3283));
+        map.insert(DeclarationId(2875), DeclarationId(3286));
+        map.insert(DeclarationId(2877), DeclarationId(3289));
+        map.insert(DeclarationId(2878), DeclarationId(3292));
+        map.insert(DeclarationId(2879), DeclarationId(3295));
+        map.insert(DeclarationId(2880), DeclarationId(3298));
+        map.insert(DeclarationId(2882), DeclarationId(3301));
+        map.insert(DeclarationId(2883), DeclarationId(3304));
+        map.insert(DeclarationId(2885), DeclarationId(3307));
+        map.insert(DeclarationId(2887), DeclarationId(3310));
+        map.insert(DeclarationId(2888), DeclarationId(3313));
+        map.insert(DeclarationId(2889), DeclarationId(3316));
+        map.insert(DeclarationId(2896), DeclarationId(3319));
+        map.insert(DeclarationId(2897), DeclarationId(3322));
+        map.insert(DeclarationId(2898), DeclarationId(3325));
+        map.insert(DeclarationId(2900), DeclarationId(3328));
+        map.insert(DeclarationId(2901), DeclarationId(3331));
+        map.insert(DeclarationId(2902), DeclarationId(3334));
+        map.insert(DeclarationId(2904), DeclarationId(3337));
+        map.insert(DeclarationId(2905), DeclarationId(3340));
+        map.insert(DeclarationId(2906), DeclarationId(3343));
+        map.insert(DeclarationId(2913), DeclarationId(3346));
+        map.insert(DeclarationId(2915), DeclarationId(3349));
+        map.insert(DeclarationId(2926), DeclarationId(3352));
         map
     }
 }
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 c57f7ec3396..8bbe4b87a10 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: 856,
-        next_declaration_id: 2878,
+        next_declaration_id: 2879,
         next_port_id: 1027,
         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: 2878,
+        declaration_append_begin_after_bootstrap: 2879,
     }
 }
 
@@ -1402,21 +1402,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(182),
-            target: TransformTarget::Callable(DeclarationId(1681)),
+            target: TransformTarget::Callable(DeclarationId(1682)),
             inputs: vec![PortId(185)],
             output: PortId(187),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11495, 11507),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(183),
-            target: TransformTarget::Callable(DeclarationId(1683)),
+            target: TransformTarget::Callable(DeclarationId(1684)),
             inputs: vec![PortId(187)],
             output: PortId(188),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11488, 11535),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(184),
-            target: TransformTarget::Callable(DeclarationId(1627)),
+            target: TransformTarget::Callable(DeclarationId(1628)),
             inputs: vec![PortId(185), PortId(186), PortId(188)],
             output: PortId(189),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11149, 11539),
@@ -1432,7 +1432,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(186),
-            target: TransformTarget::Callable(DeclarationId(1629)),
+            target: TransformTarget::Callable(DeclarationId(1630)),
             inputs: vec![PortId(190), PortId(191), PortId(192)],
             output: PortId(193),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11670, 11726),
@@ -1448,7 +1448,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(188),
-            target: TransformTarget::Callable(DeclarationId(1684)),
+            target: TransformTarget::Callable(DeclarationId(1685)),
             inputs: vec![PortId(194)],
             output: PortId(195),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11795, 11810),
@@ -1600,7 +1600,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(202),
-            target: TransformTarget::Callable(DeclarationId(1668)),
+            target: TransformTarget::Callable(DeclarationId(1669)),
             inputs: vec![PortId(211)],
             output: PortId(212),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12325, 12349),
@@ -1630,7 +1630,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(206),
-            target: TransformTarget::Callable(DeclarationId(1666)),
+            target: TransformTarget::Callable(DeclarationId(1667)),
             inputs: vec![PortId(216)],
             output: PortId(217),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12618, 12653),
@@ -1760,14 +1760,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(218),
-            target: TransformTarget::Callable(DeclarationId(1662)),
+            target: TransformTarget::Callable(DeclarationId(1663)),
             inputs: vec![PortId(230)],
             output: PortId(231),
             span: SourceSpan::new("src/v3/std/algebra.dag", 14214, 14229),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(219),
-            target: TransformTarget::Callable(DeclarationId(1686)),
+            target: TransformTarget::Callable(DeclarationId(1687)),
             inputs: vec![PortId(229), PortId(231)],
             output: PortId(232),
             span: SourceSpan::new("src/v3/std/algebra.dag", 14202, 14245),
@@ -2472,7 +2472,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(266),
-            target: TransformTarget::Callable(DeclarationId(1688)),
+            target: TransformTarget::Callable(DeclarationId(1689)),
             inputs: vec![PortId(312), PortId(313)],
             output: PortId(314),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16911, 17021),
@@ -2500,7 +2500,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(270),
-            target: TransformTarget::Callable(DeclarationId(1690)),
+            target: TransformTarget::Callable(DeclarationId(1691)),
             inputs: vec![PortId(317), PortId(318)],
             output: PortId(319),
             span: SourceSpan::new("src/v3/std/algebra.dag", 17076, 17186),
@@ -3993,14 +3993,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(364),
-            target: TransformTarget::Callable(DeclarationId(1691)),
+            target: TransformTarget::Callable(DeclarationId(1692)),
             inputs: vec![PortId(425), PortId(426)],
             output: PortId(427),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22293, 22323),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(365),
-            target: TransformTarget::Callable(DeclarationId(1692)),
+            target: TransformTarget::Callable(DeclarationId(1693)),
             inputs: vec![PortId(424), PortId(427)],
             output: PortId(428),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22275, 22324),
@@ -4016,7 +4016,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(367),
-            target: TransformTarget::Callable(DeclarationId(1693)),
+            target: TransformTarget::Callable(DeclarationId(1694)),
             inputs: vec![],
             output: PortId(430),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22603, 22610),
@@ -4080,7 +4080,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(375),
-            target: TransformTarget::Callable(DeclarationId(1694)),
+            target: TransformTarget::Callable(DeclarationId(1695)),
             inputs: vec![PortId(436), PortId(438)],
             output: PortId(439),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22737, 22789),
@@ -4176,21 +4176,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(382),
-            target: TransformTarget::Callable(DeclarationId(1662)),
+            target: TransformTarget::Callable(DeclarationId(1663)),
             inputs: vec![PortId(445)],
             output: PortId(446),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23123, 23138),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(383),
-            target: TransformTarget::Callable(DeclarationId(1695)),
+            target: TransformTarget::Callable(DeclarationId(1696)),
             inputs: vec![],
             output: PortId(447),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23140, 23147),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(384),
-            target: TransformTarget::Callable(DeclarationId(1696)),
+            target: TransformTarget::Callable(DeclarationId(1697)),
             inputs: vec![PortId(446), PortId(447)],
             output: PortId(448),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23118, 23148),
@@ -4327,7 +4327,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(396),
-            target: TransformTarget::Callable(DeclarationId(1697)),
+            target: TransformTarget::Callable(DeclarationId(1698)),
             inputs: vec![],
             output: PortId(461),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23597, 23604),
@@ -4391,7 +4391,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(404),
-            target: TransformTarget::Callable(DeclarationId(1698)),
+            target: TransformTarget::Callable(DeclarationId(1699)),
             inputs: vec![PortId(467), PortId(469)],
             output: PortId(470),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23735, 23792),
@@ -4796,7 +4796,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(430),
-            target: TransformTarget::Callable(DeclarationId(1662)),
+            target: TransformTarget::Callable(DeclarationId(1663)),
             inputs: vec![PortId(509)],
             output: PortId(510),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25180, 25195),
@@ -4839,7 +4839,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(435),
-            target: TransformTarget::Callable(DeclarationId(1699)),
+            target: TransformTarget::Callable(DeclarationId(1700)),
             inputs: vec![PortId(515), PortId(516)],
             output: PortId(517),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25317, 25349),
@@ -4936,7 +4936,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(442),
-            target: TransformTarget::Callable(DeclarationId(1662)),
+            target: TransformTarget::Callable(DeclarationId(1663)),
             inputs: vec![PortId(523)],
             output: PortId(524),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25451, 25466),
@@ -4995,7 +4995,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(449),
-            target: TransformTarget::Callable(DeclarationId(1668)),
+            target: TransformTarget::Callable(DeclarationId(1669)),
             inputs: vec![PortId(532)],
             output: PortId(533),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25569, 25628),
@@ -5078,7 +5078,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(454),
-            target: TransformTarget::Callable(DeclarationId(1662)),
+            target: TransformTarget::Callable(DeclarationId(1663)),
             inputs: vec![PortId(537)],
             output: PortId(538),
             span: SourceSpan::new("src/v3/std/algebra.dag", 25917, 25932),
@@ -5171,7 +5171,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(465),
-            target: TransformTarget::Callable(DeclarationId(1666)),
+            target: TransformTarget::Callable(DeclarationId(1667)),
             inputs: vec![PortId(551)],
             output: PortId(552),
             span: SourceSpan::new("src/v3/std/algebra.dag", 26159, 26222),
@@ -5643,7 +5643,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(494),
-            target: TransformTarget::Callable(DeclarationId(1666)),
+            target: TransformTarget::Callable(DeclarationId(1667)),
             inputs: vec![PortId(601)],
             output: PortId(602),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27605, 27633),
@@ -5734,7 +5734,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(505),
-            target: TransformTarget::Callable(DeclarationId(1700)),
+            target: TransformTarget::Callable(DeclarationId(1701)),
             inputs: vec![],
             output: PortId(615),
             span: SourceSpan::new("src/v3/std/algebra.dag", 27988, 27995),
@@ -5798,7 +5798,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(513),
-            target: TransformTarget::Callable(DeclarationId(1701)),
+            target: TransformTarget::Callable(DeclarationId(1702)),
             inputs: vec![PortId(621), PortId(623)],
             output: PortId(624),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28136, 28201),
@@ -5887,7 +5887,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(519),
-            target: TransformTarget::Callable(DeclarationId(1703)),
+            target: TransformTarget::Callable(DeclarationId(1704)),
             inputs: vec![PortId(628), PortId(630)],
             output: PortId(631),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28319, 28377),
@@ -5908,7 +5908,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(522),
-            target: TransformTarget::Callable(DeclarationId(1704)),
+            target: TransformTarget::Callable(DeclarationId(1705)),
             inputs: vec![PortId(629), PortId(633)],
             output: PortId(634),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28403, 28449),
@@ -5951,14 +5951,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(525),
-            target: TransformTarget::Callable(DeclarationId(1705)),
+            target: TransformTarget::Callable(DeclarationId(1706)),
             inputs: vec![],
             output: PortId(637),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28720, 28727),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(526),
-            target: TransformTarget::Callable(DeclarationId(1707)),
+            target: TransformTarget::Callable(DeclarationId(1708)),
             inputs: vec![PortId(636), PortId(637)],
             output: PortId(638),
             span: SourceSpan::new("src/v3/std/algebra.dag", 28708, 28749),
@@ -5981,7 +5981,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(529),
-            target: TransformTarget::Callable(DeclarationId(1662)),
+            target: TransformTarget::Callable(DeclarationId(1663)),
             inputs: vec![PortId(640)],
             output: PortId(641),
             span: SourceSpan::new("src/v3/std/induction.dag", 29099, 29114),
@@ -6054,7 +6054,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(538),
-            target: TransformTarget::Callable(DeclarationId(1670)),
+            target: TransformTarget::Callable(DeclarationId(1671)),
             inputs: vec![PortId(653)],
             output: PortId(654),
             span: SourceSpan::new("src/v3/std/induction.dag", 29338, 29412),
@@ -6068,7 +6068,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(540),
-            target: TransformTarget::Callable(DeclarationId(1670)),
+            target: TransformTarget::Callable(DeclarationId(1671)),
             inputs: vec![PortId(655)],
             output: PortId(656),
             span: SourceSpan::new("src/v3/std/induction.dag", 29433, 29461),
@@ -6082,7 +6082,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(542),
-            target: TransformTarget::Callable(DeclarationId(1670)),
+            target: TransformTarget::Callable(DeclarationId(1671)),
             inputs: vec![PortId(657)],
             output: PortId(658),
             span: SourceSpan::new("src/v3/std/induction.dag", 29480, 29513),
@@ -6209,7 +6209,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(548),
-            target: TransformTarget::Callable(DeclarationId(1670)),
+            target: TransformTarget::Callable(DeclarationId(1671)),
             inputs: vec![PortId(664)],
             output: PortId(665),
             span: SourceSpan::new("src/v3/std/induction.dag", 29645, 29726),
@@ -6234,7 +6234,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(551),
-            target: TransformTarget::Callable(DeclarationId(1670)),
+            target: TransformTarget::Callable(DeclarationId(1671)),
             inputs: vec![PortId(668)],
             output: PortId(669),
             span: SourceSpan::new("src/v3/std/induction.dag", 29761, 29835),
@@ -6320,7 +6320,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(559),
-            target: TransformTarget::Callable(DeclarationId(2073)),
+            target: TransformTarget::Callable(DeclarationId(2074)),
             inputs: vec![PortId(678)],
             output: PortId(679),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3203, 3241),
@@ -6343,7 +6343,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(562),
-            target: TransformTarget::Callable(DeclarationId(2074)),
+            target: TransformTarget::Callable(DeclarationId(2075)),
             inputs: vec![PortId(682)],
             output: PortId(683),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3281, 3319),
@@ -6409,7 +6409,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(567),
-            target: TransformTarget::Callable(DeclarationId(2075)),
+            target: TransformTarget::Callable(DeclarationId(2076)),
             inputs: vec![PortId(688)],
             output: PortId(689),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3440, 3478),
@@ -6432,7 +6432,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(570),
-            target: TransformTarget::Callable(DeclarationId(2076)),
+            target: TransformTarget::Callable(DeclarationId(2077)),
             inputs: vec![PortId(692)],
             output: PortId(693),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3518, 3556),
@@ -6498,7 +6498,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(575),
-            target: TransformTarget::Callable(DeclarationId(2077)),
+            target: TransformTarget::Callable(DeclarationId(2078)),
             inputs: vec![PortId(698)],
             output: PortId(699),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3674, 3712),
@@ -6521,7 +6521,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(578),
-            target: TransformTarget::Callable(DeclarationId(2078)),
+            target: TransformTarget::Callable(DeclarationId(2079)),
             inputs: vec![PortId(702)],
             output: PortId(703),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3752, 3790),
@@ -6587,7 +6587,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(583),
-            target: TransformTarget::Callable(DeclarationId(2079)),
+            target: TransformTarget::Callable(DeclarationId(2080)),
             inputs: vec![PortId(708)],
             output: PortId(709),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3906, 3944),
@@ -6610,7 +6610,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(586),
-            target: TransformTarget::Callable(DeclarationId(2080)),
+            target: TransformTarget::Callable(DeclarationId(2081)),
             inputs: vec![PortId(712)],
             output: PortId(713),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3984, 4022),
@@ -6676,7 +6676,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(591),
-            target: TransformTarget::Callable(DeclarationId(2081)),
+            target: TransformTarget::Callable(DeclarationId(2082)),
             inputs: vec![PortId(718)],
             output: PortId(719),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4138, 4176),
@@ -6699,7 +6699,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(594),
-            target: TransformTarget::Callable(DeclarationId(2082)),
+            target: TransformTarget::Callable(DeclarationId(2083)),
             inputs: vec![PortId(722)],
             output: PortId(723),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4216, 4254),
@@ -6858,7 +6858,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(600),
-            target: TransformTarget::Callable(DeclarationId(2083)),
+            target: TransformTarget::Callable(DeclarationId(2084)),
             inputs: vec![],
             output: PortId(729),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4940, 4945),
@@ -6874,7 +6874,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(602),
-            target: TransformTarget::Callable(DeclarationId(2084)),
+            target: TransformTarget::Callable(DeclarationId(2085)),
             inputs: vec![],
             output: PortId(730),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5005, 5010),
@@ -6890,7 +6890,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(604),
-            target: TransformTarget::Callable(DeclarationId(2085)),
+            target: TransformTarget::Callable(DeclarationId(2086)),
             inputs: vec![],
             output: PortId(731),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5068, 5073),
@@ -6906,7 +6906,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(606),
-            target: TransformTarget::Callable(DeclarationId(2086)),
+            target: TransformTarget::Callable(DeclarationId(2087)),
             inputs: vec![],
             output: PortId(732),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5131, 5136),
@@ -6922,7 +6922,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(608),
-            target: TransformTarget::Callable(DeclarationId(2087)),
+            target: TransformTarget::Callable(DeclarationId(2088)),
             inputs: vec![],
             output: PortId(733),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5195, 5200),
@@ -6938,7 +6938,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(610),
-            target: TransformTarget::Callable(DeclarationId(2088)),
+            target: TransformTarget::Callable(DeclarationId(2089)),
             inputs: vec![],
             output: PortId(734),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5275, 5280),
@@ -6954,7 +6954,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(612),
-            target: TransformTarget::Callable(DeclarationId(2090)),
+            target: TransformTarget::Callable(DeclarationId(2091)),
             inputs: vec![PortId(735)],
             output: PortId(736),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5391, 5402),
@@ -6968,7 +6968,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(614),
-            target: TransformTarget::Callable(DeclarationId(2089)),
+            target: TransformTarget::Callable(DeclarationId(2090)),
             inputs: vec![PortId(736), PortId(737)],
             output: PortId(738),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5378, 5443),
@@ -6991,7 +6991,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(617),
-            target: TransformTarget::Callable(DeclarationId(2091)),
+            target: TransformTarget::Callable(DeclarationId(2092)),
             inputs: vec![PortId(739), PortId(740)],
             output: PortId(741),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5519, 5577),
@@ -7021,7 +7021,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(621),
-            target: TransformTarget::Callable(DeclarationId(2092)),
+            target: TransformTarget::Callable(DeclarationId(2093)),
             inputs: vec![PortId(743), PortId(742), PortId(744)],
             output: PortId(745),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5678, 5803),
@@ -7058,7 +7058,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(626),
-            target: TransformTarget::Callable(DeclarationId(2093)),
+            target: TransformTarget::Callable(DeclarationId(2094)),
             inputs: vec![PortId(748), PortId(749), PortId(750)],
             output: PortId(751),
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5924, 6086),
@@ -7556,7 +7556,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(669),
-            target: TransformTarget::Callable(DeclarationId(2132)),
+            target: TransformTarget::Callable(DeclarationId(2133)),
             inputs: vec![],
             output: PortId(808),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8272, 8282),
@@ -7572,28 +7572,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(671),
-            target: TransformTarget::Callable(DeclarationId(2132)),
+            target: TransformTarget::Callable(DeclarationId(2133)),
             inputs: vec![],
             output: PortId(812),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8590, 8600),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(672),
-            target: TransformTarget::Callable(DeclarationId(2132)),
+            target: TransformTarget::Callable(DeclarationId(2133)),
             inputs: vec![],
             output: PortId(813),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8652, 8662),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(673),
-            target: TransformTarget::Callable(DeclarationId(2134)),
+            target: TransformTarget::Callable(DeclarationId(2135)),
             inputs: vec![],
             output: PortId(814),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8680, 8685),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(674),
-            target: TransformTarget::Callable(DeclarationId(2134)),
+            target: TransformTarget::Callable(DeclarationId(2135)),
             inputs: vec![],
             output: PortId(815),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8707, 8712),
@@ -7609,7 +7609,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(676),
-            target: TransformTarget::Callable(DeclarationId(2134)),
+            target: TransformTarget::Callable(DeclarationId(2135)),
             inputs: vec![],
             output: PortId(818),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8749, 8754),
@@ -7664,21 +7664,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(678),
-            target: TransformTarget::Callable(DeclarationId(2132)),
+            target: TransformTarget::Callable(DeclarationId(2133)),
             inputs: vec![],
             output: PortId(820),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8818, 8828),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(679),
-            target: TransformTarget::Callable(DeclarationId(2134)),
+            target: TransformTarget::Callable(DeclarationId(2135)),
             inputs: vec![],
             output: PortId(821),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8846, 8851),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(680),
-            target: TransformTarget::Callable(DeclarationId(2133)),
+            target: TransformTarget::Callable(DeclarationId(2134)),
             inputs: vec![],
             output: PortId(822),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8873, 8882),
@@ -7694,7 +7694,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(682),
-            target: TransformTarget::Callable(DeclarationId(2133)),
+            target: TransformTarget::Callable(DeclarationId(2134)),
             inputs: vec![],
             output: PortId(825),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 8919, 8928),
@@ -7758,21 +7758,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(685),
-            target: TransformTarget::Callable(DeclarationId(2132)),
+            target: TransformTarget::Callable(DeclarationId(2133)),
             inputs: vec![],
             output: PortId(829),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9008, 9018),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(686),
-            target: TransformTarget::Callable(DeclarationId(2134)),
+            target: TransformTarget::Callable(DeclarationId(2135)),
             inputs: vec![],
             output: PortId(830),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9036, 9041),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(687),
-            target: TransformTarget::Callable(DeclarationId(2133)),
+            target: TransformTarget::Callable(DeclarationId(2134)),
             inputs: vec![],
             output: PortId(831),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9063, 9072),
@@ -7820,7 +7820,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(693),
-            target: TransformTarget::Callable(DeclarationId(2131)),
+            target: TransformTarget::Callable(DeclarationId(2132)),
             inputs: vec![PortId(837)],
             output: PortId(838),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9151, 9204),
@@ -7879,7 +7879,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(698),
-            target: TransformTarget::Callable(DeclarationId(2131)),
+            target: TransformTarget::Callable(DeclarationId(2132)),
             inputs: vec![PortId(842)],
             output: PortId(843),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9232, 9320),
@@ -8071,7 +8071,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(710),
-            target: TransformTarget::Callable(DeclarationId(2131)),
+            target: TransformTarget::Callable(DeclarationId(2132)),
             inputs: vec![PortId(853)],
             output: PortId(854),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9657, 9698),
@@ -8110,7 +8110,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(715),
-            target: TransformTarget::Callable(DeclarationId(2136)),
+            target: TransformTarget::Callable(DeclarationId(2137)),
             inputs: vec![],
             output: PortId(859),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9952, 9957),
@@ -8249,14 +8249,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(724),
-            target: TransformTarget::Callable(DeclarationId(1890)),
+            target: TransformTarget::Callable(DeclarationId(1891)),
             inputs: vec![],
             output: PortId(874),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10707, 10719),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(725),
-            target: TransformTarget::Callable(DeclarationId(1896)),
+            target: TransformTarget::Callable(DeclarationId(1897)),
             inputs: vec![PortId(874)],
             output: PortId(875),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 10694, 10720),
@@ -8364,7 +8364,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(739),
-            target: TransformTarget::Callable(DeclarationId(1924)),
+            target: TransformTarget::Callable(DeclarationId(1925)),
             inputs: vec![PortId(889)],
             output: PortId(890),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11811, 11923),
@@ -8385,7 +8385,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(742),
-            target: TransformTarget::Callable(DeclarationId(1924)),
+            target: TransformTarget::Callable(DeclarationId(1925)),
             inputs: vec![PortId(892)],
             output: PortId(893),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 11951, 12132),
@@ -8445,7 +8445,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(747),
-            target: TransformTarget::Callable(DeclarationId(1924)),
+            target: TransformTarget::Callable(DeclarationId(1925)),
             inputs: vec![PortId(898)],
             output: PortId(899),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12168, 12329),
@@ -8547,21 +8547,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(754),
-            target: TransformTarget::Callable(DeclarationId(2132)),
+            target: TransformTarget::Callable(DeclarationId(2133)),
             inputs: vec![],
             output: PortId(910),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12959, 12969),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(755),
-            target: TransformTarget::Callable(DeclarationId(2133)),
+            target: TransformTarget::Callable(DeclarationId(2134)),
             inputs: vec![],
             output: PortId(911),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 12987, 12996),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(756),
-            target: TransformTarget::Callable(DeclarationId(2134)),
+            target: TransformTarget::Callable(DeclarationId(2135)),
             inputs: vec![],
             output: PortId(912),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13010, 13015),
@@ -8646,7 +8646,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(762),
-            target: TransformTarget::Callable(DeclarationId(2137)),
+            target: TransformTarget::Callable(DeclarationId(2138)),
             inputs: vec![PortId(919)],
             output: PortId(920),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13939, 13980),
@@ -8660,7 +8660,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(764),
-            target: TransformTarget::Callable(DeclarationId(2138)),
+            target: TransformTarget::Callable(DeclarationId(2139)),
             inputs: vec![PortId(921)],
             output: PortId(922),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13986, 14027),
@@ -8715,7 +8715,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(769),
-            target: TransformTarget::Callable(DeclarationId(2139)),
+            target: TransformTarget::Callable(DeclarationId(2140)),
             inputs: vec![PortId(927)],
             output: PortId(928),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14090, 14131),
@@ -8729,7 +8729,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(771),
-            target: TransformTarget::Callable(DeclarationId(2140)),
+            target: TransformTarget::Callable(DeclarationId(2141)),
             inputs: vec![PortId(929)],
             output: PortId(930),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14137, 14178),
@@ -8784,7 +8784,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(776),
-            target: TransformTarget::Callable(DeclarationId(2141)),
+            target: TransformTarget::Callable(DeclarationId(2142)),
             inputs: vec![PortId(935)],
             output: PortId(936),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14238, 14279),
@@ -8798,7 +8798,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(778),
-            target: TransformTarget::Callable(DeclarationId(2142)),
+            target: TransformTarget::Callable(DeclarationId(2143)),
             inputs: vec![PortId(937)],
             output: PortId(938),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14285, 14326),
@@ -8853,7 +8853,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(783),
-            target: TransformTarget::Callable(DeclarationId(2143)),
+            target: TransformTarget::Callable(DeclarationId(2144)),
             inputs: vec![PortId(943)],
             output: PortId(944),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14384, 14425),
@@ -8867,7 +8867,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(785),
-            target: TransformTarget::Callable(DeclarationId(2144)),
+            target: TransformTarget::Callable(DeclarationId(2145)),
             inputs: vec![PortId(945)],
             output: PortId(946),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14431, 14472),
@@ -8922,7 +8922,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(790),
-            target: TransformTarget::Callable(DeclarationId(2145)),
+            target: TransformTarget::Callable(DeclarationId(2146)),
             inputs: vec![PortId(951)],
             output: PortId(952),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14530, 14571),
@@ -8936,7 +8936,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(792),
-            target: TransformTarget::Callable(DeclarationId(2146)),
+            target: TransformTarget::Callable(DeclarationId(2147)),
             inputs: vec![PortId(953)],
             output: PortId(954),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14577, 14618),
@@ -9071,14 +9071,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(799),
-            target: TransformTarget::Callable(DeclarationId(1923)),
+            target: TransformTarget::Callable(DeclarationId(1924)),
             inputs: vec![],
             output: PortId(963),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14802, 14814),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(800),
-            target: TransformTarget::Callable(DeclarationId(1923)),
+            target: TransformTarget::Callable(DeclarationId(1924)),
             inputs: vec![],
             output: PortId(964),
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 14820, 14832),
@@ -9196,14 +9196,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
             target: TransformTarget::Callable(DeclarationId(1289)),
             inputs: vec![PortId(974)],
             output: PortId(975),
-            span: SourceSpan::new("src/v3/std/verification.dag", 28548, 28571),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28552, 28575),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(811),
             target: TransformTarget::Callable(DeclarationId(1290)),
             inputs: vec![PortId(976)],
             output: PortId(977),
-            span: SourceSpan::new("src/v3/std/verification.dag", 28593, 28627),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28597, 28631),
         }));
         nodes.push(Behavior::Branch(BranchNode {
             id: NodeId(812),
@@ -9214,7 +9214,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     output: PortId(975),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Enumerated".to_string(),
-                        span: SourceSpan::new("src/v3/std/verification.dag", 28531, 28544),
+                        span: SourceSpan::new("src/v3/std/verification.dag", 28535, 28548),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "c".to_string(),
@@ -9226,7 +9226,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                     output: PortId(977),
                     pattern: BranchPattern::UnresolvedVariant {
                         name: "Quantified".to_string(),
-                        span: SourceSpan::new("src/v3/std/verification.dag", 28576, 28589),
+                        span: SourceSpan::new("src/v3/std/verification.dag", 28580, 28593),
                     },
                     binding: Some(PayloadBinding {
                         binding_name: "q".to_string(),
@@ -9235,7 +9235,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
                 },
             ],
             output: PortId(978),
-            span: SourceSpan::new("src/v3/std/verification.dag", 28513, 28631),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28517, 28635),
             emit_participation: Some(BranchEmitParticipation::UserMatch),
         }));
         nodes.push(Behavior::Bind(BindNode {
@@ -9243,7 +9243,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
             name: "obligation_for_suite_claim".to_string(),
             value: PortId(978),
             params: vec![PortId(973)],
-            span: SourceSpan::new("src/v3/std/verification.dag", 28513, 28631),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28517, 28635),
             lane2_workflow: None,
             emit_participation: Some(BindEmitParticipation::UserCallable),
         }));
@@ -9862,7 +9862,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(2878);
+        let mut declarations = Vec::with_capacity(2879);
         declarations.push(Declaration {
             id: DeclarationId(0),
             name: Some("Classical".to_string()),
@@ -24070,11 +24070,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Empty".to_string(),
-                        ty: DeclarationId(1433),
+                        ty: DeclarationId(1434),
                     },
                     Field {
                         label: "Cons".to_string(),
-                        ty: DeclarationId(1435),
+                        ty: DeclarationId(1436),
                     },
                 ],
             },
@@ -24107,7 +24107,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1403),
+                output: DeclarationId(1404),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3273, 3284)),
             },
             type_params: vec![DeclarationId(688)],
@@ -24138,8 +24138,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(689),
             name: Some("cons".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(690), DeclarationId(1404)],
-                output: DeclarationId(1405),
+                inputs: vec![DeclarationId(690), DeclarationId(1405)],
+                output: DeclarationId(1406),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3453, 3475)),
             },
             type_params: vec![DeclarationId(690)],
@@ -24171,7 +24171,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("singleton".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(692)],
-                output: DeclarationId(1406),
+                output: DeclarationId(1407),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3570, 3590)),
             },
             type_params: vec![DeclarationId(692)],
@@ -24202,7 +24202,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(693),
             name: Some("fold".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1407), DeclarationId(695), DeclarationId(1408)],
+                inputs: vec![DeclarationId(1408), DeclarationId(695), DeclarationId(1409)],
                 output: DeclarationId(695),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4203, 4307)),
             },
@@ -24248,7 +24248,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(696),
             name: Some("fold_right".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1409), DeclarationId(698), DeclarationId(1410)],
+                inputs: vec![DeclarationId(1410), DeclarationId(698), DeclarationId(1411)],
                 output: DeclarationId(698),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4658, 4768)),
             },
@@ -24294,8 +24294,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(699),
             name: Some("concat".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1411), DeclarationId(1412)],
-                output: DeclarationId(1413),
+                inputs: vec![DeclarationId(1412), DeclarationId(1413)],
+                output: DeclarationId(1414),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5386, 5414)),
             },
             type_params: vec![DeclarationId(700)],
@@ -24326,8 +24326,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(701),
             name: Some("map".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1414), DeclarationId(1415)],
-                output: DeclarationId(1416),
+                inputs: vec![DeclarationId(1415), DeclarationId(1416)],
+                output: DeclarationId(1417),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5721, 5778)),
             },
             type_params: vec![DeclarationId(702), DeclarationId(703)],
@@ -24372,8 +24372,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(704),
             name: Some("filter".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1417), DeclarationId(1418)],
-                output: DeclarationId(1419),
+                inputs: vec![DeclarationId(1418), DeclarationId(1419)],
+                output: DeclarationId(1420),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5905, 5988)),
             },
             type_params: vec![DeclarationId(705)],
@@ -24404,8 +24404,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(706),
             name: Some("flat_map".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1420), DeclarationId(1422)],
-                output: DeclarationId(1423),
+                inputs: vec![DeclarationId(1421), DeclarationId(1423)],
+                output: DeclarationId(1424),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6171, 6230)),
             },
             type_params: vec![DeclarationId(707), DeclarationId(708)],
@@ -24450,7 +24450,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(709),
             name: Some("length".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1424)],
+                inputs: vec![DeclarationId(1425)],
                 output: DeclarationId(93),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6372, 6409)),
             },
@@ -24482,7 +24482,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(711),
             name: Some("is_empty".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1425)],
+                inputs: vec![DeclarationId(1426)],
                 output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6605, 6671)),
             },
@@ -24553,8 +24553,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(715),
             name: Some("enumerate".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1426)],
-                output: DeclarationId(1428),
+                inputs: vec![DeclarationId(1427)],
+                output: DeclarationId(1429),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7238, 7269)),
             },
             type_params: vec![DeclarationId(716)],
@@ -24585,8 +24585,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(717),
             name: Some("enumerate_helper".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1429), DeclarationId(93)],
-                output: DeclarationId(1431),
+                inputs: vec![DeclarationId(1430), DeclarationId(93)],
+                output: DeclarationId(1432),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7463, 7644)),
             },
             type_params: vec![DeclarationId(718)],
@@ -24617,7 +24617,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(719),
             name: Some("contains".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1432), DeclarationId(720)],
+                inputs: vec![DeclarationId(1433), DeclarationId(720)],
                 output: DeclarationId(128),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 8205, 8332)),
             },
@@ -24712,7 +24712,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "rest".to_string(),
-                        ty: DeclarationId(1436),
+                        ty: DeclarationId(1437),
                     },
                 ],
             },
@@ -24755,7 +24755,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "rest".to_string(),
-                        ty: DeclarationId(1437),
+                        ty: DeclarationId(1438),
                     },
                 ],
             },
@@ -24790,11 +24790,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LiteralToken".to_string(),
-                        ty: DeclarationId(1452),
+                        ty: DeclarationId(1453),
                     },
                     Field {
                         label: "ParamToken".to_string(),
-                        ty: DeclarationId(1453),
+                        ty: DeclarationId(1454),
                     },
                 ],
             },
@@ -24814,7 +24814,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tokens".to_string(),
-                    ty: DeclarationId(1454),
+                    ty: DeclarationId(1455),
                 }],
             },
             type_params: vec![],
@@ -24834,11 +24834,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ParsedSegmentTokens".to_string(),
-                        ty: DeclarationId(1456),
+                        ty: DeclarationId(1457),
                     },
                     Field {
                         label: "MalformedPathSegment".to_string(),
-                        ty: DeclarationId(1457),
+                        ty: DeclarationId(1458),
                     },
                 ],
             },
@@ -24859,11 +24859,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ParsedPathTemplate".to_string(),
-                        ty: DeclarationId(1458),
+                        ty: DeclarationId(1459),
                     },
                     Field {
                         label: "MalformedPathTemplate".to_string(),
-                        ty: DeclarationId(1459),
+                        ty: DeclarationId(1460),
                     },
                 ],
             },
@@ -24918,7 +24918,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("last_path_param".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(730)],
-                output: DeclarationId(1438),
+                output: DeclarationId(1439),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 11761, 12044)),
             },
             type_params: vec![],
@@ -24938,15 +24938,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ReadEffect".to_string(),
-                        ty: DeclarationId(1460),
+                        ty: DeclarationId(1461),
                     },
                     Field {
                         label: "UpsertEffect".to_string(),
-                        ty: DeclarationId(1461),
+                        ty: DeclarationId(1462),
                     },
                     Field {
                         label: "DeleteEffect".to_string(),
-                        ty: DeclarationId(1462),
+                        ty: DeclarationId(1463),
                     },
                 ],
             },
@@ -24958,7 +24958,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/effects.dag", 14330, 14451),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14328, 14449),
         });
         declarations.push(Declaration {
             id: DeclarationId(737),
@@ -24967,11 +24967,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "CreateEffect".to_string(),
-                        ty: DeclarationId(1463),
+                        ty: DeclarationId(1464),
                     },
                     Field {
                         label: "AppendEffect".to_string(),
-                        ty: DeclarationId(1464),
+                        ty: DeclarationId(1465),
                     },
                 ],
             },
@@ -24983,7 +24983,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/effects.dag", 14674, 14749),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14672, 14747),
         });
         declarations.push(Declaration {
             id: DeclarationId(738),
@@ -24992,11 +24992,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IsIdempotent".to_string(),
-                        ty: DeclarationId(1465),
+                        ty: DeclarationId(1466),
                     },
                     Field {
                         label: "IsBreaking".to_string(),
-                        ty: DeclarationId(1466),
+                        ty: DeclarationId(1467),
                     },
                 ],
             },
@@ -25008,7 +25008,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/effects.dag", 15150, 15230),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15148, 15228),
         });
         declarations.push(Declaration {
             id: DeclarationId(739),
@@ -25017,11 +25017,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "PostAlways".to_string(),
-                        ty: DeclarationId(1467),
+                        ty: DeclarationId(1468),
                     },
                     Field {
                         label: "KeylessFallback".to_string(),
-                        ty: DeclarationId(1468),
+                        ty: DeclarationId(1469),
                     },
                 ],
             },
@@ -25033,7 +25033,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/effects.dag", 15722, 15796),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15720, 15794),
         });
         declarations.push(Declaration {
             id: DeclarationId(740),
@@ -25042,15 +25042,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "PathParam".to_string(),
-                        ty: DeclarationId(1469),
+                        ty: DeclarationId(1470),
                     },
                     Field {
                         label: "InputField".to_string(),
-                        ty: DeclarationId(1470),
+                        ty: DeclarationId(1471),
                     },
                     Field {
                         label: "CompositeKey".to_string(),
-                        ty: DeclarationId(1472),
+                        ty: DeclarationId(1473),
                     },
                 ],
             },
@@ -25062,7 +25062,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/effects.dag", 16482, 16603),
+            span: SourceSpan::new("src/v3/std/effects.dag", 16480, 16601),
         });
         declarations.push(Declaration {
             id: DeclarationId(741),
@@ -25071,15 +25071,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LatticeEffect".to_string(),
-                        ty: DeclarationId(1473),
+                        ty: DeclarationId(1474),
                     },
                     Field {
                         label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(1474),
+                        ty: DeclarationId(1475),
                     },
                     Field {
                         label: "NonIdempotent".to_string(),
-                        ty: DeclarationId(1475),
+                        ty: DeclarationId(1476),
                     },
                 ],
             },
@@ -25091,7 +25091,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/effects.dag", 17251, 17349),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17249, 17347),
         });
         declarations.push(Declaration {
             id: DeclarationId(742),
@@ -25099,7 +25099,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(738)],
                 output: DeclarationId(128),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 17576, 17648)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 17574, 17646)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25109,7 +25109,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/effects.dag", 17524, 17648),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17522, 17646),
         });
         declarations.push(Declaration {
             id: DeclarationId(743),
@@ -25117,7 +25117,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(738)],
                 output: DeclarationId(741),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 17861, 18381)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 17859, 18379)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25127,7 +25127,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/effects.dag", 17787, 18381),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17785, 18379),
         });
         declarations.push(Declaration {
             id: DeclarationId(744),
@@ -25152,7 +25152,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/effects.dag", 19065, 19135),
+            span: SourceSpan::new("src/v3/std/effects.dag", 19063, 19133),
         });
         declarations.push(Declaration {
             id: DeclarationId(745),
@@ -25161,15 +25161,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DerivedEffect".to_string(),
-                        ty: DeclarationId(1476),
+                        ty: DeclarationId(1477),
                     },
                     Field {
                         label: "UnknownHttpMethodInput".to_string(),
-                        ty: DeclarationId(1477),
+                        ty: DeclarationId(1478),
                     },
                     Field {
                         label: "MalformedPathInput".to_string(),
-                        ty: DeclarationId(1478),
+                        ty: DeclarationId(1479),
                     },
                 ],
             },
@@ -25181,7 +25181,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/effects.dag", 19489, 19789),
+            span: SourceSpan::new("src/v3/std/effects.dag", 19487, 19787),
         });
         declarations.push(Declaration {
             id: DeclarationId(746),
@@ -25190,11 +25190,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IdempotentComposition".to_string(),
-                        ty: DeclarationId(1479),
+                        ty: DeclarationId(1480),
                     },
                     Field {
                         label: "BrokenBy".to_string(),
-                        ty: DeclarationId(1481),
+                        ty: DeclarationId(1482),
                     },
                 ],
             },
@@ -25206,7 +25206,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/effects.dag", 20510, 20619),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20508, 20617),
         });
         declarations.push(Declaration {
             id: DeclarationId(747),
@@ -25214,7 +25214,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744)],
                 output: DeclarationId(128),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20809, 20884)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20807, 20882)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25224,15 +25224,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20755, 20884),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20753, 20882),
         });
         declarations.push(Declaration {
             id: DeclarationId(748),
             name: Some("breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(1439),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20944, 20966)),
+                output: DeclarationId(1440),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20942, 20964)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25242,15 +25242,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20886, 20966),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20884, 20964),
         });
         declarations.push(Declaration {
             id: DeclarationId(749),
             name: Some("indexed_breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1440)],
-                output: DeclarationId(1442),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21060, 21153)),
+                inputs: vec![DeclarationId(1441)],
+                output: DeclarationId(1443),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21058, 21151)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25260,15 +25260,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20968, 21153),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20966, 21151),
         });
         declarations.push(Declaration {
             id: DeclarationId(750),
             name: Some("first_breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1443)],
-                output: DeclarationId(1445),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21240, 21423)),
+                inputs: vec![DeclarationId(1444)],
+                output: DeclarationId(1446),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21238, 21421)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25278,15 +25278,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21155, 21423),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21153, 21421),
         });
         declarations.push(Declaration {
             id: DeclarationId(751),
             name: Some("compose_effects".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1446)],
+                inputs: vec![DeclarationId(1447)],
                 output: DeclarationId(746),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22313, 22436)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22311, 22434)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25296,7 +25296,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/effects.dag", 22240, 22436),
+            span: SourceSpan::new("src/v3/std/effects.dag", 22238, 22434),
         });
         declarations.push(Declaration {
             id: DeclarationId(752),
@@ -25315,7 +25315,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/effects.dag", 23637, 23672),
+            span: SourceSpan::new("src/v3/std/effects.dag", 23635, 23670),
         });
         declarations.push(Declaration {
             id: DeclarationId(753),
@@ -25340,7 +25340,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/effects.dag", 23757, 23823),
+            span: SourceSpan::new("src/v3/std/effects.dag", 23755, 23821),
         });
         declarations.push(Declaration {
             id: DeclarationId(754),
@@ -25349,19 +25349,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LinearEffect".to_string(),
-                        ty: DeclarationId(1483),
+                        ty: DeclarationId(1484),
                     },
                     Field {
                         label: "BranchEffect".to_string(),
-                        ty: DeclarationId(1485),
+                        ty: DeclarationId(1486),
                     },
                     Field {
                         label: "LoopEffect".to_string(),
-                        ty: DeclarationId(1486),
+                        ty: DeclarationId(1487),
                     },
                     Field {
                         label: "ParallelEffect".to_string(),
-                        ty: DeclarationId(1488),
+                        ty: DeclarationId(1489),
                     },
                 ],
             },
@@ -25373,7 +25373,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/effects.dag", 24499, 24727),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24497, 24725),
         });
         declarations.push(Declaration {
             id: DeclarationId(755),
@@ -25402,7 +25402,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/effects.dag", 25086, 25190),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25084, 25188),
         });
         declarations.push(Declaration {
             id: DeclarationId(756),
@@ -25411,11 +25411,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "WorkflowCompositionVerdict".to_string(),
-                        ty: DeclarationId(1489),
+                        ty: DeclarationId(1490),
                     },
                     Field {
                         label: "IdempotencyUnsupported".to_string(),
-                        ty: DeclarationId(1490),
+                        ty: DeclarationId(1491),
                     },
                 ],
             },
@@ -25427,7 +25427,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/effects.dag", 25329, 25467),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25327, 25465),
         });
         declarations.push(Declaration {
             id: DeclarationId(757),
@@ -25435,7 +25435,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230), DeclarationId(230), DeclarationId(230)],
                 output: DeclarationId(756),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 25609, 25765)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 25607, 25763)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25445,7 +25445,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/effects.dag", 25469, 25765),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25467, 25763),
         });
         declarations.push(Declaration {
             id: DeclarationId(758),
@@ -25454,23 +25454,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NoWorkflowProjection".to_string(),
-                        ty: DeclarationId(1491),
+                        ty: DeclarationId(1492),
                     },
                     Field {
                         label: "NotParallelEffectRoot".to_string(),
-                        ty: DeclarationId(1492),
+                        ty: DeclarationId(1493),
                     },
                     Field {
                         label: "NonLinearParallelBranch".to_string(),
-                        ty: DeclarationId(1493),
+                        ty: DeclarationId(1494),
                     },
                     Field {
                         label: "PairwiseNonCommute".to_string(),
-                        ty: DeclarationId(1494),
+                        ty: DeclarationId(1495),
                     },
                     Field {
                         label: "LensSurfacePending".to_string(),
-                        ty: DeclarationId(1495),
+                        ty: DeclarationId(1496),
                     },
                 ],
             },
@@ -25482,7 +25482,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/effects.dag", 25928, 26084),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25926, 26082),
         });
         declarations.push(Declaration {
             id: DeclarationId(759),
@@ -25511,7 +25511,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/effects.dag", 26086, 26202),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26084, 26200),
         });
         declarations.push(Declaration {
             id: DeclarationId(760),
@@ -25520,11 +25520,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ParallelCompositionVerdict".to_string(),
-                        ty: DeclarationId(1496),
+                        ty: DeclarationId(1497),
                     },
                     Field {
                         label: "ParallelismUnsupported".to_string(),
-                        ty: DeclarationId(1497),
+                        ty: DeclarationId(1498),
                     },
                 ],
             },
@@ -25536,7 +25536,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/effects.dag", 26366, 26504),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26364, 26502),
         });
         declarations.push(Declaration {
             id: DeclarationId(761),
@@ -25544,7 +25544,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(758), DeclarationId(230)],
                 output: DeclarationId(760),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 26625, 26780)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 26623, 26778)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25554,7 +25554,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/effects.dag", 26506, 26780),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26504, 26778),
         });
         declarations.push(Declaration {
             id: DeclarationId(762),
@@ -25562,7 +25562,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(754)],
                 output: DeclarationId(756),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 27018, 27848)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 27016, 27846)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25572,15 +25572,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 26932, 27848),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26930, 27846),
         });
         declarations.push(Declaration {
             id: DeclarationId(763),
             name: Some("parse_http_method".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230)],
-                output: DeclarationId(1447),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 29707, 30005)),
+                output: DeclarationId(1448),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 29705, 30003)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25590,7 +25590,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/effects.dag", 29658, 30005),
+            span: SourceSpan::new("src/v3/std/effects.dag", 29656, 30003),
         });
         declarations.push(Declaration {
             id: DeclarationId(764),
@@ -25598,7 +25598,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(198)],
                 output: DeclarationId(738),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30060, 30136)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30058, 30134)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25608,15 +25608,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30007, 30136),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30005, 30134),
         });
         declarations.push(Declaration {
             id: DeclarationId(765),
             name: Some("upsert_or_create".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1448), DeclarationId(198)],
+                inputs: vec![DeclarationId(1449), DeclarationId(198)],
                 output: DeclarationId(738),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30476, 30628)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30474, 30626)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25626,15 +25626,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30400, 30628),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30398, 30626),
         });
         declarations.push(Declaration {
             id: DeclarationId(766),
             name: Some("delete_or_create".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1449), DeclarationId(198)],
+                inputs: vec![DeclarationId(1450), DeclarationId(198)],
                 output: DeclarationId(738),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30706, 30858)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30704, 30856)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25644,7 +25644,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/effects.dag", 30630, 30858),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30628, 30856),
         });
         declarations.push(Declaration {
             id: DeclarationId(767),
@@ -25652,7 +25652,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(198), DeclarationId(730)],
                 output: DeclarationId(738),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30944, 31429)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30942, 31427)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25662,7 +25662,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/effects.dag", 30860, 31429),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30858, 31427),
         });
         declarations.push(Declaration {
             id: DeclarationId(768),
@@ -25670,7 +25670,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230), DeclarationId(198), DeclarationId(730)],
                 output: DeclarationId(745),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 31547, 31731)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 31545, 31729)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25680,7 +25680,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/effects.dag", 31431, 31731),
+            span: SourceSpan::new("src/v3/std/effects.dag", 31429, 31729),
         });
         declarations.push(Declaration {
             id: DeclarationId(769),
@@ -25689,15 +25689,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Agrees".to_string(),
-                        ty: DeclarationId(1498),
+                        ty: DeclarationId(1499),
                     },
                     Field {
                         label: "Disagrees".to_string(),
-                        ty: DeclarationId(1499),
+                        ty: DeclarationId(1500),
                     },
                     Field {
                         label: "DerivationUnknown".to_string(),
-                        ty: DeclarationId(1500),
+                        ty: DeclarationId(1501),
                     },
                 ],
             },
@@ -25709,7 +25709,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/effects.dag", 32431, 32548),
+            span: SourceSpan::new("src/v3/std/effects.dag", 32429, 32546),
         });
         declarations.push(Declaration {
             id: DeclarationId(770),
@@ -25718,11 +25718,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ModifierNotDeclared".to_string(),
-                        ty: DeclarationId(1501),
+                        ty: DeclarationId(1502),
                     },
                     Field {
                         label: "ModifierDeclared".to_string(),
-                        ty: DeclarationId(1502),
+                        ty: DeclarationId(1503),
                     },
                 ],
             },
@@ -25734,7 +25734,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/effects.dag", 32995, 33095),
+            span: SourceSpan::new("src/v3/std/effects.dag", 32993, 33093),
         });
         declarations.push(Declaration {
             id: DeclarationId(771),
@@ -25767,7 +25767,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/effects.dag", 33097, 33247),
+            span: SourceSpan::new("src/v3/std/effects.dag", 33095, 33245),
         });
         declarations.push(Declaration {
             id: DeclarationId(772),
@@ -25775,7 +25775,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(737)],
                 output: DeclarationId(769),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 33886, 34428)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 33884, 34426)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25785,7 +25785,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/effects.dag", 33807, 34428),
+            span: SourceSpan::new("src/v3/std/effects.dag", 33805, 34426),
         });
         declarations.push(Declaration {
             id: DeclarationId(773),
@@ -25793,7 +25793,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(738)],
                 output: DeclarationId(769),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 34832, 35274)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 34830, 35272)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25803,7 +25803,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/effects.dag", 34760, 35274),
+            span: SourceSpan::new("src/v3/std/effects.dag", 34758, 35272),
         });
         declarations.push(Declaration {
             id: DeclarationId(774),
@@ -25811,7 +25811,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(744), DeclarationId(128), DeclarationId(128)],
                 output: DeclarationId(771),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 35406, 36055)),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 35404, 36053)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25821,7 +25821,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/effects.dag", 35276, 36055),
+            span: SourceSpan::new("src/v3/std/effects.dag", 35274, 36053),
         });
         declarations.push(Declaration {
             id: DeclarationId(775),
@@ -25854,15 +25854,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 36407, 36535),
+            span: SourceSpan::new("src/v3/std/effects.dag", 36405, 36533),
         });
         declarations.push(Declaration {
             id: DeclarationId(776),
             name: Some("generate_idempotency_obligations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1450)],
-                output: DeclarationId(1451),
-                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 36640, 36910)),
+                inputs: vec![DeclarationId(1451)],
+                output: DeclarationId(1452),
+                body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 36638, 36908)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -25872,7 +25872,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/effects.dag", 36537, 36910),
+            span: SourceSpan::new("src/v3/std/effects.dag", 36535, 36908),
         });
         declarations.push(Declaration {
             id: DeclarationId(777),
@@ -25901,7 +25901,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/effects.dag", 37227, 37318),
+            span: SourceSpan::new("src/v3/std/effects.dag", 37225, 37316),
         });
         declarations.push(Declaration {
             id: DeclarationId(778),
@@ -25954,15 +25954,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Uninferred".to_string(),
-                        ty: DeclarationId(1511),
+                        ty: DeclarationId(1512),
                     },
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(1512),
+                        ty: DeclarationId(1513),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(1513),
+                        ty: DeclarationId(1514),
                     },
                 ],
             },
@@ -25991,7 +25991,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "produced_by".to_string(),
-                        ty: DeclarationId(1514),
+                        ty: DeclarationId(1515),
                     },
                 ],
             },
@@ -26012,15 +26012,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LitInt".to_string(),
-                        ty: DeclarationId(1515),
+                        ty: DeclarationId(1516),
                     },
                     Field {
                         label: "LitBool".to_string(),
-                        ty: DeclarationId(1516),
+                        ty: DeclarationId(1517),
                     },
                     Field {
                         label: "LitString".to_string(),
-                        ty: DeclarationId(1517),
+                        ty: DeclarationId(1518),
                     },
                 ],
             },
@@ -26041,23 +26041,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(1518),
+                        ty: DeclarationId(1519),
                     },
                     Field {
                         label: "UnresolvedIdentifier".to_string(),
-                        ty: DeclarationId(1519),
+                        ty: DeclarationId(1520),
                     },
                     Field {
                         label: "ResolvedByStructure".to_string(),
-                        ty: DeclarationId(1520),
+                        ty: DeclarationId(1521),
                     },
                     Field {
                         label: "ResolvedByName".to_string(),
-                        ty: DeclarationId(1521),
+                        ty: DeclarationId(1522),
                     },
                     Field {
                         label: "TypeParam".to_string(),
-                        ty: DeclarationId(1522),
+                        ty: DeclarationId(1523),
                     },
                 ],
             },
@@ -26078,15 +26078,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "OneUnit".to_string(),
-                        ty: DeclarationId(1523),
+                        ty: DeclarationId(1524),
                     },
                     Field {
                         label: "AdditionalUnit".to_string(),
-                        ty: DeclarationId(1524),
+                        ty: DeclarationId(1525),
                     },
                     Field {
                         label: "UnitCount".to_string(),
-                        ty: DeclarationId(1525),
+                        ty: DeclarationId(1526),
                     },
                 ],
             },
@@ -26107,11 +26107,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ZeroWidth".to_string(),
-                        ty: DeclarationId(1526),
+                        ty: DeclarationId(1527),
                     },
                     Field {
                         label: "PositiveWidth".to_string(),
-                        ty: DeclarationId(1527),
+                        ty: DeclarationId(1528),
                     },
                 ],
             },
@@ -26132,11 +26132,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "BoundedInterval".to_string(),
-                        ty: DeclarationId(1528),
+                        ty: DeclarationId(1529),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1529),
+                        ty: DeclarationId(1530),
                     },
                 ],
             },
@@ -26191,11 +26191,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "StaticBound".to_string(),
-                        ty: DeclarationId(1531),
+                        ty: DeclarationId(1532),
                     },
                     Field {
                         label: "PlatformDependent".to_string(),
-                        ty: DeclarationId(1532),
+                        ty: DeclarationId(1533),
                     },
                 ],
             },
@@ -26216,15 +26216,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Exact".to_string(),
-                        ty: DeclarationId(1533),
+                        ty: DeclarationId(1534),
                     },
                     Field {
                         label: "AtMostOne".to_string(),
-                        ty: DeclarationId(1534),
+                        ty: DeclarationId(1535),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1535),
+                        ty: DeclarationId(1536),
                     },
                 ],
             },
@@ -26320,27 +26320,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(1536),
+                        ty: DeclarationId(1537),
                     },
                     Field {
                         label: "Reference".to_string(),
-                        ty: DeclarationId(1537),
+                        ty: DeclarationId(1538),
                     },
                     Field {
                         label: "Record".to_string(),
-                        ty: DeclarationId(1539),
+                        ty: DeclarationId(1540),
                     },
                     Field {
                         label: "List".to_string(),
-                        ty: DeclarationId(1541),
+                        ty: DeclarationId(1542),
                     },
                     Field {
                         label: "Map".to_string(),
-                        ty: DeclarationId(1543),
+                        ty: DeclarationId(1544),
                     },
                     Field {
                         label: "Variant".to_string(),
-                        ty: DeclarationId(1545),
+                        ty: DeclarationId(1546),
                     },
                 ],
             },
@@ -26361,23 +26361,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ValueBodyUnparsed".to_string(),
-                        ty: DeclarationId(1546),
+                        ty: DeclarationId(1547),
                     },
                     Field {
                         label: "ValueBodyStructural".to_string(),
-                        ty: DeclarationId(1548),
+                        ty: DeclarationId(1549),
                     },
                     Field {
                         label: "ValueBodyScalar".to_string(),
-                        ty: DeclarationId(1549),
+                        ty: DeclarationId(1550),
                     },
                     Field {
                         label: "ValueBodyList".to_string(),
-                        ty: DeclarationId(1551),
+                        ty: DeclarationId(1552),
                     },
                     Field {
                         label: "ValueBodyMap".to_string(),
-                        ty: DeclarationId(1553),
+                        ty: DeclarationId(1554),
                     },
                 ],
             },
@@ -26417,23 +26417,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UserDefined".to_string(),
-                        ty: DeclarationId(1554),
+                        ty: DeclarationId(1555),
                     },
                     Field {
                         label: "ExternalRealization".to_string(),
-                        ty: DeclarationId(1555),
+                        ty: DeclarationId(1556),
                     },
                     Field {
                         label: "Pending".to_string(),
-                        ty: DeclarationId(1556),
+                        ty: DeclarationId(1557),
                     },
                     Field {
                         label: "NoBody".to_string(),
-                        ty: DeclarationId(1557),
+                        ty: DeclarationId(1558),
                     },
                     Field {
                         label: "Unparsed".to_string(),
-                        ty: DeclarationId(1558),
+                        ty: DeclarationId(1559),
                     },
                 ],
             },
@@ -26454,27 +26454,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Atom".to_string(),
-                        ty: DeclarationId(1559),
+                        ty: DeclarationId(1560),
                     },
                     Field {
                         label: "Conj".to_string(),
-                        ty: DeclarationId(1561),
+                        ty: DeclarationId(1562),
                     },
                     Field {
                         label: "Disj".to_string(),
-                        ty: DeclarationId(1563),
+                        ty: DeclarationId(1564),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(1565),
+                        ty: DeclarationId(1566),
                     },
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(1566),
+                        ty: DeclarationId(1567),
                     },
                     Field {
                         label: "Instantiation".to_string(),
-                        ty: DeclarationId(1568),
+                        ty: DeclarationId(1569),
                     },
                 ],
             },
@@ -26499,7 +26499,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(1569),
+                        ty: DeclarationId(1570),
                     },
                     Field {
                         label: "connective".to_string(),
@@ -26507,27 +26507,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(1570),
+                        ty: DeclarationId(1571),
                     },
                     Field {
                         label: "phantom_params".to_string(),
-                        ty: DeclarationId(1571),
+                        ty: DeclarationId(1572),
                     },
                     Field {
                         label: "meta_tag".to_string(),
-                        ty: DeclarationId(1572),
+                        ty: DeclarationId(1573),
                     },
                     Field {
                         label: "inhabits".to_string(),
-                        ty: DeclarationId(1573),
+                        ty: DeclarationId(1574),
                     },
                     Field {
                         label: "value_body".to_string(),
-                        ty: DeclarationId(1574),
+                        ty: DeclarationId(1575),
                     },
                     Field {
                         label: "nominal_opacity".to_string(),
-                        ty: DeclarationId(1575),
+                        ty: DeclarationId(1576),
                     },
                     Field {
                         label: "span".to_string(),
@@ -26576,7 +26576,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "permitted_accessors".to_string(),
-                    ty: DeclarationId(1576),
+                    ty: DeclarationId(1577),
                 }],
             },
             type_params: vec![],
@@ -26596,19 +26596,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Add".to_string(),
-                        ty: DeclarationId(1577),
+                        ty: DeclarationId(1578),
                     },
                     Field {
                         label: "Sub".to_string(),
-                        ty: DeclarationId(1578),
+                        ty: DeclarationId(1579),
                     },
                     Field {
                         label: "Mul".to_string(),
-                        ty: DeclarationId(1579),
+                        ty: DeclarationId(1580),
                     },
                     Field {
                         label: "Div".to_string(),
-                        ty: DeclarationId(1580),
+                        ty: DeclarationId(1581),
                     },
                 ],
             },
@@ -26629,27 +26629,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(1581),
+                        ty: DeclarationId(1582),
                     },
                     Field {
                         label: "Ne".to_string(),
-                        ty: DeclarationId(1582),
+                        ty: DeclarationId(1583),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(1583),
+                        ty: DeclarationId(1584),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(1584),
+                        ty: DeclarationId(1585),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(1585),
+                        ty: DeclarationId(1586),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(1586),
+                        ty: DeclarationId(1587),
                     },
                 ],
             },
@@ -26695,11 +26695,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "And".to_string(),
-                        ty: DeclarationId(1587),
+                        ty: DeclarationId(1588),
                     },
                     Field {
                         label: "Or".to_string(),
-                        ty: DeclarationId(1588),
+                        ty: DeclarationId(1589),
                     },
                 ],
             },
@@ -26720,15 +26720,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Arithmetic".to_string(),
-                        ty: DeclarationId(1589),
+                        ty: DeclarationId(1590),
                     },
                     Field {
                         label: "Comparison".to_string(),
-                        ty: DeclarationId(1590),
+                        ty: DeclarationId(1591),
                     },
                     Field {
                         label: "Logical".to_string(),
-                        ty: DeclarationId(1591),
+                        ty: DeclarationId(1592),
                     },
                 ],
             },
@@ -26749,19 +26749,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Callable".to_string(),
-                        ty: DeclarationId(1592),
+                        ty: DeclarationId(1593),
                     },
                     Field {
                         label: "UnresolvedFieldProject".to_string(),
-                        ty: DeclarationId(1593),
+                        ty: DeclarationId(1594),
                     },
                     Field {
                         label: "ResolvedFieldProject".to_string(),
-                        ty: DeclarationId(1594),
+                        ty: DeclarationId(1595),
                     },
                     Field {
                         label: "Operator".to_string(),
-                        ty: DeclarationId(1595),
+                        ty: DeclarationId(1596),
                     },
                 ],
             },
@@ -26782,11 +26782,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UnresolvedVariant".to_string(),
-                        ty: DeclarationId(1596),
+                        ty: DeclarationId(1597),
                     },
                     Field {
                         label: "ResolvedVariant".to_string(),
-                        ty: DeclarationId(1597),
+                        ty: DeclarationId(1598),
                     },
                 ],
             },
@@ -26844,7 +26844,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "binding".to_string(),
-                        ty: DeclarationId(1598),
+                        ty: DeclarationId(1599),
                     },
                 ],
             },
@@ -26980,11 +26980,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "members".to_string(),
-                        ty: DeclarationId(1599),
+                        ty: DeclarationId(1600),
                     },
                     Field {
                         label: "intra_cluster_calls".to_string(),
-                        ty: DeclarationId(1600),
+                        ty: DeclarationId(1601),
                     },
                 ],
             },
@@ -27005,11 +27005,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(1601),
+                        ty: DeclarationId(1602),
                     },
                     Field {
                         label: "Descent".to_string(),
-                        ty: DeclarationId(1602),
+                        ty: DeclarationId(1603),
                     },
                 ],
             },
@@ -27064,7 +27064,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "lane2_workflow".to_string(),
-                        ty: DeclarationId(1603),
+                        ty: DeclarationId(1604),
                     },
                 ],
             },
@@ -27093,7 +27093,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(1604),
+                        ty: DeclarationId(1605),
                     },
                     Field {
                         label: "result_port".to_string(),
@@ -27121,7 +27121,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "UserMatch".to_string(),
-                    ty: DeclarationId(1605),
+                    ty: DeclarationId(1606),
                 }],
             },
             type_params: vec![],
@@ -27149,7 +27149,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "paths".to_string(),
-                        ty: DeclarationId(1606),
+                        ty: DeclarationId(1607),
                     },
                     Field {
                         label: "result_port".to_string(),
@@ -27161,7 +27161,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "emit_participation".to_string(),
-                        ty: DeclarationId(1607),
+                        ty: DeclarationId(1608),
                     },
                 ],
             },
@@ -27226,7 +27226,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "UserCallable".to_string(),
-                    ty: DeclarationId(1608),
+                    ty: DeclarationId(1609),
                 }],
             },
             type_params: vec![],
@@ -27258,7 +27258,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(1609),
+                        ty: DeclarationId(1610),
                     },
                     Field {
                         label: "span".to_string(),
@@ -27266,11 +27266,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "lane2_workflow".to_string(),
-                        ty: DeclarationId(1610),
+                        ty: DeclarationId(1611),
                     },
                     Field {
                         label: "emit_participation".to_string(),
-                        ty: DeclarationId(1611),
+                        ty: DeclarationId(1612),
                     },
                 ],
             },
@@ -27291,23 +27291,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Value".to_string(),
-                        ty: DeclarationId(1612),
+                        ty: DeclarationId(1613),
                     },
                     Field {
                         label: "Transform".to_string(),
-                        ty: DeclarationId(1613),
+                        ty: DeclarationId(1614),
                     },
                     Field {
                         label: "Branch".to_string(),
-                        ty: DeclarationId(1614),
+                        ty: DeclarationId(1615),
                     },
                     Field {
                         label: "Loop".to_string(),
-                        ty: DeclarationId(1615),
+                        ty: DeclarationId(1616),
                     },
                     Field {
                         label: "Bind".to_string(),
-                        ty: DeclarationId(1616),
+                        ty: DeclarationId(1617),
                     },
                 ],
             },
@@ -27328,19 +27328,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "declarations".to_string(),
-                        ty: DeclarationId(1617),
+                        ty: DeclarationId(1618),
                     },
                     Field {
                         label: "nodes".to_string(),
-                        ty: DeclarationId(1618),
+                        ty: DeclarationId(1619),
                     },
                     Field {
                         label: "ports".to_string(),
-                        ty: DeclarationId(1619),
+                        ty: DeclarationId(1620),
                     },
                     Field {
                         label: "clusters".to_string(),
-                        ty: DeclarationId(1620),
+                        ty: DeclarationId(1621),
                     },
                 ],
             },
@@ -27407,7 +27407,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("port".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(722)],
-                output: DeclarationId(1503),
+                output: DeclarationId(1504),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22297,
@@ -27429,7 +27429,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("node".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-                output: DeclarationId(1504),
+                output: DeclarationId(1505),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22355,
@@ -27451,7 +27451,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("resolve_producer".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(722)],
-                output: DeclarationId(1505),
+                output: DeclarationId(1506),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22430,
@@ -27473,7 +27473,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("declaration_by_id".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(723)],
-                output: DeclarationId(1506),
+                output: DeclarationId(1507),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     22819,
@@ -27495,7 +27495,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("declaration_by_name".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(230)],
-                output: DeclarationId(1507),
+                output: DeclarationId(1508),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     23694,
@@ -27517,7 +27517,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("lane2_workflow_at".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-                output: DeclarationId(1508),
+                output: DeclarationId(1509),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     24020,
@@ -27541,15 +27541,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "SingleRoot".to_string(),
-                        ty: DeclarationId(1621),
+                        ty: DeclarationId(1622),
                     },
                     Field {
                         label: "NoRoot".to_string(),
-                        ty: DeclarationId(1622),
+                        ty: DeclarationId(1623),
                     },
                     Field {
                         label: "AmbiguousRoot".to_string(),
-                        ty: DeclarationId(1624),
+                        ty: DeclarationId(1625),
                     },
                 ],
             },
@@ -27590,7 +27590,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(1509),
+                output: DeclarationId(1510),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     28025,
@@ -27612,7 +27612,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(723)],
-                output: DeclarationId(1510),
+                output: DeclarationId(1511),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     28110,
@@ -27655,15 +27655,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ShrinkEffect".to_string(),
-                        ty: DeclarationId(1649),
+                        ty: DeclarationId(1650),
                     },
                     Field {
                         label: "ProjectionEffect".to_string(),
-                        ty: DeclarationId(1650),
+                        ty: DeclarationId(1651),
                     },
                     Field {
                         label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(1651),
+                        ty: DeclarationId(1652),
                     },
                 ],
             },
@@ -27684,19 +27684,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ShapeConstant".to_string(),
-                        ty: DeclarationId(1652),
+                        ty: DeclarationId(1653),
                     },
                     Field {
                         label: "ShapeLinearScan".to_string(),
-                        ty: DeclarationId(1653),
+                        ty: DeclarationId(1654),
                     },
                     Field {
                         label: "ShapeIterateBody".to_string(),
-                        ty: DeclarationId(1654),
+                        ty: DeclarationId(1655),
                     },
                     Field {
                         label: "ShapeSortBody".to_string(),
-                        ty: DeclarationId(1655),
+                        ty: DeclarationId(1656),
                     },
                 ],
             },
@@ -27725,15 +27725,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "size_effect".to_string(),
-                        ty: DeclarationId(1656),
+                        ty: DeclarationId(1657),
                     },
                     Field {
                         label: "cost_shape".to_string(),
-                        ty: DeclarationId(1657),
+                        ty: DeclarationId(1658),
                     },
                     Field {
                         label: "callback_element_position".to_string(),
-                        ty: DeclarationId(1658),
+                        ty: DeclarationId(1659),
                     },
                 ],
             },
@@ -27758,7 +27758,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "display_name".to_string(),
-                        ty: DeclarationId(1659),
+                        ty: DeclarationId(1660),
                     },
                 ],
             },
@@ -27815,11 +27815,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DegreeTwo".to_string(),
-                        ty: DeclarationId(1660),
+                        ty: DeclarationId(1661),
                     },
                     Field {
                         label: "DegreeSuccessor".to_string(),
-                        ty: DeclarationId(1661),
+                        ty: DeclarationId(1662),
                     },
                 ],
             },
@@ -27840,31 +27840,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ConstantCost".to_string(),
-                        ty: DeclarationId(1662),
+                        ty: DeclarationId(1663),
                     },
                     Field {
                         label: "LinearCost".to_string(),
-                        ty: DeclarationId(1663),
+                        ty: DeclarationId(1664),
                     },
                     Field {
                         label: "PolynomialCost".to_string(),
-                        ty: DeclarationId(1664),
+                        ty: DeclarationId(1665),
                     },
                     Field {
                         label: "ProductCost".to_string(),
-                        ty: DeclarationId(1666),
+                        ty: DeclarationId(1667),
                     },
                     Field {
                         label: "SumCost".to_string(),
-                        ty: DeclarationId(1668),
+                        ty: DeclarationId(1669),
                     },
                     Field {
                         label: "LogCost".to_string(),
-                        ty: DeclarationId(1669),
+                        ty: DeclarationId(1670),
                     },
                     Field {
                         label: "UnknownCost".to_string(),
-                        ty: DeclarationId(1670),
+                        ty: DeclarationId(1671),
                     },
                 ],
             },
@@ -27872,7 +27872,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-            inhabits: Some(DeclarationId(1671)),
+            inhabits: Some(DeclarationId(1672)),
             value_body: None,
             refinement: None,
             nominal_opacity: None,
@@ -27926,7 +27926,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(1625),
+                output: DeclarationId(1626),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 10963, 10973)),
             },
             type_params: vec![],
@@ -27944,7 +27944,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(849)],
-                output: DeclarationId(1626),
+                output: DeclarationId(1627),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 11047, 11062)),
             },
             type_params: vec![],
@@ -27962,7 +27962,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("two_terms".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(849), DeclarationId(849)],
-                output: DeclarationId(1627),
+                output: DeclarationId(1628),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(185))),
             },
             type_params: vec![],
@@ -27979,8 +27979,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(855),
             name: Some("many_terms".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(849), DeclarationId(849), DeclarationId(1628)],
-                output: DeclarationId(1629),
+                inputs: vec![DeclarationId(849), DeclarationId(849), DeclarationId(1629)],
+                output: DeclarationId(1630),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(187))),
             },
             type_params: vec![],
@@ -28105,7 +28105,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(862),
             name: Some("max_path".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1630)],
+                inputs: vec![DeclarationId(1631)],
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(220))),
             },
@@ -28162,35 +28162,35 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ClassConstant".to_string(),
-                        ty: DeclarationId(1672),
+                        ty: DeclarationId(1673),
                     },
                     Field {
                         label: "ClassLog".to_string(),
-                        ty: DeclarationId(1673),
+                        ty: DeclarationId(1674),
                     },
                     Field {
                         label: "ClassLinear".to_string(),
-                        ty: DeclarationId(1674),
+                        ty: DeclarationId(1675),
                     },
                     Field {
                         label: "ClassLinearithmic".to_string(),
-                        ty: DeclarationId(1675),
+                        ty: DeclarationId(1676),
                     },
                     Field {
                         label: "ClassQuadratic".to_string(),
-                        ty: DeclarationId(1676),
+                        ty: DeclarationId(1677),
                     },
                     Field {
                         label: "ClassPolynomial".to_string(),
-                        ty: DeclarationId(1677),
+                        ty: DeclarationId(1678),
                     },
                     Field {
                         label: "ClassExponential".to_string(),
-                        ty: DeclarationId(1678),
+                        ty: DeclarationId(1679),
                     },
                     Field {
                         label: "ClassUnknown".to_string(),
-                        ty: DeclarationId(1679),
+                        ty: DeclarationId(1680),
                     },
                 ],
             },
@@ -28198,7 +28198,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-            inhabits: Some(DeclarationId(1680)),
+            inhabits: Some(DeclarationId(1681)),
             value_body: None,
             refinement: None,
             nominal_opacity: None,
@@ -28298,8 +28298,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(871),
             name: Some("nsl_to_list".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1631)],
-                output: DeclarationId(1632),
+                inputs: vec![DeclarationId(1632)],
+                output: DeclarationId(1633),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(366))),
             },
             type_params: vec![],
@@ -28316,8 +28316,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(872),
             name: Some("drop_additive_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1633)],
-                output: DeclarationId(1634),
+                inputs: vec![DeclarationId(1634)],
+                output: DeclarationId(1635),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(379))),
             },
             type_params: vec![],
@@ -28334,8 +28334,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(873),
             name: Some("collapse_on_multiplicative_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1635)],
-                output: DeclarationId(1636),
+                inputs: vec![DeclarationId(1636)],
+                output: DeclarationId(1637),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(386))),
             },
             type_params: vec![],
@@ -28352,7 +28352,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(874),
             name: Some("any_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1637)],
+                inputs: vec![DeclarationId(1638)],
                 output: DeclarationId(128),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(395))),
             },
@@ -28370,8 +28370,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(875),
             name: Some("drop_multiplicative_one".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1638)],
-                output: DeclarationId(1639),
+                inputs: vec![DeclarationId(1639)],
+                output: DeclarationId(1640),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(408))),
             },
             type_params: vec![],
@@ -28424,7 +28424,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(878),
             name: Some("reduce_sum".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1640)],
+                inputs: vec![DeclarationId(1641)],
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(440))),
             },
@@ -28442,7 +28442,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(879),
             name: Some("wrap_sum".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1641)],
+                inputs: vec![DeclarationId(1642)],
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(452))),
             },
@@ -28460,7 +28460,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(880),
             name: Some("reduce_product".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1642)],
+                inputs: vec![DeclarationId(1643)],
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(469))),
             },
@@ -28609,8 +28609,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(888),
             name: Some("filter_not_dominated_by".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1643), DeclarationId(849)],
-                output: DeclarationId(1644),
+                inputs: vec![DeclarationId(1644), DeclarationId(849)],
+                output: DeclarationId(1645),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(517))),
             },
             type_params: vec![],
@@ -28627,8 +28627,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(889),
             name: Some("drop_dominated_step".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1645), DeclarationId(849)],
-                output: DeclarationId(1646),
+                inputs: vec![DeclarationId(1646), DeclarationId(849)],
+                output: DeclarationId(1647),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(524))),
             },
             type_params: vec![],
@@ -28645,8 +28645,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(890),
             name: Some("drop_dominated".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1647)],
-                output: DeclarationId(1648),
+                inputs: vec![DeclarationId(1648)],
+                output: DeclarationId(1649),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(527))),
             },
             type_params: vec![],
@@ -28666,10 +28666,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 inputs: vec![
                     DeclarationId(147),
                     DeclarationId(230),
-                    DeclarationId(1708),
-                    DeclarationId(93),
                     DeclarationId(1709),
+                    DeclarationId(93),
                     DeclarationId(1710),
+                    DeclarationId(1711),
                 ],
                 output: DeclarationId(912),
                 body: ArrowBody::Unparsed(SourceSpan::new(
@@ -28700,7 +28700,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1711)),
+            meta_tag: Some(DeclarationId(1712)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![])),
@@ -28715,11 +28715,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UserMessage".to_string(),
-                        ty: DeclarationId(1713),
+                        ty: DeclarationId(1714),
                     },
                     Field {
                         label: "AssistantMessage".to_string(),
-                        ty: DeclarationId(1715),
+                        ty: DeclarationId(1716),
                     },
                 ],
             },
@@ -28740,11 +28740,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Base64Image".to_string(),
-                        ty: DeclarationId(1716),
+                        ty: DeclarationId(1717),
                     },
                     Field {
                         label: "UrlImage".to_string(),
-                        ty: DeclarationId(1717),
+                        ty: DeclarationId(1718),
                     },
                 ],
             },
@@ -28765,11 +28765,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "TextContent".to_string(),
-                        ty: DeclarationId(1718),
+                        ty: DeclarationId(1719),
                     },
                     Field {
                         label: "ImageContent".to_string(),
-                        ty: DeclarationId(1719),
+                        ty: DeclarationId(1720),
                     },
                 ],
             },
@@ -28828,11 +28828,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ToolResultText".to_string(),
-                        ty: DeclarationId(1720),
+                        ty: DeclarationId(1721),
                     },
                     Field {
                         label: "ToolResultBlocks".to_string(),
-                        ty: DeclarationId(1722),
+                        ty: DeclarationId(1723),
                     },
                 ],
             },
@@ -28852,7 +28852,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Text".to_string(),
-                    ty: DeclarationId(1723),
+                    ty: DeclarationId(1724),
                 }],
             },
             type_params: vec![],
@@ -28871,7 +28871,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "TextPlain".to_string(),
-                    ty: DeclarationId(1724),
+                    ty: DeclarationId(1725),
                 }],
             },
             type_params: vec![],
@@ -28916,23 +28916,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "AnthropicTextBlock".to_string(),
-                        ty: DeclarationId(1725),
+                        ty: DeclarationId(1726),
                     },
                     Field {
                         label: "AnthropicImageBlock".to_string(),
-                        ty: DeclarationId(1726),
+                        ty: DeclarationId(1727),
                     },
                     Field {
                         label: "AnthropicDocumentBlock".to_string(),
-                        ty: DeclarationId(1727),
+                        ty: DeclarationId(1728),
                     },
                     Field {
                         label: "AnthropicSearchResultBlock".to_string(),
-                        ty: DeclarationId(1731),
+                        ty: DeclarationId(1732),
                     },
                     Field {
                         label: "AnthropicToolReferenceBlock".to_string(),
-                        ty: DeclarationId(1732),
+                        ty: DeclarationId(1733),
                     },
                 ],
             },
@@ -28982,11 +28982,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UserTextBlock".to_string(),
-                        ty: DeclarationId(1733),
+                        ty: DeclarationId(1734),
                     },
                     Field {
                         label: "UserToolResultBlock".to_string(),
-                        ty: DeclarationId(1736),
+                        ty: DeclarationId(1737),
                     },
                 ],
             },
@@ -29007,11 +29007,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "AssistantTextBlock".to_string(),
-                        ty: DeclarationId(1737),
+                        ty: DeclarationId(1738),
                     },
                     Field {
                         label: "AssistantToolUseBlock".to_string(),
-                        ty: DeclarationId(1738),
+                        ty: DeclarationId(1739),
                     },
                 ],
             },
@@ -29032,31 +29032,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "EndTurn".to_string(),
-                        ty: DeclarationId(1739),
+                        ty: DeclarationId(1740),
                     },
                     Field {
                         label: "MaxTokens".to_string(),
-                        ty: DeclarationId(1740),
+                        ty: DeclarationId(1741),
                     },
                     Field {
                         label: "StopSequence".to_string(),
-                        ty: DeclarationId(1741),
+                        ty: DeclarationId(1742),
                     },
                     Field {
                         label: "ToolUse".to_string(),
-                        ty: DeclarationId(1742),
+                        ty: DeclarationId(1743),
                     },
                     Field {
                         label: "PauseTurn".to_string(),
-                        ty: DeclarationId(1743),
+                        ty: DeclarationId(1744),
                     },
                     Field {
                         label: "Refusal".to_string(),
-                        ty: DeclarationId(1744),
+                        ty: DeclarationId(1745),
                     },
                     Field {
                         label: "ModelContextWindowExceeded".to_string(),
-                        ty: DeclarationId(1745),
+                        ty: DeclarationId(1746),
                     },
                 ],
             },
@@ -29077,23 +29077,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "CharLocation".to_string(),
-                        ty: DeclarationId(1748),
+                        ty: DeclarationId(1749),
                     },
                     Field {
                         label: "PageLocation".to_string(),
-                        ty: DeclarationId(1751),
+                        ty: DeclarationId(1752),
                     },
                     Field {
                         label: "ContentBlockLocation".to_string(),
-                        ty: DeclarationId(1754),
+                        ty: DeclarationId(1755),
                     },
                     Field {
                         label: "WebSearchResultLocation".to_string(),
-                        ty: DeclarationId(1756),
+                        ty: DeclarationId(1757),
                     },
                     Field {
                         label: "SearchResultLocation".to_string(),
-                        ty: DeclarationId(1758),
+                        ty: DeclarationId(1759),
                     },
                 ],
             },
@@ -29114,27 +29114,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "MessagesTextBlock".to_string(),
-                        ty: DeclarationId(1761),
+                        ty: DeclarationId(1762),
                     },
                     Field {
                         label: "MessagesThinkingBlock".to_string(),
-                        ty: DeclarationId(1762),
+                        ty: DeclarationId(1763),
                     },
                     Field {
                         label: "MessagesRedactedThinkingBlock".to_string(),
-                        ty: DeclarationId(1763),
+                        ty: DeclarationId(1764),
                     },
                     Field {
                         label: "MessagesToolUseBlock".to_string(),
-                        ty: DeclarationId(1765),
+                        ty: DeclarationId(1766),
                     },
                     Field {
                         label: "MessagesServerToolUseBlock".to_string(),
-                        ty: DeclarationId(1767),
+                        ty: DeclarationId(1768),
                     },
                     Field {
                         label: "MessagesWebSearchToolResultBlock".to_string(),
-                        ty: DeclarationId(1769),
+                        ty: DeclarationId(1770),
                     },
                 ],
             },
@@ -29155,35 +29155,35 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "WebSearch".to_string(),
-                        ty: DeclarationId(1770),
+                        ty: DeclarationId(1771),
                     },
                     Field {
                         label: "WebFetch".to_string(),
-                        ty: DeclarationId(1771),
+                        ty: DeclarationId(1772),
                     },
                     Field {
                         label: "CodeExecution".to_string(),
-                        ty: DeclarationId(1772),
+                        ty: DeclarationId(1773),
                     },
                     Field {
                         label: "BashCodeExecution".to_string(),
-                        ty: DeclarationId(1773),
+                        ty: DeclarationId(1774),
                     },
                     Field {
                         label: "TextEditorCodeExecution".to_string(),
-                        ty: DeclarationId(1774),
+                        ty: DeclarationId(1775),
                     },
                     Field {
                         label: "ToolSearchToolRegex".to_string(),
-                        ty: DeclarationId(1775),
+                        ty: DeclarationId(1776),
                     },
                     Field {
                         label: "ToolSearchToolBm25".to_string(),
-                        ty: DeclarationId(1776),
+                        ty: DeclarationId(1777),
                     },
                     Field {
                         label: "Advisor".to_string(),
-                        ty: DeclarationId(1777),
+                        ty: DeclarationId(1778),
                     },
                 ],
             },
@@ -29212,15 +29212,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "cache_creation_input_tokens".to_string(),
-                        ty: DeclarationId(1778),
+                        ty: DeclarationId(1779),
                     },
                     Field {
                         label: "cache_read_input_tokens".to_string(),
-                        ty: DeclarationId(1779),
+                        ty: DeclarationId(1780),
                     },
                     Field {
                         label: "service_tier".to_string(),
-                        ty: DeclarationId(1780),
+                        ty: DeclarationId(1781),
                     },
                 ],
             },
@@ -29240,7 +29240,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Assistant".to_string(),
-                    ty: DeclarationId(1781),
+                    ty: DeclarationId(1782),
                 }],
             },
             type_params: vec![],
@@ -29272,7 +29272,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(1782),
+                        ty: DeclarationId(1783),
                     },
                     Field {
                         label: "model".to_string(),
@@ -29284,7 +29284,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "stop_sequence".to_string(),
-                        ty: DeclarationId(1783),
+                        ty: DeclarationId(1784),
                     },
                     Field {
                         label: "usage".to_string(),
@@ -29292,7 +29292,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "container".to_string(),
-                        ty: DeclarationId(1784),
+                        ty: DeclarationId(1785),
                     },
                 ],
             },
@@ -29342,23 +29342,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "StdAuthority".to_string(),
-                        ty: DeclarationId(1785),
+                        ty: DeclarationId(1786),
                     },
                     Field {
                         label: "V3StdAuthority".to_string(),
-                        ty: DeclarationId(1786),
+                        ty: DeclarationId(1787),
                     },
                     Field {
                         label: "V3SpecAuthority".to_string(),
-                        ty: DeclarationId(1787),
+                        ty: DeclarationId(1788),
                     },
                     Field {
                         label: "CompilerAuthority".to_string(),
-                        ty: DeclarationId(1788),
+                        ty: DeclarationId(1789),
                     },
                     Field {
                         label: "ExtdepsFixtureAuthority".to_string(),
-                        ty: DeclarationId(1789),
+                        ty: DeclarationId(1790),
                     },
                 ],
             },
@@ -29415,483 +29415,483 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "dsl/std/logic.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1785),
+                            constructor: DeclarationId(1786),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/bit.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1785),
+                            constructor: DeclarationId(1786),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/error_primitives.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1785),
+                            constructor: DeclarationId(1786),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/algebra.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1785),
+                            constructor: DeclarationId(1786),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/magnitude.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1785),
+                            constructor: DeclarationId(1786),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/machine_constraints.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1785),
+                            constructor: DeclarationId(1786),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/nat.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1785),
+                            constructor: DeclarationId(1786),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/integer.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1785),
+                            constructor: DeclarationId(1786),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/rational.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1785),
+                            constructor: DeclarationId(1786),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/float.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1785),
+                            constructor: DeclarationId(1786),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/types.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1785),
+                            constructor: DeclarationId(1786),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/string_type.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1785),
+                            constructor: DeclarationId(1786),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/unicode.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1785),
+                            constructor: DeclarationId(1786),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/render_repeat_string_bootstrap.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1785),
+                            constructor: DeclarationId(1786),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/methods.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1785),
+                            constructor: DeclarationId(1786),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/serialization.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1785),
+                            constructor: DeclarationId(1786),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/algebra.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_messages.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_operations.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_schema.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/approximate_field.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bin_shim.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bootstrap_authority.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bridge_ledger.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/clean_emission.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/computation.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/computation_model.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/coproduct_projection.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/cross_target_coverage.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/diagnostics.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/dimensions.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/effects.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/emission_provenance.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/emit_model.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/extdeps_bootstrap_fixtures.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/go_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/induction.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/integer_diagnostic_order.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lens.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lens_application.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/list.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lookup.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/methods.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/parse_surface.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/python_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/resources.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/runtime.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/rust_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/services.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/substrate.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/substrate_minimal.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/termination.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/t_ci_workflow_as_data_demo.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/timing_lens.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/tokenize.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/verification.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/workflows.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1786),
+                            constructor: DeclarationId(1787),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/v3_l1.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1787),
+                            constructor: DeclarationId(1788),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/go.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1787),
+                            constructor: DeclarationId(1788),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/python.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1787),
+                            constructor: DeclarationId(1788),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/rust.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1787),
+                            constructor: DeclarationId(1788),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/pipeline.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1788),
+                            constructor: DeclarationId(1789),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/operators.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1788),
+                            constructor: DeclarationId(1789),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/regen.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1788),
+                            constructor: DeclarationId(1789),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/languages/rust/primitives.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1789),
+                            constructor: DeclarationId(1790),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/cron_schedule_model.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1789),
+                            constructor: DeclarationId(1790),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/github/github.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1789),
+                            constructor: DeclarationId(1790),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/github/actions.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1789),
+                            constructor: DeclarationId(1790),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/github/ci.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1789),
+                            constructor: DeclarationId(1790),
                             payload: vec![],
                         },
                     ),
@@ -29909,11 +29909,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Retired".to_string(),
-                        ty: DeclarationId(1790),
+                        ty: DeclarationId(1791),
                     },
                     Field {
                         label: "Open".to_string(),
-                        ty: DeclarationId(1791),
+                        ty: DeclarationId(1792),
                     },
                 ],
             },
@@ -29979,7 +29979,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6389, 6499),
         });
-        declarations.push(Declaration { id: DeclarationId(920), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(919) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1792)), 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(1791), 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(1790), 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(1790), 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(1790), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-pb-bridge-canonical-lens-name-dispatch-closure.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(1790), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/l1_5_fixed_point_test.rs".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(1790), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/bridge_lower_helpers_patch_zero_residual_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_semantic_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1791), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-v-bridge-row-4-exact-string-deeper-detail-receipt.md".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6963, 8416) });
+        declarations.push(Declaration { id: DeclarationId(920), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(919) }] }, 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(1791), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-pb-bridge-canonical-lens-name-dispatch-closure.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(1791), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/l1_5_fixed_point_test.rs".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(1791), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/bridge_lower_helpers_patch_zero_residual_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_semantic_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/r3-v-bridge-row-4-exact-string-deeper-detail-receipt.md".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6963, 8416) });
         declarations.push(Declaration {
             id: DeclarationId(921),
             name: Some("CleanEmissionContract".to_string()),
@@ -30065,15 +30065,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "WrapEverything".to_string(),
-                        ty: DeclarationId(1793),
+                        ty: DeclarationId(1794),
                     },
                     Field {
                         label: "WrapOnlyInOperandPosition".to_string(),
-                        ty: DeclarationId(1794),
+                        ty: DeclarationId(1795),
                     },
                     Field {
                         label: "NoWrapping".to_string(),
-                        ty: DeclarationId(1795),
+                        ty: DeclarationId(1796),
                     },
                 ],
             },
@@ -30094,19 +30094,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "EmitBindingAlways".to_string(),
-                        ty: DeclarationId(1796),
+                        ty: DeclarationId(1797),
                     },
                     Field {
                         label: "EmitUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(1797),
+                        ty: DeclarationId(1798),
                     },
                     Field {
                         label: "EmitPrefixedUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(1798),
+                        ty: DeclarationId(1799),
                     },
                     Field {
                         label: "NotApplicablePatternBinding".to_string(),
-                        ty: DeclarationId(1799),
+                        ty: DeclarationId(1800),
                     },
                 ],
             },
@@ -30127,11 +30127,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "AccessFromPayloadBinding".to_string(),
-                        ty: DeclarationId(1800),
+                        ty: DeclarationId(1801),
                     },
                     Field {
                         label: "OverrideNamedFieldsAtBindingSite".to_string(),
-                        ty: DeclarationId(1801),
+                        ty: DeclarationId(1802),
                     },
                 ],
             },
@@ -30152,15 +30152,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ImportEverythingDeclared".to_string(),
-                        ty: DeclarationId(1802),
+                        ty: DeclarationId(1803),
                     },
                     Field {
                         label: "IncludeOnlyReferenced".to_string(),
-                        ty: DeclarationId(1803),
+                        ty: DeclarationId(1804),
                     },
                     Field {
                         label: "ImportPerUsageSite".to_string(),
-                        ty: DeclarationId(1804),
+                        ty: DeclarationId(1805),
                     },
                 ],
             },
@@ -30181,15 +30181,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "WrapReturnValue".to_string(),
-                        ty: DeclarationId(1805),
+                        ty: DeclarationId(1806),
                     },
                     Field {
                         label: "NoWrappingOnTerminalExpression".to_string(),
-                        ty: DeclarationId(1806),
+                        ty: DeclarationId(1807),
                     },
                     Field {
                         label: "ExplicitReturnKeyword".to_string(),
-                        ty: DeclarationId(1807),
+                        ty: DeclarationId(1808),
                     },
                 ],
             },
@@ -30210,15 +30210,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "EmitLetBindingAlways".to_string(),
-                        ty: DeclarationId(1808),
+                        ty: DeclarationId(1809),
                     },
                     Field {
                         label: "EmitLetUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(1809),
+                        ty: DeclarationId(1810),
                     },
                     Field {
                         label: "OmitLetBinding".to_string(),
-                        ty: DeclarationId(1810),
+                        ty: DeclarationId(1811),
                     },
                 ],
             },
@@ -30239,15 +30239,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "WrapBody".to_string(),
-                        ty: DeclarationId(1811),
+                        ty: DeclarationId(1812),
                     },
                     Field {
                         label: "NoWrappingOnNonComplexBody".to_string(),
-                        ty: DeclarationId(1812),
+                        ty: DeclarationId(1813),
                     },
                     Field {
                         label: "NotApplicableMatchArmBody".to_string(),
-                        ty: DeclarationId(1813),
+                        ty: DeclarationId(1814),
                     },
                 ],
             },
@@ -30305,7 +30305,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(1814),
+                        ty: DeclarationId(1815),
                     },
                     Field {
                         label: "syntax_only".to_string(),
@@ -30338,19 +30338,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IgnoreVerifierOutput".to_string(),
-                        ty: DeclarationId(1815),
+                        ty: DeclarationId(1816),
                     },
                     Field {
                         label: "RequireEmptyStdout".to_string(),
-                        ty: DeclarationId(1816),
+                        ty: DeclarationId(1817),
                     },
                     Field {
                         label: "RequireEmptyStderr".to_string(),
-                        ty: DeclarationId(1817),
+                        ty: DeclarationId(1818),
                     },
                     Field {
                         label: "RequireEmptyStdoutAndStderr".to_string(),
-                        ty: DeclarationId(1818),
+                        ty: DeclarationId(1819),
                     },
                 ],
             },
@@ -30371,35 +30371,35 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "CollectionSize".to_string(),
-                        ty: DeclarationId(1825),
+                        ty: DeclarationId(1826),
                     },
                     Field {
                         label: "ParserStreamSize".to_string(),
-                        ty: DeclarationId(1826),
+                        ty: DeclarationId(1827),
                     },
                     Field {
                         label: "WorklistDrainSize".to_string(),
-                        ty: DeclarationId(1827),
+                        ty: DeclarationId(1828),
                     },
                     Field {
                         label: "TreeSize".to_string(),
-                        ty: DeclarationId(1828),
+                        ty: DeclarationId(1829),
                     },
                     Field {
                         label: "ArithmeticParam".to_string(),
-                        ty: DeclarationId(1829),
+                        ty: DeclarationId(1830),
                     },
                     Field {
                         label: "ExplicitCountZero".to_string(),
-                        ty: DeclarationId(1830),
+                        ty: DeclarationId(1831),
                     },
                     Field {
                         label: "ExplicitCountPositive".to_string(),
-                        ty: DeclarationId(1831),
+                        ty: DeclarationId(1832),
                     },
                     Field {
                         label: "Forever".to_string(),
-                        ty: DeclarationId(1832),
+                        ty: DeclarationId(1833),
                     },
                 ],
             },
@@ -30442,35 +30442,35 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ChildAccessorCall".to_string(),
-                        ty: DeclarationId(1833),
+                        ty: DeclarationId(1834),
                     },
                     Field {
                         label: "CollectionShrinkCall".to_string(),
-                        ty: DeclarationId(1834),
+                        ty: DeclarationId(1835),
                     },
                     Field {
                         label: "ArithmeticSubtractCall".to_string(),
-                        ty: DeclarationId(1835),
+                        ty: DeclarationId(1836),
                     },
                     Field {
                         label: "ArithmeticDivideCall".to_string(),
-                        ty: DeclarationId(1836),
+                        ty: DeclarationId(1837),
                     },
                     Field {
                         label: "ParserAdvanceCall".to_string(),
-                        ty: DeclarationId(1837),
+                        ty: DeclarationId(1838),
                     },
                     Field {
                         label: "WorklistDrainCall".to_string(),
-                        ty: DeclarationId(1838),
+                        ty: DeclarationId(1839),
                     },
                     Field {
                         label: "FoldBodyCall".to_string(),
-                        ty: DeclarationId(1839),
+                        ty: DeclarationId(1840),
                     },
                     Field {
                         label: "SameArgumentCall".to_string(),
-                        ty: DeclarationId(1840),
+                        ty: DeclarationId(1841),
                     },
                 ],
             },
@@ -30489,7 +30489,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("per_call_pattern_at".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-                output: DeclarationId(1819),
+                output: DeclarationId(1820),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     2764,
@@ -30511,7 +30511,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("per_call_descent_operand_port".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(721)],
-                output: DeclarationId(1820),
+                output: DeclarationId(1821),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     2969,
@@ -30535,15 +30535,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UnitShrink".to_string(),
-                        ty: DeclarationId(1841),
+                        ty: DeclarationId(1842),
                     },
                     Field {
                         label: "ConstantShrink".to_string(),
-                        ty: DeclarationId(1842),
+                        ty: DeclarationId(1843),
                     },
                     Field {
                         label: "ProportionalShrink".to_string(),
-                        ty: DeclarationId(1843),
+                        ty: DeclarationId(1844),
                     },
                 ],
             },
@@ -30564,15 +30564,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Fold".to_string(),
-                        ty: DeclarationId(1844),
+                        ty: DeclarationId(1845),
                     },
                     Field {
                         label: "Descend".to_string(),
-                        ty: DeclarationId(1845),
+                        ty: DeclarationId(1846),
                     },
                     Field {
                         label: "Repeat".to_string(),
-                        ty: DeclarationId(1846),
+                        ty: DeclarationId(1847),
                     },
                 ],
             },
@@ -30605,7 +30605,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "factor".to_string(),
-                        ty: DeclarationId(1847),
+                        ty: DeclarationId(1848),
                     },
                 ],
             },
@@ -30646,7 +30646,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("size_bound_param".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(933)],
-                output: DeclarationId(1821),
+                output: DeclarationId(1822),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     5787,
@@ -30712,7 +30712,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("constant_bound_value".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(933)],
-                output: DeclarationId(1822),
+                output: DeclarationId(1823),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     6715,
@@ -30736,15 +30736,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "TreeDescent".to_string(),
-                        ty: DeclarationId(1848),
+                        ty: DeclarationId(1849),
                     },
                     Field {
                         label: "CollectionFold".to_string(),
-                        ty: DeclarationId(1849),
+                        ty: DeclarationId(1850),
                     },
                     Field {
                         label: "ArithmeticRepeat".to_string(),
-                        ty: DeclarationId(1850),
+                        ty: DeclarationId(1851),
                     },
                 ],
             },
@@ -30763,7 +30763,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("algebra_profile_to_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(53)],
-                output: DeclarationId(1823),
+                output: DeclarationId(1824),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     7781,
@@ -30785,7 +30785,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("type_iteration_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230)],
-                output: DeclarationId(1824),
+                output: DeclarationId(1825),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     8346,
@@ -30809,11 +30809,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Immutable".to_string(),
-                        ty: DeclarationId(1851),
+                        ty: DeclarationId(1852),
                     },
                     Field {
                         label: "Mutable".to_string(),
-                        ty: DeclarationId(1852),
+                        ty: DeclarationId(1853),
                     },
                 ],
             },
@@ -30834,11 +30834,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Pure".to_string(),
-                        ty: DeclarationId(1853),
+                        ty: DeclarationId(1854),
                     },
                     Field {
                         label: "Effectful".to_string(),
-                        ty: DeclarationId(1854),
+                        ty: DeclarationId(1855),
                     },
                 ],
             },
@@ -30859,11 +30859,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ExplicitDAG".to_string(),
-                        ty: DeclarationId(1855),
+                        ty: DeclarationId(1856),
                     },
                     Field {
                         label: "Arbitrary".to_string(),
-                        ty: DeclarationId(1856),
+                        ty: DeclarationId(1857),
                     },
                 ],
             },
@@ -30884,11 +30884,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Bounded".to_string(),
-                        ty: DeclarationId(1857),
+                        ty: DeclarationId(1858),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1858),
+                        ty: DeclarationId(1859),
                     },
                 ],
             },
@@ -30952,28 +30952,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "mutability".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1851),
+                            constructor: DeclarationId(1852),
                             payload: vec![],
                         },
                     ),
                     (
                         "purity".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1853),
+                            constructor: DeclarationId(1854),
                             payload: vec![],
                         },
                     ),
                     (
                         "structure".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1855),
+                            constructor: DeclarationId(1856),
                             payload: vec![],
                         },
                     ),
                     (
                         "iteration".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1857),
+                            constructor: DeclarationId(1858),
                             payload: vec![],
                         },
                     ),
@@ -30990,19 +30990,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ValueOnly".to_string(),
-                        ty: DeclarationId(1859),
+                        ty: DeclarationId(1860),
                     },
                     Field {
                         label: "GarbageCollected".to_string(),
-                        ty: DeclarationId(1860),
+                        ty: DeclarationId(1861),
                     },
                     Field {
                         label: "RefCounted".to_string(),
-                        ty: DeclarationId(1861),
+                        ty: DeclarationId(1862),
                     },
                     Field {
                         label: "OwnershipBased".to_string(),
-                        ty: DeclarationId(1862),
+                        ty: DeclarationId(1863),
                     },
                 ],
             },
@@ -31023,11 +31023,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LexicalScoping".to_string(),
-                        ty: DeclarationId(1863),
+                        ty: DeclarationId(1864),
                     },
                     Field {
                         label: "DynamicScoping".to_string(),
-                        ty: DeclarationId(1864),
+                        ty: DeclarationId(1865),
                     },
                 ],
             },
@@ -31072,7 +31072,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "excluded_prefixes".to_string(),
-                    ty: DeclarationId(1865),
+                    ty: DeclarationId(1866),
                 }],
             },
             type_params: vec![],
@@ -31096,7 +31096,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "additional_excluded_prefixes".to_string(),
-                        ty: DeclarationId(1866),
+                        ty: DeclarationId(1867),
                     },
                 ],
             },
@@ -31144,11 +31144,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "OwnershipBased".to_string(),
-                        ty: DeclarationId(1867),
+                        ty: DeclarationId(1868),
                     },
                     Field {
                         label: "GarbageCollected".to_string(),
-                        ty: DeclarationId(1868),
+                        ty: DeclarationId(1869),
                     },
                 ],
             },
@@ -31185,7 +31185,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "StringTag".to_string(),
-                    ty: DeclarationId(1869),
+                    ty: DeclarationId(1870),
                 }],
             },
             type_params: vec![],
@@ -31205,11 +31205,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Empty".to_string(),
-                        ty: DeclarationId(1870),
+                        ty: DeclarationId(1871),
                     },
                     Field {
                         label: "Populated".to_string(),
-                        ty: DeclarationId(1871),
+                        ty: DeclarationId(1872),
                     },
                 ],
             },
@@ -31263,7 +31263,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "variant_projections".to_string(),
-                        ty: DeclarationId(1872),
+                        ty: DeclarationId(1873),
                     },
                 ],
             },
@@ -31364,27 +31364,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Atom".to_string(),
-                        ty: DeclarationId(1873),
+                        ty: DeclarationId(1874),
                     },
                     Field {
                         label: "Conj".to_string(),
-                        ty: DeclarationId(1874),
+                        ty: DeclarationId(1875),
                     },
                     Field {
                         label: "Disj".to_string(),
-                        ty: DeclarationId(1875),
+                        ty: DeclarationId(1876),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(1876),
+                        ty: DeclarationId(1877),
                     },
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(1877),
+                        ty: DeclarationId(1878),
                     },
                     Field {
                         label: "Instantiation".to_string(),
-                        ty: DeclarationId(1878),
+                        ty: DeclarationId(1879),
                     },
                 ],
             },
@@ -31405,23 +31405,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Value".to_string(),
-                        ty: DeclarationId(1879),
+                        ty: DeclarationId(1880),
                     },
                     Field {
                         label: "Transform".to_string(),
-                        ty: DeclarationId(1880),
+                        ty: DeclarationId(1881),
                     },
                     Field {
                         label: "Branch".to_string(),
-                        ty: DeclarationId(1881),
+                        ty: DeclarationId(1882),
                     },
                     Field {
                         label: "Loop".to_string(),
-                        ty: DeclarationId(1882),
+                        ty: DeclarationId(1883),
                     },
                     Field {
                         label: "Bind".to_string(),
-                        ty: DeclarationId(1883),
+                        ty: DeclarationId(1884),
                     },
                 ],
             },
@@ -31496,7 +31496,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "cells".to_string(),
-                        ty: DeclarationId(1884),
+                        ty: DeclarationId(1885),
                     },
                 ],
             },
@@ -31522,7 +31522,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1885)),
+            meta_tag: Some(DeclarationId(1886)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -31549,14 +31549,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -31586,14 +31586,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -31623,14 +31623,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -31660,14 +31660,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -31697,14 +31697,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -31734,14 +31734,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -31771,14 +31771,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -31808,14 +31808,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -31845,14 +31845,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -31882,14 +31882,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -31919,14 +31919,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -31956,14 +31956,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -31993,14 +31993,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -32030,14 +32030,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -32067,14 +32067,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -32104,14 +32104,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -32141,14 +32141,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -32178,14 +32178,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -32215,14 +32215,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -32252,14 +32252,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -32289,14 +32289,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -32326,14 +32326,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -32363,14 +32363,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -32400,14 +32400,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -32437,14 +32437,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -32474,14 +32474,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -32511,14 +32511,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -32548,14 +32548,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -32585,14 +32585,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -32622,14 +32622,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -32659,14 +32659,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -32696,14 +32696,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -32733,14 +32733,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -32770,14 +32770,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -32807,14 +32807,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -32844,14 +32844,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -32881,14 +32881,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -32918,14 +32918,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -32955,14 +32955,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -32992,14 +32992,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -33029,14 +33029,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "connective".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1877),
+                                    constructor: DeclarationId(1878),
                                     payload: vec![],
                                 },
                             ),
                             (
                                 "behavior".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1880),
+                                    constructor: DeclarationId(1881),
                                     payload: vec![],
                                 },
                             ),
@@ -33055,43 +33055,43 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-                        ty: DeclarationId(1886),
+                        ty: DeclarationId(1887),
                     },
                     Field {
                         label: "ParseError".to_string(),
-                        ty: DeclarationId(1887),
+                        ty: DeclarationId(1888),
                     },
                     Field {
                         label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(1888),
+                        ty: DeclarationId(1889),
                     },
                     Field {
                         label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(1889),
+                        ty: DeclarationId(1890),
                     },
                     Field {
                         label: "ResolveError".to_string(),
-                        ty: DeclarationId(1890),
+                        ty: DeclarationId(1891),
                     },
                     Field {
                         label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(1891),
+                        ty: DeclarationId(1892),
                     },
                     Field {
                         label: "BranchConditionNotBool".to_string(),
-                        ty: DeclarationId(1892),
+                        ty: DeclarationId(1893),
                     },
                     Field {
                         label: "MagnitudeOutOfRange".to_string(),
-                        ty: DeclarationId(1893),
+                        ty: DeclarationId(1894),
                     },
                     Field {
                         label: "MalformedIntegerRangeFact".to_string(),
-                        ty: DeclarationId(1894),
+                        ty: DeclarationId(1895),
                     },
                     Field {
                         label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(1895),
+                        ty: DeclarationId(1896),
                     },
                 ],
             },
@@ -33185,11 +33185,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "CompilerKind".to_string(),
-                        ty: DeclarationId(1896),
+                        ty: DeclarationId(1897),
                     },
                     Field {
                         label: "LensInstanceKind".to_string(),
-                        ty: DeclarationId(1897),
+                        ty: DeclarationId(1898),
                     },
                 ],
             },
@@ -33222,7 +33222,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "fixes".to_string(),
-                        ty: DeclarationId(1898),
+                        ty: DeclarationId(1899),
                     },
                 ],
             },
@@ -33243,31 +33243,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UnderRefined".to_string(),
-                        ty: DeclarationId(1899),
+                        ty: DeclarationId(1900),
                     },
                     Field {
                         label: "NoInhabitant".to_string(),
-                        ty: DeclarationId(1900),
+                        ty: DeclarationId(1901),
                     },
                     Field {
                         label: "ContradictoryUse".to_string(),
-                        ty: DeclarationId(1902),
+                        ty: DeclarationId(1903),
                     },
                     Field {
                         label: "OutOfR2Scope".to_string(),
-                        ty: DeclarationId(1903),
+                        ty: DeclarationId(1904),
                     },
                     Field {
                         label: "LifetimeProgramExtractionPending".to_string(),
-                        ty: DeclarationId(1904),
+                        ty: DeclarationId(1905),
                     },
                     Field {
                         label: "FoldNotImplemented".to_string(),
-                        ty: DeclarationId(1905),
+                        ty: DeclarationId(1906),
                     },
                     Field {
                         label: "MissingEmissionPath".to_string(),
-                        ty: DeclarationId(1906),
+                        ty: DeclarationId(1907),
                     },
                 ],
             },
@@ -33288,11 +33288,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Inhabits".to_string(),
-                        ty: DeclarationId(1921),
+                        ty: DeclarationId(1922),
                     },
                     Field {
                         label: "Violates".to_string(),
-                        ty: DeclarationId(1922),
+                        ty: DeclarationId(1923),
                     },
                 ],
             },
@@ -33327,11 +33327,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NoDiagnostic".to_string(),
-                        ty: DeclarationId(1923),
+                        ty: DeclarationId(1924),
                     },
                     Field {
                         label: "SomeDiagnostic".to_string(),
-                        ty: DeclarationId(1924),
+                        ty: DeclarationId(1925),
                     },
                 ],
             },
@@ -33352,11 +33352,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DimensionOk".to_string(),
-                        ty: DeclarationId(1927),
+                        ty: DeclarationId(1928),
                     },
                     Field {
                         label: "DimensionFail".to_string(),
-                        ty: DeclarationId(1931),
+                        ty: DeclarationId(1932),
                     },
                 ],
             },
@@ -33395,15 +33395,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "witness_of".to_string(),
-                        ty: DeclarationId(1933),
+                        ty: DeclarationId(1934),
                     },
                     Field {
                         label: "compose".to_string(),
-                        ty: DeclarationId(1934),
+                        ty: DeclarationId(1935),
                     },
                     Field {
                         label: "break_diagnostic".to_string(),
-                        ty: DeclarationId(1935),
+                        ty: DeclarationId(1936),
                     },
                 ],
             },
@@ -33443,7 +33443,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             type_params: vec![DeclarationId(992), DeclarationId(993)],
             phantom_params: vec![PhantomParameter {
                 parameter: DeclarationId(992),
-                algebra: DeclarationId(1936),
+                algebra: DeclarationId(1937),
             }],
             meta_tag: None,
             specialization_parent: None,
@@ -33584,11 +33584,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("add_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(1907),
                     DeclarationId(1908),
                     DeclarationId(1909),
+                    DeclarationId(1910),
                 ],
-                output: DeclarationId(1910),
+                output: DeclarationId(1911),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4966, 4988)),
             },
             type_params: vec![DeclarationId(1002), DeclarationId(1003)],
@@ -33634,11 +33634,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("sub_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(1911),
                     DeclarationId(1912),
                     DeclarationId(1913),
+                    DeclarationId(1914),
                 ],
-                output: DeclarationId(1914),
+                output: DeclarationId(1915),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5162, 5184)),
             },
             type_params: vec![DeclarationId(1005), DeclarationId(1006)],
@@ -33684,11 +33684,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("mul_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(1915),
                     DeclarationId(1916),
+                    DeclarationId(1917),
                     DeclarationId(1009),
                 ],
-                output: DeclarationId(1917),
+                output: DeclarationId(1918),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5350, 5379)),
             },
             type_params: vec![DeclarationId(1008), DeclarationId(1009)],
@@ -33734,11 +33734,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("div_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(1918),
                     DeclarationId(1919),
+                    DeclarationId(1920),
                     DeclarationId(1012),
                 ],
-                output: DeclarationId(1920),
+                output: DeclarationId(1921),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5545, 5574)),
             },
             type_params: vec![DeclarationId(1011), DeclarationId(1012)],
@@ -33803,11 +33803,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NoSourceSpan".to_string(),
-                        ty: DeclarationId(1937),
+                        ty: DeclarationId(1938),
                     },
                     Field {
                         label: "SomeSourceSpan".to_string(),
-                        ty: DeclarationId(1938),
+                        ty: DeclarationId(1939),
                     },
                 ],
             },
@@ -33873,7 +33873,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(1939),
+                        ty: DeclarationId(1940),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -33935,15 +33935,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "BoundUnspecified".to_string(),
-                        ty: DeclarationId(1940),
+                        ty: DeclarationId(1941),
                     },
                     Field {
                         label: "StaticBoundFact".to_string(),
-                        ty: DeclarationId(1941),
+                        ty: DeclarationId(1942),
                     },
                     Field {
                         label: "PlatformDependentFact".to_string(),
-                        ty: DeclarationId(1942),
+                        ty: DeclarationId(1943),
                     },
                 ],
             },
@@ -33993,11 +33993,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DirectField".to_string(),
-                        ty: DeclarationId(1943),
+                        ty: DeclarationId(1944),
                     },
                     Field {
                         label: "AccessorMethod".to_string(),
-                        ty: DeclarationId(1944),
+                        ty: DeclarationId(1945),
                     },
                 ],
             },
@@ -34100,7 +34100,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "parameters".to_string(),
-                        ty: DeclarationId(1945),
+                        ty: DeclarationId(1946),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -34150,11 +34150,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Borrowed".to_string(),
-                        ty: DeclarationId(1946),
+                        ty: DeclarationId(1947),
                     },
                     Field {
                         label: "Consumed".to_string(),
-                        ty: DeclarationId(1947),
+                        ty: DeclarationId(1948),
                     },
                 ],
             },
@@ -34175,11 +34175,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Owned".to_string(),
-                        ty: DeclarationId(1948),
+                        ty: DeclarationId(1949),
                     },
                     Field {
                         label: "Borrowed".to_string(),
-                        ty: DeclarationId(1949),
+                        ty: DeclarationId(1950),
                     },
                 ],
             },
@@ -34200,11 +34200,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "SelfContained".to_string(),
-                        ty: DeclarationId(1950),
+                        ty: DeclarationId(1951),
                     },
                     Field {
                         label: "Caller".to_string(),
-                        ty: DeclarationId(1951),
+                        ty: DeclarationId(1952),
                     },
                 ],
             },
@@ -34225,15 +34225,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Growable".to_string(),
-                        ty: DeclarationId(1952),
+                        ty: DeclarationId(1953),
                     },
                     Field {
                         label: "Fixed".to_string(),
-                        ty: DeclarationId(1953),
+                        ty: DeclarationId(1954),
                     },
                     Field {
                         label: "NotApplicable".to_string(),
-                        ty: DeclarationId(1954),
+                        ty: DeclarationId(1955),
                     },
                 ],
             },
@@ -34253,7 +34253,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Utf8FreeMonoidChar".to_string(),
-                    ty: DeclarationId(1955),
+                    ty: DeclarationId(1956),
                 }],
             },
             type_params: vec![],
@@ -34351,43 +34351,43 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ListEmpty".to_string(),
-                        ty: DeclarationId(1956),
+                        ty: DeclarationId(1957),
                     },
                     Field {
                         label: "ListSingleton".to_string(),
-                        ty: DeclarationId(1957),
+                        ty: DeclarationId(1958),
                     },
                     Field {
                         label: "ListCons".to_string(),
-                        ty: DeclarationId(1958),
+                        ty: DeclarationId(1959),
                     },
                     Field {
                         label: "ListConcat".to_string(),
-                        ty: DeclarationId(1959),
+                        ty: DeclarationId(1960),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(1960),
+                        ty: DeclarationId(1961),
                     },
                     Field {
                         label: "ListIsEmpty".to_string(),
-                        ty: DeclarationId(1961),
+                        ty: DeclarationId(1962),
                     },
                     Field {
                         label: "ListFold".to_string(),
-                        ty: DeclarationId(1962),
+                        ty: DeclarationId(1963),
                     },
                     Field {
                         label: "ListMap".to_string(),
-                        ty: DeclarationId(1963),
+                        ty: DeclarationId(1964),
                     },
                     Field {
                         label: "ListFilter".to_string(),
-                        ty: DeclarationId(1964),
+                        ty: DeclarationId(1965),
                     },
                     Field {
                         label: "ListContains".to_string(),
-                        ty: DeclarationId(1965),
+                        ty: DeclarationId(1966),
                     },
                 ],
             },
@@ -34469,11 +34469,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "PlaceholderPatternStrategy".to_string(),
-                        ty: DeclarationId(1966),
+                        ty: DeclarationId(1967),
                     },
                     Field {
                         label: "VectorList".to_string(),
-                        ty: DeclarationId(1967),
+                        ty: DeclarationId(1968),
                     },
                 ],
             },
@@ -34952,11 +34952,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Borrow".to_string(),
-                        ty: DeclarationId(1968),
+                        ty: DeclarationId(1969),
                     },
                     Field {
                         label: "PassByValue".to_string(),
-                        ty: DeclarationId(1969),
+                        ty: DeclarationId(1970),
                     },
                 ],
             },
@@ -34977,11 +34977,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "CopyOrClone".to_string(),
-                        ty: DeclarationId(1970),
+                        ty: DeclarationId(1971),
                     },
                     Field {
                         label: "PassByValue".to_string(),
-                        ty: DeclarationId(1971),
+                        ty: DeclarationId(1972),
                     },
                 ],
             },
@@ -35067,11 +35067,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IndexedArgs".to_string(),
-                        ty: DeclarationId(1972),
+                        ty: DeclarationId(1973),
                     },
                     Field {
                         label: "NamedArg".to_string(),
-                        ty: DeclarationId(1973),
+                        ty: DeclarationId(1974),
                     },
                 ],
             },
@@ -35092,11 +35092,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "SingleTemplate".to_string(),
-                        ty: DeclarationId(1974),
+                        ty: DeclarationId(1975),
                     },
                     Field {
                         label: "HigherOrderTemplates".to_string(),
-                        ty: DeclarationId(1975),
+                        ty: DeclarationId(1976),
                     },
                 ],
             },
@@ -35363,7 +35363,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({left}, {right}...)".to_string(),
                             ))],
@@ -35376,7 +35376,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -35414,7 +35414,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "int64(len({recv}))".to_string(),
                             ))],
@@ -35427,7 +35427,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -35465,7 +35465,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv}) == 0".to_string(),
                             ))],
@@ -35478,7 +35478,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -35518,7 +35518,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "/* fold({recv}, {init}, {body}) */".to_string(),
                             ))],
@@ -35531,7 +35531,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -35571,7 +35571,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "/* map({recv}, {body}) */".to_string(),
                             ))],
@@ -35584,7 +35584,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -35624,7 +35624,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Filter({recv}, {arg})".to_string(),
                             ))],
@@ -35637,7 +35637,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -35677,7 +35677,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Any({recv}, {arg})".to_string(),
                             ))],
@@ -35690,7 +35690,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -35730,7 +35730,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.All({recv}, {arg})".to_string(),
                             ))],
@@ -35743,7 +35743,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -35783,7 +35783,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.FlatMap({recv}, {arg})".to_string(),
                             ))],
@@ -35796,7 +35796,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -35818,7 +35818,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1976)),
+            meta_tag: Some(DeclarationId(1977)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -35837,7 +35837,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -35850,7 +35850,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -35872,7 +35872,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Join({recv}, {arg})".to_string(),
                             ))],
@@ -35885,7 +35885,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -35907,7 +35907,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Split({recv}, {arg})".to_string(),
                             ))],
@@ -35920,7 +35920,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -35944,7 +35944,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -35957,7 +35957,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -35977,7 +35977,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -35990,7 +35990,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -36012,7 +36012,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.SortBy({recv}, {arg})".to_string(),
                             ))],
@@ -36025,7 +36025,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -36047,7 +36047,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({recv}, {arg})".to_string(),
                             ))],
@@ -36060,7 +36060,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -36082,7 +36082,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Contains({recv}, {arg})".to_string(),
                             ))],
@@ -36095,7 +36095,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -36112,23 +36112,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DirectRecursion".to_string(),
-                        ty: DeclarationId(1990),
+                        ty: DeclarationId(1991),
                     },
                     Field {
                         label: "ListRecursion".to_string(),
-                        ty: DeclarationId(1991),
+                        ty: DeclarationId(1992),
                     },
                     Field {
                         label: "OptionalRecursion".to_string(),
-                        ty: DeclarationId(1992),
+                        ty: DeclarationId(1993),
                     },
                     Field {
                         label: "SetRecursion".to_string(),
-                        ty: DeclarationId(1993),
+                        ty: DeclarationId(1994),
                     },
                     Field {
                         label: "MapValueRecursion".to_string(),
-                        ty: DeclarationId(1994),
+                        ty: DeclarationId(1995),
                     },
                 ],
             },
@@ -36240,23 +36240,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "StrictSubValue".to_string(),
-                        ty: DeclarationId(1995),
+                        ty: DeclarationId(1996),
                     },
                     Field {
                         label: "IteratedSubValue".to_string(),
-                        ty: DeclarationId(1996),
+                        ty: DeclarationId(1997),
                     },
                     Field {
                         label: "ArithmeticDescent".to_string(),
-                        ty: DeclarationId(1997),
+                        ty: DeclarationId(1998),
                     },
                     Field {
                         label: "PreservedValue".to_string(),
-                        ty: DeclarationId(1998),
+                        ty: DeclarationId(1999),
                     },
                     Field {
                         label: "SubValueUnknown".to_string(),
-                        ty: DeclarationId(1999),
+                        ty: DeclarationId(2000),
                     },
                 ],
             },
@@ -36407,7 +36407,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(1073)],
-                output: DeclarationId(1977),
+                output: DeclarationId(1978),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     20571,
@@ -36429,7 +36429,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(1073)],
-                output: DeclarationId(1978),
+                output: DeclarationId(1979),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     21959,
@@ -36453,19 +36453,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IntegerExpZero".to_string(),
-                        ty: DeclarationId(2000),
+                        ty: DeclarationId(2001),
                     },
                     Field {
                         label: "IntegerExpPos".to_string(),
-                        ty: DeclarationId(2001),
+                        ty: DeclarationId(2002),
                     },
                     Field {
                         label: "FractionExp".to_string(),
-                        ty: DeclarationId(2002),
+                        ty: DeclarationId(2003),
                     },
                     Field {
                         label: "LogBasedExp".to_string(),
-                        ty: DeclarationId(2003),
+                        ty: DeclarationId(2004),
                     },
                 ],
             },
@@ -36508,11 +36508,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "PolyCost".to_string(),
-                        ty: DeclarationId(2004),
+                        ty: DeclarationId(2005),
                     },
                     Field {
                         label: "LogCost".to_string(),
-                        ty: DeclarationId(2005),
+                        ty: DeclarationId(2006),
                     },
                 ],
             },
@@ -36533,31 +36533,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ConstantBound".to_string(),
-                        ty: DeclarationId(2006),
+                        ty: DeclarationId(2007),
                     },
                     Field {
                         label: "AtomicBound".to_string(),
-                        ty: DeclarationId(2007),
+                        ty: DeclarationId(2008),
                     },
                     Field {
                         label: "ProductBound".to_string(),
-                        ty: DeclarationId(2009),
+                        ty: DeclarationId(2010),
                     },
                     Field {
                         label: "SumOfProductsBound".to_string(),
-                        ty: DeclarationId(2012),
+                        ty: DeclarationId(2013),
                     },
                     Field {
                         label: "SumBound".to_string(),
-                        ty: DeclarationId(2014),
+                        ty: DeclarationId(2015),
                     },
                     Field {
                         label: "ForeverBound".to_string(),
-                        ty: DeclarationId(2015),
+                        ty: DeclarationId(2016),
                     },
                     Field {
                         label: "ErrorBound".to_string(),
-                        ty: DeclarationId(2016),
+                        ty: DeclarationId(2017),
                     },
                 ],
             },
@@ -36575,7 +36575,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1086),
             name: Some("sum_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1979)],
+                inputs: vec![DeclarationId(1980)],
                 output: DeclarationId(1085),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -36655,7 +36655,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1090),
             name: Some("product_atoms_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1980)],
+                inputs: vec![DeclarationId(1981)],
                 output: DeclarationId(849),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -36677,7 +36677,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1091),
             name: Some("product_term_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1981)],
+                inputs: vec![DeclarationId(1982)],
                 output: DeclarationId(849),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(555))),
             },
@@ -36695,7 +36695,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1092),
             name: Some("sum_products_to_symbolic".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1983)],
+                inputs: vec![DeclarationId(1984)],
                 output: DeclarationId(849),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -36949,7 +36949,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("int_add_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(1984),
+                output: DeclarationId(1985),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33617,
@@ -36971,7 +36971,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("int_mul_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(1985),
+                output: DeclarationId(1986),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33913,
@@ -36993,7 +36993,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(93)],
-                output: DeclarationId(1986),
+                output: DeclarationId(1987),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35162,
@@ -37015,7 +37015,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("int_pow_bounded".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(1987),
+                output: DeclarationId(1988),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35637,
@@ -37037,7 +37037,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("ceil_log".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93), DeclarationId(93)],
-                output: DeclarationId(1988),
+                output: DeclarationId(1989),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     36900,
@@ -37064,7 +37064,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     DeclarationId(93),
                     DeclarationId(93),
                 ],
-                output: DeclarationId(1989),
+                output: DeclarationId(1990),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     37172,
@@ -37472,7 +37472,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2017)),
+            meta_tag: Some(DeclarationId(2018)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -37498,7 +37498,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2018)),
+            meta_tag: Some(DeclarationId(2019)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -37523,23 +37523,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "read".to_string(),
-                        ty: DeclarationId(2020),
+                        ty: DeclarationId(2021),
                     },
                     Field {
                         label: "sequential".to_string(),
-                        ty: DeclarationId(2021),
+                        ty: DeclarationId(2022),
                     },
                     Field {
                         label: "branch".to_string(),
-                        ty: DeclarationId(2022),
+                        ty: DeclarationId(2023),
                     },
                     Field {
                         label: "iterate".to_string(),
-                        ty: DeclarationId(2023),
+                        ty: DeclarationId(2024),
                     },
                     Field {
                         label: "validate".to_string(),
-                        ty: DeclarationId(2024),
+                        ty: DeclarationId(2025),
                     },
                 ],
             },
@@ -37574,11 +37574,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DeclarationScope".to_string(),
-                        ty: DeclarationId(2025),
+                        ty: DeclarationId(2026),
                     },
                     Field {
                         label: "NodeScope".to_string(),
-                        ty: DeclarationId(2026),
+                        ty: DeclarationId(2027),
                     },
                 ],
             },
@@ -37598,7 +37598,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Error".to_string(),
-                    ty: DeclarationId(2027),
+                    ty: DeclarationId(2028),
                 }],
             },
             type_params: vec![],
@@ -37618,11 +37618,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "project".to_string(),
-                        ty: DeclarationId(2028),
+                        ty: DeclarationId(2029),
                     },
                     Field {
                         label: "violates".to_string(),
-                        ty: DeclarationId(2029),
+                        ty: DeclarationId(2030),
                     },
                 ],
             },
@@ -37671,11 +37671,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "lens".to_string(),
-                        ty: DeclarationId(2030),
+                        ty: DeclarationId(2031),
                     },
                     Field {
                         label: "enforcement".to_string(),
-                        ty: DeclarationId(2031),
+                        ty: DeclarationId(2032),
                     },
                 ],
             },
@@ -37724,7 +37724,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "enforceable_lens".to_string(),
-                        ty: DeclarationId(2032),
+                        ty: DeclarationId(2033),
                     },
                     Field {
                         label: "section".to_string(),
@@ -37789,7 +37789,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "lens".to_string(),
-                        ty: DeclarationId(2033),
+                        ty: DeclarationId(2034),
                     },
                     Field {
                         label: "section".to_string(),
@@ -37832,11 +37832,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Miss".to_string(),
-                        ty: DeclarationId(2036),
+                        ty: DeclarationId(2037),
                     },
                     Field {
                         label: "Hit".to_string(),
-                        ty: DeclarationId(2037),
+                        ty: DeclarationId(2038),
                     },
                 ],
             },
@@ -37869,7 +37869,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(2035),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4601, 4611)),
             },
             type_params: vec![],
@@ -37887,7 +37887,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("hit_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(93)],
-                output: DeclarationId(2035),
+                output: DeclarationId(2036),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4654, 4666)),
             },
             type_params: vec![],
@@ -37928,7 +37928,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[*{left}, *{right}]".to_string(),
                             ))],
@@ -37941,7 +37941,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -37983,7 +37983,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -37996,7 +37996,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -38038,7 +38038,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "(len({recv}) == 0)".to_string(),
                             ))],
@@ -38051,7 +38051,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -38095,7 +38095,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "__v3_fold({recv}, {init}, {body})".to_string(),
                             ))],
@@ -38108,7 +38108,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -38152,7 +38152,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[{body} for {item} in {recv}]".to_string(),
                             ))],
@@ -38165,7 +38165,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -38209,7 +38209,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[x for x in {recv} if {arg}(x)]".to_string(),
                             ))],
@@ -38222,7 +38222,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -38266,7 +38266,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "any({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -38279,7 +38279,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -38323,7 +38323,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "all({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -38336,7 +38336,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -38380,7 +38380,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[y for x in {recv} for y in {arg}(x)]".to_string(),
                             ))],
@@ -38393,7 +38393,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -38419,7 +38419,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(2039)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -38438,7 +38438,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -38451,7 +38451,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -38471,7 +38471,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg}.join({recv})".to_string(),
                             ))],
@@ -38484,7 +38484,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -38504,7 +38504,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}.split({arg})".to_string(),
                             ))],
@@ -38517,7 +38517,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -38539,7 +38539,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[-1] if {recv} else None".to_string(),
                             ))],
@@ -38552,7 +38552,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -38574,7 +38574,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[0] if {recv} else None".to_string(),
                             ))],
@@ -38587,7 +38587,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -38609,7 +38609,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "list(enumerate({recv}))".to_string(),
                             ))],
@@ -38622,7 +38622,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -38644,7 +38644,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[ord(c) for c in {recv}]".to_string(),
                             ))],
@@ -38657,7 +38657,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -38681,7 +38681,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -38694,7 +38694,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -38714,7 +38714,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -38727,7 +38727,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -38749,7 +38749,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "sorted({recv}, key={arg})".to_string(),
                             ))],
@@ -38762,7 +38762,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -38782,7 +38782,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv} + [{arg}]".to_string(),
                             ))],
@@ -38795,7 +38795,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -38815,7 +38815,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1974),
+                            constructor: DeclarationId(1975),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg} in {recv}".to_string(),
                             ))],
@@ -38828,7 +38828,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1973),
+                            constructor: DeclarationId(1974),
                             payload: vec![],
                         },
                     ),
@@ -38926,23 +38926,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LiteralValue".to_string(),
-                        ty: DeclarationId(2040),
+                        ty: DeclarationId(2041),
                     },
                     Field {
                         label: "RecordValue".to_string(),
-                        ty: DeclarationId(2042),
+                        ty: DeclarationId(2043),
                     },
                     Field {
                         label: "VariantValue".to_string(),
-                        ty: DeclarationId(2043),
+                        ty: DeclarationId(2044),
                     },
                     Field {
                         label: "NodeRef".to_string(),
-                        ty: DeclarationId(2044),
+                        ty: DeclarationId(2045),
                     },
                     Field {
                         label: "CardinalityValue".to_string(),
-                        ty: DeclarationId(2045),
+                        ty: DeclarationId(2046),
                     },
                 ],
             },
@@ -38995,7 +38995,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bindings".to_string(),
-                    ty: DeclarationId(2046),
+                    ty: DeclarationId(2047),
                 }],
             },
             type_params: vec![],
@@ -39014,7 +39014,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "frames".to_string(),
-                    ty: DeclarationId(2047),
+                    ty: DeclarationId(2048),
                 }],
             },
             type_params: vec![],
@@ -39052,7 +39052,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "ApplicativeOrder".to_string(),
-                    ty: DeclarationId(2048),
+                    ty: DeclarationId(2049),
                 }],
             },
             type_params: vec![],
@@ -39072,11 +39072,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LeftFirst".to_string(),
-                        ty: DeclarationId(2049),
+                        ty: DeclarationId(2050),
                     },
                     Field {
                         label: "RightFirst".to_string(),
-                        ty: DeclarationId(2050),
+                        ty: DeclarationId(2051),
                     },
                 ],
             },
@@ -39127,7 +39127,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1169),
             name: Some("evaluate".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(721), DeclarationId(2039)],
+                inputs: vec![DeclarationId(828), DeclarationId(721), DeclarationId(2040)],
                 output: DeclarationId(1160),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/runtime.dag", 11265, 11284)),
             },
@@ -39141,11 +39141,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/runtime.dag", 11196, 11284),
         });
-        declarations.push(Declaration { id: DeclarationId(1170), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(263)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1975), payload: vec![FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __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(1973), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3555, 4208) });
-        declarations.push(Declaration { id: DeclarationId(1171), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(249)))])), ("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(1975), 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(1973), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4210, 4705) });
-        declarations.push(Declaration { id: DeclarationId(1172), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(248)))])), ("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(1975), 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(1973), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4707, 5196) });
-        declarations.push(Declaration { id: DeclarationId(1173), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(265)))])), ("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(1975), 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(1973), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5198, 5729) });
-        declarations.push(Declaration { id: DeclarationId(1174), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(1054) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2051)), 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(258)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1974), 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(1973), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(271)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1974), 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(1973), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(295)))])), ("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(1974), 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(1973), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(273)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1974), 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(1973), 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}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1974), 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(1973), 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}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1974), 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(1973), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(252)))])), ("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(1974), 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(1973), payload: vec![] })]), FieldValue::Reference(DeclarationId(1170)), FieldValue::Reference(DeclarationId(1171)), FieldValue::Reference(DeclarationId(1172)), FieldValue::Reference(DeclarationId(1173)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(293)))])), ("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(1974), 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(1973), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(299)))])), ("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(1974), 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(1973), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5732, 8453) });
+        declarations.push(Declaration { id: DeclarationId(1170), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(263)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1976), payload: vec![FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __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(1974), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3555, 4208) });
+        declarations.push(Declaration { id: DeclarationId(1171), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(249)))])), ("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(1976), 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(1974), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4210, 4705) });
+        declarations.push(Declaration { id: DeclarationId(1172), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(248)))])), ("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(1976), 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(1974), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4707, 5196) });
+        declarations.push(Declaration { id: DeclarationId(1173), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1054), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1054)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(265)))])), ("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(1976), 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(1974), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5198, 5729) });
+        declarations.push(Declaration { id: DeclarationId(1174), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(1054) }] }, 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(258)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1975), 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(1974), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(271)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1975), 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(1974), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(295)))])), ("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(1975), 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(1974), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(273)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1975), 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(1974), 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}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1975), 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(1974), 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}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1975), 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(1974), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(252)))])), ("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(1975), 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(1974), payload: vec![] })]), FieldValue::Reference(DeclarationId(1170)), FieldValue::Reference(DeclarationId(1171)), FieldValue::Reference(DeclarationId(1172)), FieldValue::Reference(DeclarationId(1173)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(293)))])), ("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(1975), 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(1974), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(299)))])), ("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(1975), 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(1974), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5732, 8453) });
         declarations.push(Declaration {
             id: DeclarationId(1175),
             name: Some("InputField".to_string()),
@@ -39158,7 +39158,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/services.dag", 3670, 3688),
+            span: SourceSpan::new("src/v3/std/services.dag", 3669, 3687),
         });
         declarations.push(Declaration {
             id: DeclarationId(1176),
@@ -39183,7 +39183,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/services.dag", 4600, 4672),
+            span: SourceSpan::new("src/v3/std/services.dag", 4599, 4671),
         });
         declarations.push(Declaration {
             id: DeclarationId(1177),
@@ -39202,7 +39202,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/services.dag", 5480, 5523),
+            span: SourceSpan::new("src/v3/std/services.dag", 5479, 5522),
         });
         declarations.push(Declaration {
             id: DeclarationId(1178),
@@ -39215,7 +39215,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(2052),
+                        ty: DeclarationId(2053),
                     },
                     Field {
                         label: "endpoint".to_string(),
@@ -39231,18 +39231,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/services.dag", 6732, 6842),
+            span: SourceSpan::new("src/v3/std/services.dag", 6731, 6841),
         });
         declarations.push(Declaration {
             id: DeclarationId(1179),
             name: Some("modeled_gunbc_ci_workflow".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1359),
+                template: DeclarationId(1360),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1359)),
+            meta_tag: Some(DeclarationId(1360)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -39259,7 +39259,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("ci_demo_timing_read".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2053),
+                output: DeclarationId(2054),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(597))),
             },
             type_params: vec![],
@@ -39277,7 +39277,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("ci_wad_modeled_workflow_timing_witness".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2054),
+                output: DeclarationId(2055),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(599))),
             },
             type_params: vec![],
@@ -39295,7 +39295,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_seed_list_declaration_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2055),
+                output: DeclarationId(2056),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(601))),
             },
             type_params: vec![],
@@ -39313,7 +39313,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_seed_list_behavior_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2056),
+                output: DeclarationId(2057),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(603))),
             },
             type_params: vec![],
@@ -39331,7 +39331,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_seed_list_dagport_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2057),
+                output: DeclarationId(2058),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(605))),
             },
             type_params: vec![],
@@ -39349,7 +39349,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_seed_list_cluster_empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2058),
+                output: DeclarationId(2059),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(607))),
             },
             type_params: vec![],
@@ -39367,7 +39367,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_empty_list_diagnostic".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2059),
+                output: DeclarationId(2060),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(609))),
             },
             type_params: vec![],
@@ -39385,7 +39385,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_empty_list_witness_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2061),
+                output: DeclarationId(2062),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(611))),
             },
             type_params: vec![],
@@ -39403,7 +39403,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_witnesses_singleton_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1222)],
-                output: DeclarationId(2063),
+                output: DeclarationId(2064),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(615))),
             },
             type_params: vec![],
@@ -39421,7 +39421,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_violations_singleton".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(982)],
-                output: DeclarationId(2064),
+                output: DeclarationId(2065),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(618))),
             },
             type_params: vec![],
@@ -39439,7 +39439,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_dimension_ok_tm_payload".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1222)],
-                output: DeclarationId(2065),
+                output: DeclarationId(2066),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(622))),
             },
             type_params: vec![],
@@ -39457,7 +39457,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("_ci_wad_dimension_fail_tm_payload".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1222), DeclarationId(982)],
-                output: DeclarationId(2066),
+                output: DeclarationId(2067),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(627))),
             },
             type_params: vec![],
@@ -39475,7 +39475,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("report_dim_ok_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(1222)],
-                output: DeclarationId(2067),
+                output: DeclarationId(2068),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(634))),
             },
             type_params: vec![],
@@ -39493,7 +39493,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("report_dim_fail_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(1222), DeclarationId(982)],
-                output: DeclarationId(2068),
+                output: DeclarationId(2069),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(641))),
             },
             type_params: vec![],
@@ -39511,7 +39511,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("report_inhabits_branch_tm".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(1222), DeclarationId(986)],
-                output: DeclarationId(2069),
+                output: DeclarationId(2070),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(646))),
             },
             type_params: vec![],
@@ -39528,8 +39528,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1195),
             name: Some("dimension_report_tm_from_witness".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(828), DeclarationId(2070)],
-                output: DeclarationId(2071),
+                inputs: vec![DeclarationId(828), DeclarationId(2071)],
+                output: DeclarationId(2072),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(656))),
             },
             type_params: vec![],
@@ -39547,7 +39547,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("demo_ci_modeled_timing_dimension_report".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2072),
+                output: DeclarationId(2073),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(664))),
             },
             type_params: vec![],
@@ -39567,15 +39567,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Strict".to_string(),
-                        ty: DeclarationId(2102),
+                        ty: DeclarationId(2103),
                     },
                     Field {
                         label: "NonIncreasing".to_string(),
-                        ty: DeclarationId(2103),
+                        ty: DeclarationId(2104),
                     },
                     Field {
                         label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2104),
+                        ty: DeclarationId(2105),
                     },
                 ],
             },
@@ -39677,8 +39677,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1202),
             name: Some("optional_evidence_meet".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2094), DeclarationId(2095)],
-                output: DeclarationId(2096),
+                inputs: vec![DeclarationId(2095), DeclarationId(2096)],
+                output: DeclarationId(2097),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2488,
@@ -39699,8 +39699,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(1203),
             name: Some("map_evidence_merge_at".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2097), DeclarationId(230), DeclarationId(1197)],
-                output: DeclarationId(2098),
+                inputs: vec![DeclarationId(2098), DeclarationId(230), DeclarationId(1197)],
+                output: DeclarationId(2099),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2833,
@@ -39724,23 +39724,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "TreeSize".to_string(),
-                        ty: DeclarationId(2105),
+                        ty: DeclarationId(2106),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(2106),
+                        ty: DeclarationId(2107),
                     },
                     Field {
                         label: "ArithmeticValue".to_string(),
-                        ty: DeclarationId(2107),
+                        ty: DeclarationId(2108),
                     },
                     Field {
                         label: "TokenPosition".to_string(),
-                        ty: DeclarationId(2108),
+                        ty: DeclarationId(2109),
                     },
                     Field {
                         label: "SetCardinality".to_string(),
-                        ty: DeclarationId(2109),
+                        ty: DeclarationId(2110),
                     },
                 ],
             },
@@ -39761,11 +39761,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "OneStep".to_string(),
-                        ty: DeclarationId(2110),
+                        ty: DeclarationId(2111),
                     },
                     Field {
                         label: "AdditionalStep".to_string(),
-                        ty: DeclarationId(2111),
+                        ty: DeclarationId(2112),
                     },
                 ],
             },
@@ -39808,11 +39808,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DivideByTwo".to_string(),
-                        ty: DeclarationId(2112),
+                        ty: DeclarationId(2113),
                     },
                     Field {
                         label: "StrictlyLarger".to_string(),
-                        ty: DeclarationId(2113),
+                        ty: DeclarationId(2114),
                     },
                 ],
             },
@@ -39875,7 +39875,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(93)],
-                output: DeclarationId(2099),
+                output: DeclarationId(2100),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     6420,
@@ -39897,7 +39897,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(93)],
-                output: DeclarationId(2100),
+                output: DeclarationId(2101),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     6860,
@@ -39921,31 +39921,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ChildAccessor".to_string(),
-                        ty: DeclarationId(2114),
+                        ty: DeclarationId(2115),
                     },
                     Field {
                         label: "ListShrink".to_string(),
-                        ty: DeclarationId(2115),
+                        ty: DeclarationId(2116),
                     },
                     Field {
                         label: "ArithmeticSubtractDescent".to_string(),
-                        ty: DeclarationId(2116),
+                        ty: DeclarationId(2117),
                     },
                     Field {
                         label: "ArithmeticDivideDescent".to_string(),
-                        ty: DeclarationId(2117),
+                        ty: DeclarationId(2118),
                     },
                     Field {
                         label: "ParserAdvance".to_string(),
-                        ty: DeclarationId(2118),
+                        ty: DeclarationId(2119),
                     },
                     Field {
                         label: "SetRemoval".to_string(),
-                        ty: DeclarationId(2119),
+                        ty: DeclarationId(2120),
                     },
                     Field {
                         label: "FoldIteration".to_string(),
-                        ty: DeclarationId(2120),
+                        ty: DeclarationId(2121),
                     },
                 ],
             },
@@ -39965,7 +39965,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "dimensions".to_string(),
-                    ty: DeclarationId(2121),
+                    ty: DeclarationId(2122),
                 }],
             },
             type_params: vec![],
@@ -39993,7 +39993,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "evidence".to_string(),
-                        ty: DeclarationId(2122),
+                        ty: DeclarationId(2123),
                     },
                 ],
             },
@@ -40013,7 +40013,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Strict".to_string(),
-                    ty: DeclarationId(2123),
+                    ty: DeclarationId(2124),
                 }],
             },
             type_params: vec![],
@@ -40033,11 +40033,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NonIncreasing".to_string(),
-                        ty: DeclarationId(2124),
+                        ty: DeclarationId(2125),
                     },
                     Field {
                         label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2125),
+                        ty: DeclarationId(2126),
                     },
                 ],
             },
@@ -40058,11 +40058,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "EvidenceUnknown".to_string(),
-                        ty: DeclarationId(2126),
+                        ty: DeclarationId(2127),
                     },
                     Field {
                         label: "EvidenceIncomplete".to_string(),
-                        ty: DeclarationId(2127),
+                        ty: DeclarationId(2128),
                     },
                 ],
             },
@@ -40091,7 +40091,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "per_path".to_string(),
-                        ty: DeclarationId(2128),
+                        ty: DeclarationId(2129),
                     },
                 ],
             },
@@ -40110,7 +40110,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("descent_execution_proof".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(724), DeclarationId(722)],
-                output: DeclarationId(2101),
+                output: DeclarationId(2102),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     12400,
@@ -40171,19 +40171,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Observed".to_string(),
-                        ty: DeclarationId(2131),
+                        ty: DeclarationId(2132),
                     },
                     Field {
                         label: "Unobserved".to_string(),
-                        ty: DeclarationId(2132),
+                        ty: DeclarationId(2133),
                     },
                     Field {
                         label: "Ambiguous".to_string(),
-                        ty: DeclarationId(2133),
+                        ty: DeclarationId(2134),
                     },
                     Field {
                         label: "Stale".to_string(),
-                        ty: DeclarationId(2134),
+                        ty: DeclarationId(2135),
                     },
                 ],
             },
@@ -40309,7 +40309,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "observations".to_string(),
-                    ty: DeclarationId(2135),
+                    ty: DeclarationId(2136),
                 }],
             },
             type_params: vec![],
@@ -40499,7 +40499,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("timing_lens_empty_corrections".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2129),
+                output: DeclarationId(2130),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(716))),
             },
             type_params: vec![],
@@ -40607,7 +40607,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("timing_lens_read".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2130),
+                output: DeclarationId(2131),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(795))),
             },
             type_params: vec![],
@@ -40645,183 +40645,183 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2147),
+                        ty: DeclarationId(2148),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2148),
+                        ty: DeclarationId(2149),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2149),
+                        ty: DeclarationId(2150),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2150),
+                        ty: DeclarationId(2151),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2151),
+                        ty: DeclarationId(2152),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2152),
+                        ty: DeclarationId(2153),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2153),
+                        ty: DeclarationId(2154),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2154),
+                        ty: DeclarationId(2155),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2155),
+                        ty: DeclarationId(2156),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2156),
+                        ty: DeclarationId(2157),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2157),
+                        ty: DeclarationId(2158),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2158),
+                        ty: DeclarationId(2159),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2159),
+                        ty: DeclarationId(2160),
                     },
                     Field {
                         label: "Ident".to_string(),
-                        ty: DeclarationId(2160),
+                        ty: DeclarationId(2161),
                     },
                     Field {
                         label: "IntLit".to_string(),
-                        ty: DeclarationId(2161),
+                        ty: DeclarationId(2162),
                     },
                     Field {
                         label: "StringLit".to_string(),
-                        ty: DeclarationId(2162),
+                        ty: DeclarationId(2163),
                     },
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2163),
+                        ty: DeclarationId(2164),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2164),
+                        ty: DeclarationId(2165),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2165),
+                        ty: DeclarationId(2166),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2166),
+                        ty: DeclarationId(2167),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2167),
+                        ty: DeclarationId(2168),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2168),
+                        ty: DeclarationId(2169),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2169),
+                        ty: DeclarationId(2170),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2170),
+                        ty: DeclarationId(2171),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2171),
+                        ty: DeclarationId(2172),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2172),
+                        ty: DeclarationId(2173),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2173),
+                        ty: DeclarationId(2174),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2174),
+                        ty: DeclarationId(2175),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2175),
+                        ty: DeclarationId(2176),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2176),
+                        ty: DeclarationId(2177),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2177),
+                        ty: DeclarationId(2178),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2178),
+                        ty: DeclarationId(2179),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2179),
+                        ty: DeclarationId(2180),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2180),
+                        ty: DeclarationId(2181),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2181),
+                        ty: DeclarationId(2182),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2182),
+                        ty: DeclarationId(2183),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2183),
+                        ty: DeclarationId(2184),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2184),
+                        ty: DeclarationId(2185),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2185),
+                        ty: DeclarationId(2186),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2186),
+                        ty: DeclarationId(2187),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2187),
+                        ty: DeclarationId(2188),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2188),
+                        ty: DeclarationId(2189),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2189),
+                        ty: DeclarationId(2190),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2190),
+                        ty: DeclarationId(2191),
                     },
                     Field {
                         label: "Eof".to_string(),
-                        ty: DeclarationId(2191),
+                        ty: DeclarationId(2192),
                     },
                 ],
             },
@@ -40867,55 +40867,55 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2192),
+                        ty: DeclarationId(2193),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2193),
+                        ty: DeclarationId(2194),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2194),
+                        ty: DeclarationId(2195),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2195),
+                        ty: DeclarationId(2196),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2196),
+                        ty: DeclarationId(2197),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2197),
+                        ty: DeclarationId(2198),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2198),
+                        ty: DeclarationId(2199),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2199),
+                        ty: DeclarationId(2200),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2200),
+                        ty: DeclarationId(2201),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2201),
+                        ty: DeclarationId(2202),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2202),
+                        ty: DeclarationId(2203),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2203),
+                        ty: DeclarationId(2204),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2204),
+                        ty: DeclarationId(2205),
                     },
                 ],
             },
@@ -40936,115 +40936,115 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2205),
+                        ty: DeclarationId(2206),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2206),
+                        ty: DeclarationId(2207),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2207),
+                        ty: DeclarationId(2208),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2208),
+                        ty: DeclarationId(2209),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2209),
+                        ty: DeclarationId(2210),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2210),
+                        ty: DeclarationId(2211),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2211),
+                        ty: DeclarationId(2212),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2212),
+                        ty: DeclarationId(2213),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2213),
+                        ty: DeclarationId(2214),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2214),
+                        ty: DeclarationId(2215),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2215),
+                        ty: DeclarationId(2216),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2216),
+                        ty: DeclarationId(2217),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2217),
+                        ty: DeclarationId(2218),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2218),
+                        ty: DeclarationId(2219),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2219),
+                        ty: DeclarationId(2220),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2220),
+                        ty: DeclarationId(2221),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2221),
+                        ty: DeclarationId(2222),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2222),
+                        ty: DeclarationId(2223),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2223),
+                        ty: DeclarationId(2224),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2224),
+                        ty: DeclarationId(2225),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2225),
+                        ty: DeclarationId(2226),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2226),
+                        ty: DeclarationId(2227),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2227),
+                        ty: DeclarationId(2228),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2228),
+                        ty: DeclarationId(2229),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2229),
+                        ty: DeclarationId(2230),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2230),
+                        ty: DeclarationId(2231),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2231),
+                        ty: DeclarationId(2232),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2232),
+                        ty: DeclarationId(2233),
                     },
                 ],
             },
@@ -41290,43 +41290,43 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-                        ty: DeclarationId(2236),
+                        ty: DeclarationId(2237),
                     },
                     Field {
                         label: "ParseError".to_string(),
-                        ty: DeclarationId(2237),
+                        ty: DeclarationId(2238),
                     },
                     Field {
                         label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(2238),
+                        ty: DeclarationId(2239),
                     },
                     Field {
                         label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(2239),
+                        ty: DeclarationId(2240),
                     },
                     Field {
                         label: "ResolveError".to_string(),
-                        ty: DeclarationId(2240),
+                        ty: DeclarationId(2241),
                     },
                     Field {
                         label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(2241),
+                        ty: DeclarationId(2242),
                     },
                     Field {
                         label: "BranchConditionNotBool".to_string(),
-                        ty: DeclarationId(2242),
+                        ty: DeclarationId(2243),
                     },
                     Field {
                         label: "MagnitudeOutOfRange".to_string(),
-                        ty: DeclarationId(2243),
+                        ty: DeclarationId(2244),
                     },
                     Field {
                         label: "MalformedIntegerRangeFact".to_string(),
-                        ty: DeclarationId(2244),
+                        ty: DeclarationId(2245),
                     },
                     Field {
                         label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(2245),
+                        ty: DeclarationId(2246),
                     },
                 ],
             },
@@ -41347,11 +41347,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "AnyDetail".to_string(),
-                        ty: DeclarationId(2246),
+                        ty: DeclarationId(2247),
                     },
                     Field {
                         label: "Contains".to_string(),
-                        ty: DeclarationId(2247),
+                        ty: DeclarationId(2248),
                     },
                 ],
             },
@@ -41397,11 +41397,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(2248),
+                        ty: DeclarationId(2249),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(2249),
+                        ty: DeclarationId(2250),
                     },
                 ],
             },
@@ -41421,7 +41421,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "AtMostBudget".to_string(),
-                    ty: DeclarationId(2250),
+                    ty: DeclarationId(2251),
                 }],
             },
             type_params: vec![],
@@ -41441,15 +41441,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Associativity".to_string(),
-                        ty: DeclarationId(2251),
+                        ty: DeclarationId(2252),
                     },
                     Field {
                         label: "Commutativity".to_string(),
-                        ty: DeclarationId(2252),
+                        ty: DeclarationId(2253),
                     },
                     Field {
                         label: "Identity".to_string(),
-                        ty: DeclarationId(2253),
+                        ty: DeclarationId(2254),
                     },
                 ],
             },
@@ -41488,7 +41488,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "LiteralProgram".to_string(),
-                    ty: DeclarationId(2254),
+                    ty: DeclarationId(2255),
                 }],
             },
             type_params: vec![],
@@ -41507,7 +41507,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "LinearCostForBindParam".to_string(),
-                    ty: DeclarationId(2255),
+                    ty: DeclarationId(2256),
                 }],
             },
             type_params: vec![],
@@ -41526,7 +41526,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "SelectedBindParamSizeVariable".to_string(),
-                    ty: DeclarationId(2256),
+                    ty: DeclarationId(2257),
                 }],
             },
             type_params: vec![],
@@ -41565,11 +41565,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LensCapabilityStructuralTerminal".to_string(),
-                        ty: DeclarationId(2257),
+                        ty: DeclarationId(2258),
                     },
                     Field {
                         label: "LensCapabilityStructuralPartial".to_string(),
-                        ty: DeclarationId(2258),
+                        ty: DeclarationId(2259),
                     },
                 ],
             },
@@ -41590,19 +41590,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LensCapabilityBehavioralComplete".to_string(),
-                        ty: DeclarationId(2259),
+                        ty: DeclarationId(2260),
                     },
                     Field {
                         label: "LensCapabilityBehavioralPartial".to_string(),
-                        ty: DeclarationId(2260),
+                        ty: DeclarationId(2261),
                     },
                     Field {
                         label: "LensCapabilityBehavioralStub".to_string(),
-                        ty: DeclarationId(2261),
+                        ty: DeclarationId(2262),
                     },
                     Field {
                         label: "LensCapabilityBehavioralNA".to_string(),
-                        ty: DeclarationId(2262),
+                        ty: DeclarationId(2263),
                     },
                 ],
             },
@@ -41623,15 +41623,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LensCapabilityV2RealV2".to_string(),
-                        ty: DeclarationId(2263),
+                        ty: DeclarationId(2264),
                     },
                     Field {
                         label: "LensCapabilityV2NoneV3Native".to_string(),
-                        ty: DeclarationId(2264),
+                        ty: DeclarationId(2265),
                     },
                     Field {
                         label: "LensCapabilityV2NotApplicable".to_string(),
-                        ty: DeclarationId(2265),
+                        ty: DeclarationId(2266),
                     },
                 ],
             },
@@ -41690,7 +41690,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2305)),
+            meta_tag: Some(DeclarationId(2306)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -41702,21 +41702,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2257),
+                            constructor: DeclarationId(2258),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2259),
+                            constructor: DeclarationId(2260),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2263),
+                            constructor: DeclarationId(2264),
                             payload: vec![],
                         },
                     ),
@@ -41729,21 +41729,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2257),
+                            constructor: DeclarationId(2258),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2259),
+                            constructor: DeclarationId(2260),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2263),
+                            constructor: DeclarationId(2264),
                             payload: vec![],
                         },
                     ),
@@ -41758,21 +41758,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2257),
+                            constructor: DeclarationId(2258),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2262),
+                            constructor: DeclarationId(2263),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2264),
+                            constructor: DeclarationId(2265),
                             payload: vec![],
                         },
                     ),
@@ -41787,21 +41787,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2257),
+                            constructor: DeclarationId(2258),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2260),
+                            constructor: DeclarationId(2261),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2264),
+                            constructor: DeclarationId(2265),
                             payload: vec![],
                         },
                     ),
@@ -41814,21 +41814,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2257),
+                            constructor: DeclarationId(2258),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2259),
+                            constructor: DeclarationId(2260),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2264),
+                            constructor: DeclarationId(2265),
                             payload: vec![],
                         },
                     ),
@@ -41855,7 +41855,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2264),
+                            constructor: DeclarationId(2265),
                             payload: vec![],
                         },
                     ),
@@ -41868,21 +41868,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2257),
+                            constructor: DeclarationId(2258),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2259),
+                            constructor: DeclarationId(2260),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2264),
+                            constructor: DeclarationId(2265),
                             payload: vec![],
                         },
                     ),
@@ -41897,21 +41897,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2257),
+                            constructor: DeclarationId(2258),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2259),
+                            constructor: DeclarationId(2260),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2264),
+                            constructor: DeclarationId(2265),
                             payload: vec![],
                         },
                     ),
@@ -41924,21 +41924,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2257),
+                            constructor: DeclarationId(2258),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2259),
+                            constructor: DeclarationId(2260),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2264),
+                            constructor: DeclarationId(2265),
                             payload: vec![],
                         },
                     ),
@@ -41953,21 +41953,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2257),
+                            constructor: DeclarationId(2258),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2259),
+                            constructor: DeclarationId(2260),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2264),
+                            constructor: DeclarationId(2265),
                             payload: vec![],
                         },
                     ),
@@ -41980,21 +41980,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2258),
+                            constructor: DeclarationId(2259),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2262),
+                            constructor: DeclarationId(2263),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2265),
+                            constructor: DeclarationId(2266),
                             payload: vec![],
                         },
                     ),
@@ -42007,21 +42007,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2258),
+                            constructor: DeclarationId(2259),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2262),
+                            constructor: DeclarationId(2263),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2265),
+                            constructor: DeclarationId(2266),
                             payload: vec![],
                         },
                     ),
@@ -42036,21 +42036,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "structural".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2257),
+                            constructor: DeclarationId(2258),
                             payload: vec![],
                         },
                     ),
                     (
                         "behavioral".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2262),
+                            constructor: DeclarationId(2263),
                             payload: vec![],
                         },
                     ),
                     (
                         "v2_counterpart".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2265),
+                            constructor: DeclarationId(2266),
                             payload: vec![],
                         },
                     ),
@@ -42058,7 +42058,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ])),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/verification.dag", 7185, 9768),
+            span: SourceSpan::new("src/v3/std/verification.dag", 7185, 9772),
         });
         declarations.push(Declaration {
             id: DeclarationId(1277),
@@ -42067,107 +42067,107 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Compiles".to_string(),
-                        ty: DeclarationId(2266),
+                        ty: DeclarationId(2267),
                     },
                     Field {
                         label: "FailsWithDiagnostic".to_string(),
-                        ty: DeclarationId(2267),
+                        ty: DeclarationId(2268),
                     },
                     Field {
                         label: "OutputEquals".to_string(),
-                        ty: DeclarationId(2268),
+                        ty: DeclarationId(2269),
                     },
                     Field {
                         label: "PortHasState".to_string(),
-                        ty: DeclarationId(2269),
+                        ty: DeclarationId(2270),
                     },
                     Field {
                         label: "DeclarationHasRefinement".to_string(),
-                        ty: DeclarationId(2270),
+                        ty: DeclarationId(2271),
                     },
                     Field {
                         label: "CostBounded".to_string(),
-                        ty: DeclarationId(2271),
+                        ty: DeclarationId(2272),
                     },
                     Field {
                         label: "BehavioralObservation".to_string(),
-                        ty: DeclarationId(2272),
+                        ty: DeclarationId(2273),
                     },
                     Field {
                         label: "MockBackedInvariant".to_string(),
-                        ty: DeclarationId(2273),
+                        ty: DeclarationId(2274),
                     },
                     Field {
                         label: "ExecuteCommand".to_string(),
-                        ty: DeclarationId(2275),
+                        ty: DeclarationId(2276),
                     },
                     Field {
                         label: "ForAllTargets".to_string(),
-                        ty: DeclarationId(2277),
+                        ty: DeclarationId(2278),
                     },
                     Field {
                         label: "LensOutputEquals".to_string(),
-                        ty: DeclarationId(2278),
+                        ty: DeclarationId(2279),
                     },
                     Field {
                         label: "DifferentialEquals".to_string(),
-                        ty: DeclarationId(2279),
+                        ty: DeclarationId(2280),
                     },
                     Field {
                         label: "SymbolicCostExprEquals".to_string(),
-                        ty: DeclarationId(2280),
+                        ty: DeclarationId(2281),
                     },
                     Field {
                         label: "SymbolicCostExprEqualsForBindParam".to_string(),
-                        ty: DeclarationId(2281),
+                        ty: DeclarationId(2282),
                     },
                     Field {
                         label: "PerfWithinBaseline".to_string(),
-                        ty: DeclarationId(2282),
+                        ty: DeclarationId(2283),
                     },
                     Field {
                         label: "BinaryDimensionReportEquals".to_string(),
-                        ty: DeclarationId(2283),
+                        ty: DeclarationId(2284),
                     },
                     Field {
                         label: "AlgebraicLaw".to_string(),
-                        ty: DeclarationId(2284),
+                        ty: DeclarationId(2285),
                     },
                     Field {
                         label: "CensusBoundCheck".to_string(),
-                        ty: DeclarationId(2285),
+                        ty: DeclarationId(2286),
                     },
                     Field {
                         label: "CensusSubsetCount".to_string(),
-                        ty: DeclarationId(2286),
+                        ty: DeclarationId(2287),
                     },
                     Field {
                         label: "FixedPointConverges".to_string(),
-                        ty: DeclarationId(2287),
+                        ty: DeclarationId(2288),
                     },
                     Field {
                         label: "RatchetZero".to_string(),
-                        ty: DeclarationId(2288),
+                        ty: DeclarationId(2289),
                     },
                     Field {
                         label: "GeneratedFromDag".to_string(),
-                        ty: DeclarationId(2290),
+                        ty: DeclarationId(2291),
                     },
                     Field {
                         label: "CementingDispatchMatchesProjection".to_string(),
-                        ty: DeclarationId(2291),
+                        ty: DeclarationId(2292),
                     },
                     Field {
                         label: "ReleaseDeferredClaim".to_string(),
-                        ty: DeclarationId(2292),
+                        ty: DeclarationId(2293),
                     },
                     Field {
                         label: "SubstrateResearchDeferredClaim".to_string(),
-                        ty: DeclarationId(2293),
+                        ty: DeclarationId(2294),
                     },
                     Field {
                         label: "BridgeLedgerZero".to_string(),
-                        ty: DeclarationId(2294),
+                        ty: DeclarationId(2295),
                     },
                 ],
             },
@@ -42179,7 +42179,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", 9770, 22663),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9774, 22667),
         });
         declarations.push(Declaration {
             id: DeclarationId(1278),
@@ -42193,7 +42193,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", 22771, 22791),
+            span: SourceSpan::new("src/v3/std/verification.dag", 22775, 22795),
         });
         declarations.push(Declaration {
             id: DeclarationId(1279),
@@ -42212,7 +42212,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", 22934, 22989),
+            span: SourceSpan::new("src/v3/std/verification.dag", 22938, 22993),
         });
         declarations.push(Declaration {
             id: DeclarationId(1280),
@@ -42237,7 +42237,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "requires".to_string(),
-                        ty: DeclarationId(2295),
+                        ty: DeclarationId(2296),
                     },
                 ],
             },
@@ -42249,7 +42249,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", 23599, 23732),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23603, 23736),
         });
         declarations.push(Declaration {
             id: DeclarationId(1281),
@@ -42258,11 +42258,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ForAll".to_string(),
-                        ty: DeclarationId(2296),
+                        ty: DeclarationId(2297),
                     },
                     Field {
                         label: "Exists".to_string(),
-                        ty: DeclarationId(2297),
+                        ty: DeclarationId(2298),
                     },
                 ],
             },
@@ -42274,7 +42274,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", 23913, 23950),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23917, 23954),
         });
         declarations.push(Declaration {
             id: DeclarationId(1282),
@@ -42299,7 +42299,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "requires".to_string(),
-                        ty: DeclarationId(2298),
+                        ty: DeclarationId(2299),
                     },
                 ],
             },
@@ -42311,7 +42311,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", 23952, 24113),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23956, 24117),
         });
         declarations.push(Declaration {
             id: DeclarationId(1283),
@@ -42320,11 +42320,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "EnumeratedTestNode".to_string(),
-                        ty: DeclarationId(2299),
+                        ty: DeclarationId(2300),
                     },
                     Field {
                         label: "QuantifiedTestNode".to_string(),
-                        ty: DeclarationId(2300),
+                        ty: DeclarationId(2301),
                     },
                 ],
             },
@@ -42336,7 +42336,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", 25813, 25907),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25817, 25911),
         });
         declarations.push(Declaration {
             id: DeclarationId(1284),
@@ -42365,7 +42365,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", 25909, 26012),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25913, 26016),
         });
         declarations.push(Declaration {
             id: DeclarationId(1285),
@@ -42374,11 +42374,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Enumerated".to_string(),
-                        ty: DeclarationId(2301),
+                        ty: DeclarationId(2302),
                     },
                     Field {
                         label: "Quantified".to_string(),
-                        ty: DeclarationId(2302),
+                        ty: DeclarationId(2303),
                     },
                 ],
             },
@@ -42390,7 +42390,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", 26745, 26822),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26749, 26826),
         });
         declarations.push(Declaration {
             id: DeclarationId(1286),
@@ -42403,7 +42403,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "claims".to_string(),
-                        ty: DeclarationId(2303),
+                        ty: DeclarationId(2304),
                     },
                 ],
             },
@@ -42415,7 +42415,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", 26824, 26884),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26828, 26888),
         });
         declarations.push(Declaration {
             id: DeclarationId(1287),
@@ -42428,7 +42428,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "resources".to_string(),
-                        ty: DeclarationId(2304),
+                        ty: DeclarationId(2305),
                     },
                 ],
             },
@@ -42440,18 +42440,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", 27082, 27163),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27086, 27167),
         });
         declarations.push(Declaration {
             id: DeclarationId(1288),
             name: Some("claim_obligation_resources".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1280)],
-                output: DeclarationId(2233),
+                output: DeclarationId(2234),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    27605,
-                    27621,
+                    27609,
+                    27625,
                 )),
             },
             type_params: vec![],
@@ -42462,7 +42462,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", 27534, 27621),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27538, 27625),
         });
         declarations.push(Declaration {
             id: DeclarationId(1289),
@@ -42472,8 +42472,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 output: DeclarationId(1287),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    27679,
-                    27764,
+                    27683,
+                    27768,
                 )),
             },
             type_params: vec![],
@@ -42484,7 +42484,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", 27623, 27764),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27627, 27768),
         });
         declarations.push(Declaration {
             id: DeclarationId(1290),
@@ -42494,8 +42494,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 output: DeclarationId(1287),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    28071,
-                    28137,
+                    28075,
+                    28141,
                 )),
             },
             type_params: vec![],
@@ -42506,7 +42506,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", 27994, 28137),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27998, 28141),
         });
         declarations.push(Declaration {
             id: DeclarationId(1291),
@@ -42524,18 +42524,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", 28442, 28631),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28446, 28635),
         });
         declarations.push(Declaration {
             id: DeclarationId(1292),
             name: Some("materialize_test_obligations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2234)],
-                output: DeclarationId(2235),
+                inputs: vec![DeclarationId(2235)],
+                output: DeclarationId(2236),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
-                    28715,
-                    28760,
+                    28719,
+                    28764,
                 )),
             },
             type_params: vec![],
@@ -42546,14 +42546,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", 28633, 28760),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28637, 28764),
         });
         declarations.push(Declaration {
             id: DeclarationId(1293),
             name: Some("behavior_spine".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828)],
-                output: DeclarationId(2306),
+                output: DeclarationId(2307),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(815))),
             },
             type_params: vec![],
@@ -42690,15 +42690,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "SnapshotSurface".to_string(),
-                        ty: DeclarationId(2307),
+                        ty: DeclarationId(2308),
                     },
                     Field {
                         label: "SnapshotDag".to_string(),
-                        ty: DeclarationId(2308),
+                        ty: DeclarationId(2309),
                     },
                     Field {
                         label: "SnapshotText".to_string(),
-                        ty: DeclarationId(2309),
+                        ty: DeclarationId(2310),
                     },
                 ],
             },
@@ -42914,7 +42914,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2307),
+                            constructor: DeclarationId(2308),
                             payload: vec![],
                         },
                     ),
@@ -42949,7 +42949,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2308),
+                            constructor: DeclarationId(2309),
                             payload: vec![],
                         },
                     ),
@@ -42984,7 +42984,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2308),
+                            constructor: DeclarationId(2309),
                             payload: vec![],
                         },
                     ),
@@ -43019,7 +43019,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2308),
+                            constructor: DeclarationId(2309),
                             payload: vec![],
                         },
                     ),
@@ -43054,7 +43054,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2308),
+                            constructor: DeclarationId(2309),
                             payload: vec![],
                         },
                     ),
@@ -43089,7 +43089,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2309),
+                            constructor: DeclarationId(2310),
                             payload: vec![],
                         },
                     ),
@@ -43239,7 +43239,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("from_symbol".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(230)],
-                output: DeclarationId(2310),
+                output: DeclarationId(2311),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/compiler/operators.dag",
                     156,
@@ -43470,6 +43470,42 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(1331),
+            name: Some("lens_parallelism_entry".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(1326),
+                arguments: vec![],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: Some(DeclarationId(1326)),
+            specialization_parent: None,
+            inhabits: None,
+            value_body: Some(ValueBody::Structural {
+                fields: vec![
+                    (
+                        "name".to_string(),
+                        FieldValue::Literal(LiteralBits::String("parallelism".to_string())),
+                    ),
+                    (
+                        "lens_file".to_string(),
+                        FieldValue::Literal(LiteralBits::String(
+                            "src/v3/lenses/parallelism.dag".to_string(),
+                        )),
+                    ),
+                    (
+                        "generated_file".to_string(),
+                        FieldValue::Literal(LiteralBits::String(
+                            "src/v3/compiler/src/lens_parallelism_generated.rs".to_string(),
+                        )),
+                    ),
+                ],
+            }),
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 3037, 3226),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1332),
             name: Some("lens_provenance_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1326),
@@ -43502,10 +43538,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 3037, 3222),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 3228, 3413),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1332),
+            id: DeclarationId(1333),
             name: Some("lens_structural_resolution_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1326),
@@ -43541,10 +43577,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 3224, 3453),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 3415, 3644),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1333),
+            id: DeclarationId(1334),
             name: Some("lens_unused_parameters_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1326),
@@ -43577,10 +43613,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 3455, 3668),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 3646, 3859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1334),
+            id: DeclarationId(1335),
             name: Some("lens_infer_helpers_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1326),
@@ -43613,10 +43649,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 4295, 4487),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 4486, 4678),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1335),
+            id: DeclarationId(1336),
             name: Some("lens_variant_payload_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1326),
@@ -43649,10 +43685,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 4489, 4689),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 4680, 4880),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1336),
+            id: DeclarationId(1337),
             name: Some("lens_lower_helpers_entry".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1326),
@@ -43685,20 +43721,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/compiler/regen.dag", 4939, 5131),
+            span: SourceSpan::new("src/v3/compiler/regen.dag", 5130, 5322),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1337),
+            id: DeclarationId(1338),
             name: Some("IntegerAlgebra".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "OrderedRingAlgebra".to_string(),
-                        ty: DeclarationId(2311),
+                        ty: DeclarationId(2312),
                     },
                     Field {
                         label: "SemiringAlgebra".to_string(),
-                        ty: DeclarationId(2312),
+                        ty: DeclarationId(2313),
                     },
                 ],
             },
@@ -43713,21 +43749,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6404, 6466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1338),
+            id: DeclarationId(1339),
             name: Some("NonIntegerAlgebra".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ApproximateFieldAlgebra".to_string(),
-                        ty: DeclarationId(2313),
+                        ty: DeclarationId(2314),
                     },
                     Field {
                         label: "BooleanAlgebraAlgebra".to_string(),
-                        ty: DeclarationId(2314),
+                        ty: DeclarationId(2315),
                     },
                     Field {
                         label: "TerminalAlgebra".to_string(),
-                        ty: DeclarationId(2315),
+                        ty: DeclarationId(2316),
                     },
                 ],
             },
@@ -43742,37 +43778,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6468, 6564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1339),
+            id: DeclarationId(1340),
             name: Some("TargetCarrier".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BitCarrier".to_string(),
-                        ty: DeclarationId(2316),
+                        ty: DeclarationId(2317),
                     },
                     Field {
                         label: "ByteCarrier".to_string(),
-                        ty: DeclarationId(2317),
+                        ty: DeclarationId(2318),
                     },
                     Field {
                         label: "Word16Carrier".to_string(),
-                        ty: DeclarationId(2318),
+                        ty: DeclarationId(2319),
                     },
                     Field {
                         label: "Word32Carrier".to_string(),
-                        ty: DeclarationId(2319),
+                        ty: DeclarationId(2320),
                     },
                     Field {
                         label: "Word64Carrier".to_string(),
-                        ty: DeclarationId(2320),
+                        ty: DeclarationId(2321),
                     },
                     Field {
                         label: "Word128Carrier".to_string(),
-                        ty: DeclarationId(2321),
+                        ty: DeclarationId(2322),
                     },
                     Field {
                         label: "TerminalCarrier".to_string(),
-                        ty: DeclarationId(2322),
+                        ty: DeclarationId(2323),
                     },
                 ],
             },
@@ -43787,21 +43823,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8154, 8296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1340),
+            id: DeclarationId(1341),
             name: Some("IntegerOverflow".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TwoComplementWrap".to_string(),
-                        ty: DeclarationId(2323),
+                        ty: DeclarationId(2324),
                     },
                     Field {
                         label: "Saturating".to_string(),
-                        ty: DeclarationId(2324),
+                        ty: DeclarationId(2325),
                     },
                     Field {
                         label: "Trap".to_string(),
-                        ty: DeclarationId(2325),
+                        ty: DeclarationId(2326),
                     },
                 ],
             },
@@ -43816,17 +43852,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9013, 9079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1341),
+            id: DeclarationId(1342),
             name: Some("RustPrimitive".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IntegerPrimitive".to_string(),
-                        ty: DeclarationId(2326),
+                        ty: DeclarationId(2327),
                     },
                     Field {
                         label: "NonIntegerPrimitive".to_string(),
-                        ty: DeclarationId(2327),
+                        ty: DeclarationId(2328),
                     },
                 ],
             },
@@ -43841,94 +43877,94 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9834, 10616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1342),
+            id: DeclarationId(1343),
             name: Some("rust_pilot_primitives".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1341),
+                    value: DeclarationId(1342),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2328)),
+            meta_tag: Some(DeclarationId(2329)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
                 FieldValue::Variant {
-                    constructor: DeclarationId(2326),
+                    constructor: DeclarationId(2327),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2311),
+                            constructor: DeclarationId(2312),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2317),
+                            constructor: DeclarationId(2318),
                             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(2323),
+                            constructor: DeclarationId(2324),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2326),
+                    constructor: DeclarationId(2327),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2311),
+                            constructor: DeclarationId(2312),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2318),
+                            constructor: DeclarationId(2319),
                             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(2323),
+                            constructor: DeclarationId(2324),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2326),
+                    constructor: DeclarationId(2327),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2311),
+                            constructor: DeclarationId(2312),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2319),
+                            constructor: DeclarationId(2320),
                             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(2323),
+                            constructor: DeclarationId(2324),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2326),
+                    constructor: DeclarationId(2327),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2311),
+                            constructor: DeclarationId(2312),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2320),
+                            constructor: DeclarationId(2321),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -43937,21 +43973,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(2323),
+                            constructor: DeclarationId(2324),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2326),
+                    constructor: DeclarationId(2327),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i128".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2311),
+                            constructor: DeclarationId(2312),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2321),
+                            constructor: DeclarationId(2322),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -43962,84 +43998,84 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2323),
+                            constructor: DeclarationId(2324),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2326),
+                    constructor: DeclarationId(2327),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2312),
+                            constructor: DeclarationId(2313),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2317),
+                            constructor: DeclarationId(2318),
                             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(2323),
+                            constructor: DeclarationId(2324),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2326),
+                    constructor: DeclarationId(2327),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2312),
+                            constructor: DeclarationId(2313),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2318),
+                            constructor: DeclarationId(2319),
                             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(2323),
+                            constructor: DeclarationId(2324),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2326),
+                    constructor: DeclarationId(2327),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2312),
+                            constructor: DeclarationId(2313),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2319),
+                            constructor: DeclarationId(2320),
                             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(2323),
+                            constructor: DeclarationId(2324),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2326),
+                    constructor: DeclarationId(2327),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2312),
+                            constructor: DeclarationId(2313),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2320),
+                            constructor: DeclarationId(2321),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
@@ -44048,21 +44084,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2323),
+                            constructor: DeclarationId(2324),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2326),
+                    constructor: DeclarationId(2327),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u128".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2312),
+                            constructor: DeclarationId(2313),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2321),
+                            constructor: DeclarationId(2322),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
@@ -44071,66 +44107,66 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2323),
+                            constructor: DeclarationId(2324),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2327),
+                    constructor: DeclarationId(2328),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("f32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2313),
+                            constructor: DeclarationId(2314),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2319),
+                            constructor: DeclarationId(2320),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2327),
+                    constructor: DeclarationId(2328),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("f64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2313),
+                            constructor: DeclarationId(2314),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2320),
+                            constructor: DeclarationId(2321),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2327),
+                    constructor: DeclarationId(2328),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("bool".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2314),
+                            constructor: DeclarationId(2315),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2316),
+                            constructor: DeclarationId(2317),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2327),
+                    constructor: DeclarationId(2328),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("()".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2315),
+                            constructor: DeclarationId(2316),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2322),
+                            constructor: DeclarationId(2323),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
@@ -44142,29 +44178,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10937, 15660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1343),
+            id: DeclarationId(1344),
             name: Some("CronField".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Wildcard".to_string(),
-                        ty: DeclarationId(2329),
+                        ty: DeclarationId(2330),
                     },
                     Field {
                         label: "Exact".to_string(),
-                        ty: DeclarationId(2330),
+                        ty: DeclarationId(2331),
                     },
                     Field {
                         label: "Listed".to_string(),
-                        ty: DeclarationId(2332),
+                        ty: DeclarationId(2333),
                     },
                     Field {
                         label: "Ranged".to_string(),
-                        ty: DeclarationId(2333),
+                        ty: DeclarationId(2334),
                     },
                     Field {
                         label: "Step".to_string(),
-                        ty: DeclarationId(2334),
+                        ty: DeclarationId(2335),
                     },
                 ],
             },
@@ -44179,29 +44215,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4214, 4433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1344),
+            id: DeclarationId(1345),
             name: Some("CronSchedule".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "minute".to_string(),
-                        ty: DeclarationId(1343),
+                        ty: DeclarationId(1344),
                     },
                     Field {
                         label: "hour".to_string(),
-                        ty: DeclarationId(1343),
+                        ty: DeclarationId(1344),
                     },
                     Field {
                         label: "day_of_month".to_string(),
-                        ty: DeclarationId(1343),
+                        ty: DeclarationId(1344),
                     },
                     Field {
                         label: "month".to_string(),
-                        ty: DeclarationId(1343),
+                        ty: DeclarationId(1344),
                     },
                     Field {
                         label: "day_of_week".to_string(),
-                        ty: DeclarationId(1343),
+                        ty: DeclarationId(1344),
                     },
                 ],
             },
@@ -44216,7 +44252,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4435, 4564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1345),
+            id: DeclarationId(1346),
             name: Some("CronEntry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44226,7 +44262,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "schedule".to_string(),
-                        ty: DeclarationId(1344),
+                        ty: DeclarationId(1345),
                     },
                     Field {
                         label: "command".to_string(),
@@ -44245,10 +44281,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4566, 4641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1346),
+            id: DeclarationId(1347),
             name: Some("render_cron_field".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1343)],
+                inputs: vec![DeclarationId(1344)],
                 output: DeclarationId(230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "dsl/extdeps/cron_schedule_model.dag",
@@ -44267,10 +44303,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4643, 4963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1347),
+            id: DeclarationId(1348),
             name: Some("render_cron_schedule".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1344)],
+                inputs: vec![DeclarationId(1345)],
                 output: DeclarationId(230),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "dsl/extdeps/cron_schedule_model.dag",
@@ -44289,7 +44325,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4965, 5253),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1348),
+            id: DeclarationId(1349),
             name: Some("wire_contract".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(312),
@@ -44310,21 +44346,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 684, 758),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1349),
+            id: DeclarationId(1350),
             name: Some("UserType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "User".to_string(),
-                        ty: DeclarationId(2335),
+                        ty: DeclarationId(2336),
                     },
                     Field {
                         label: "Bot".to_string(),
-                        ty: DeclarationId(2336),
+                        ty: DeclarationId(2337),
                     },
                     Field {
                         label: "Organization".to_string(),
-                        ty: DeclarationId(2337),
+                        ty: DeclarationId(2338),
                     },
                 ],
             },
@@ -44339,7 +44375,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 831, 872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1350),
+            id: DeclarationId(1351),
             name: Some("GitHubUser".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44353,7 +44389,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "type".to_string(),
-                        ty: DeclarationId(1349),
+                        ty: DeclarationId(1350),
                     },
                 ],
             },
@@ -44368,7 +44404,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 874, 936),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1351),
+            id: DeclarationId(1352),
             name: Some("Repository".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44405,7 +44441,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1009, 1120),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1352),
+            id: DeclarationId(1353),
             name: Some("GitHubAuthToken".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44415,11 +44451,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "scopes".to_string(),
-                        ty: DeclarationId(2338),
+                        ty: DeclarationId(2339),
                     },
                     Field {
                         label: "expires_at".to_string(),
-                        ty: DeclarationId(2339),
+                        ty: DeclarationId(2340),
                     },
                 ],
             },
@@ -44434,29 +44470,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1193, 1286),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1353),
+            id: DeclarationId(1354),
             name: Some("GitHubScope".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ScopeRepo".to_string(),
-                        ty: DeclarationId(2340),
+                        ty: DeclarationId(2341),
                     },
                     Field {
                         label: "ScopeGist".to_string(),
-                        ty: DeclarationId(2341),
+                        ty: DeclarationId(2342),
                     },
                     Field {
                         label: "ScopeWorkflow".to_string(),
-                        ty: DeclarationId(2342),
+                        ty: DeclarationId(2343),
                     },
                     Field {
                         label: "ScopeReadOrg".to_string(),
-                        ty: DeclarationId(2343),
+                        ty: DeclarationId(2344),
                     },
                     Field {
                         label: "ScopeReadUser".to_string(),
-                        ty: DeclarationId(2344),
+                        ty: DeclarationId(2345),
                     },
                 ],
             },
@@ -44471,7 +44507,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1288, 1385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1354),
+            id: DeclarationId(1355),
             name: Some("Pagination".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44481,7 +44517,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "cursor".to_string(),
-                        ty: DeclarationId(2345),
+                        ty: DeclarationId(2346),
                     },
                     Field {
                         label: "has_next".to_string(),
@@ -44500,21 +44536,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1510, 1580),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1355),
+            id: DeclarationId(1356),
             name: Some("GitHubPermission".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PermRead".to_string(),
-                        ty: DeclarationId(2346),
+                        ty: DeclarationId(2347),
                     },
                     Field {
                         label: "PermWrite".to_string(),
-                        ty: DeclarationId(2347),
+                        ty: DeclarationId(2348),
                     },
                     Field {
                         label: "PermAdmin".to_string(),
-                        ty: DeclarationId(2348),
+                        ty: DeclarationId(2349),
                     },
                 ],
             },
@@ -44529,7 +44565,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1653, 1709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1356),
+            id: DeclarationId(1357),
             name: Some("default_api_base".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -44548,7 +44584,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1782, 1838),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1357),
+            id: DeclarationId(1358),
             name: Some("default_per_page".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -44565,7 +44601,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1840, 1871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1358),
+            id: DeclarationId(1359),
             name: Some("max_per_page".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -44582,7 +44618,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1873, 1901),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1359),
+            id: DeclarationId(1360),
             name: Some("Workflow".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44592,23 +44628,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "on".to_string(),
-                        ty: DeclarationId(2349),
+                        ty: DeclarationId(2350),
                     },
                     Field {
                         label: "concurrency".to_string(),
-                        ty: DeclarationId(2350),
+                        ty: DeclarationId(2351),
                     },
                     Field {
                         label: "jobs".to_string(),
-                        ty: DeclarationId(2351),
+                        ty: DeclarationId(2352),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(2353),
+                        ty: DeclarationId(2354),
                     },
                     Field {
                         label: "permissions".to_string(),
-                        ty: DeclarationId(2354),
+                        ty: DeclarationId(2355),
                     },
                 ],
             },
@@ -44623,25 +44659,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1484, 1748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1360),
+            id: DeclarationId(1361),
             name: Some("WorkflowPermissions".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "contents".to_string(),
-                        ty: DeclarationId(1361),
+                        ty: DeclarationId(1362),
                     },
                     Field {
                         label: "pull_requests".to_string(),
-                        ty: DeclarationId(1361),
+                        ty: DeclarationId(1362),
                     },
                     Field {
                         label: "issues".to_string(),
-                        ty: DeclarationId(1361),
+                        ty: DeclarationId(1362),
                     },
                     Field {
                         label: "actions".to_string(),
-                        ty: DeclarationId(1361),
+                        ty: DeclarationId(1362),
                     },
                 ],
             },
@@ -44656,21 +44692,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1750, 1892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1361),
+            id: DeclarationId(1362),
             name: Some("PermissionLevel".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PermRead".to_string(),
-                        ty: DeclarationId(2355),
+                        ty: DeclarationId(2356),
                     },
                     Field {
                         label: "PermWrite".to_string(),
-                        ty: DeclarationId(2356),
+                        ty: DeclarationId(2357),
                     },
                     Field {
                         label: "PermNone".to_string(),
-                        ty: DeclarationId(2357),
+                        ty: DeclarationId(2358),
                     },
                 ],
             },
@@ -44685,29 +44721,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1894, 1948),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1362),
+            id: DeclarationId(1363),
             name: Some("WorkflowTrigger".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Push".to_string(),
-                        ty: DeclarationId(2360),
+                        ty: DeclarationId(2361),
                     },
                     Field {
                         label: "PullRequest".to_string(),
-                        ty: DeclarationId(2363),
+                        ty: DeclarationId(2364),
                     },
                     Field {
                         label: "Schedule".to_string(),
-                        ty: DeclarationId(2364),
+                        ty: DeclarationId(2365),
                     },
                     Field {
                         label: "WorkflowDispatch".to_string(),
-                        ty: DeclarationId(2366),
+                        ty: DeclarationId(2367),
                     },
                     Field {
                         label: "WorkflowCall".to_string(),
-                        ty: DeclarationId(2368),
+                        ty: DeclarationId(2369),
                     },
                 ],
             },
@@ -44722,29 +44758,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2064, 2356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1363),
+            id: DeclarationId(1364),
             name: Some("PullRequestActivity".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Opened".to_string(),
-                        ty: DeclarationId(2369),
+                        ty: DeclarationId(2370),
                     },
                     Field {
                         label: "Synchronize".to_string(),
-                        ty: DeclarationId(2370),
+                        ty: DeclarationId(2371),
                     },
                     Field {
                         label: "Reopened".to_string(),
-                        ty: DeclarationId(2371),
+                        ty: DeclarationId(2372),
                     },
                     Field {
                         label: "ReadyForReview".to_string(),
-                        ty: DeclarationId(2372),
+                        ty: DeclarationId(2373),
                     },
                     Field {
                         label: "Closed".to_string(),
-                        ty: DeclarationId(2373),
+                        ty: DeclarationId(2374),
                     },
                 ],
             },
@@ -44759,7 +44795,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2358, 2452),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1364),
+            id: DeclarationId(1365),
             name: Some("DispatchInput".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44769,7 +44805,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "description".to_string(),
-                        ty: DeclarationId(2374),
+                        ty: DeclarationId(2375),
                     },
                     Field {
                         label: "required".to_string(),
@@ -44777,11 +44813,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "default".to_string(),
-                        ty: DeclarationId(2375),
+                        ty: DeclarationId(2376),
                     },
                     Field {
                         label: "type".to_string(),
-                        ty: DeclarationId(1365),
+                        ty: DeclarationId(1366),
                     },
                 ],
             },
@@ -44796,25 +44832,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2454, 2576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1365),
+            id: DeclarationId(1366),
             name: Some("DispatchInputType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "InputString".to_string(),
-                        ty: DeclarationId(2376),
+                        ty: DeclarationId(2377),
                     },
                     Field {
                         label: "InputBoolean".to_string(),
-                        ty: DeclarationId(2377),
+                        ty: DeclarationId(2378),
                     },
                     Field {
                         label: "InputChoice".to_string(),
-                        ty: DeclarationId(2378),
+                        ty: DeclarationId(2379),
                     },
                     Field {
                         label: "InputEnvironment".to_string(),
-                        ty: DeclarationId(2379),
+                        ty: DeclarationId(2380),
                     },
                 ],
             },
@@ -44829,21 +44865,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2578, 2662),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1366),
+            id: DeclarationId(1367),
             name: Some("SecretScope".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "StepScope".to_string(),
-                        ty: DeclarationId(2380),
+                        ty: DeclarationId(2381),
                     },
                     Field {
                         label: "JobScope".to_string(),
-                        ty: DeclarationId(2381),
+                        ty: DeclarationId(2382),
                     },
                     Field {
                         label: "WorkflowScope".to_string(),
-                        ty: DeclarationId(2382),
+                        ty: DeclarationId(2383),
                     },
                 ],
             },
@@ -44858,7 +44894,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4765, 4820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1367),
+            id: DeclarationId(1368),
             name: Some("WorkflowSecret".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44868,7 +44904,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "scope".to_string(),
-                        ty: DeclarationId(1366),
+                        ty: DeclarationId(1367),
                     },
                 ],
             },
@@ -44883,7 +44919,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5095, 5158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1368),
+            id: DeclarationId(1369),
             name: Some("Job".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -44893,39 +44929,39 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(2383),
+                        ty: DeclarationId(2384),
                     },
                     Field {
                         label: "runner".to_string(),
-                        ty: DeclarationId(1372),
+                        ty: DeclarationId(1373),
                     },
                     Field {
                         label: "steps".to_string(),
-                        ty: DeclarationId(2384),
+                        ty: DeclarationId(2385),
                     },
                     Field {
                         label: "needs".to_string(),
-                        ty: DeclarationId(2385),
+                        ty: DeclarationId(2386),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(2387),
+                        ty: DeclarationId(2388),
                     },
                     Field {
                         label: "outputs".to_string(),
-                        ty: DeclarationId(2389),
+                        ty: DeclarationId(2390),
                     },
                     Field {
                         label: "if_condition".to_string(),
-                        ty: DeclarationId(2390),
+                        ty: DeclarationId(2391),
                     },
                     Field {
                         label: "strategy".to_string(),
-                        ty: DeclarationId(2391),
+                        ty: DeclarationId(2392),
                     },
                     Field {
                         label: "timeout_minutes".to_string(),
-                        ty: DeclarationId(2392),
+                        ty: DeclarationId(2393),
                     },
                     Field {
                         label: "continue_on_error".to_string(),
@@ -44933,7 +44969,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "concurrency".to_string(),
-                        ty: DeclarationId(2393),
+                        ty: DeclarationId(2394),
                     },
                 ],
             },
@@ -44948,17 +44984,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5302, 5771),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1369),
+            id: DeclarationId(1370),
             name: Some("CancelInProgressSpec".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "CancelInProgressBool".to_string(),
-                        ty: DeclarationId(2394),
+                        ty: DeclarationId(2395),
                     },
                     Field {
                         label: "CancelInProgressExpression".to_string(),
-                        ty: DeclarationId(2395),
+                        ty: DeclarationId(2396),
                     },
                 ],
             },
@@ -44973,17 +45009,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6589, 6709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1370),
+            id: DeclarationId(1371),
             name: Some("CancelInProgressWhenQueueMax".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "QueueMaxCancelInProgressFalse".to_string(),
-                        ty: DeclarationId(2396),
+                        ty: DeclarationId(2397),
                     },
                     Field {
                         label: "QueueMaxCancelInProgressExpression".to_string(),
-                        ty: DeclarationId(2397),
+                        ty: DeclarationId(2398),
                     },
                 ],
             },
@@ -44998,21 +45034,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7517, 7646),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1371),
+            id: DeclarationId(1372),
             name: Some("ConcurrencySpec".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ConcurrencyScalar".to_string(),
-                        ty: DeclarationId(2398),
+                        ty: DeclarationId(2399),
                     },
                     Field {
                         label: "ConcurrencyMappingQueueMax".to_string(),
-                        ty: DeclarationId(2400),
+                        ty: DeclarationId(2401),
                     },
                     Field {
                         label: "ConcurrencyMappingQueueNotMax".to_string(),
-                        ty: DeclarationId(2403),
+                        ty: DeclarationId(2404),
                     },
                 ],
             },
@@ -45027,21 +45063,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8199, 8845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1372),
+            id: DeclarationId(1373),
             name: Some("RunnerSpec".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "HostedRunner".to_string(),
-                        ty: DeclarationId(2404),
+                        ty: DeclarationId(2405),
                     },
                     Field {
                         label: "SelfHosted".to_string(),
-                        ty: DeclarationId(2406),
+                        ty: DeclarationId(2407),
                     },
                     Field {
                         label: "RunsOnExpression".to_string(),
-                        ty: DeclarationId(2407),
+                        ty: DeclarationId(2408),
                     },
                 ],
             },
@@ -45056,33 +45092,33 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10017, 10240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1373),
+            id: DeclarationId(1374),
             name: Some("RunnerLabel".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "UbuntuLatest".to_string(),
-                        ty: DeclarationId(2408),
+                        ty: DeclarationId(2409),
                     },
                     Field {
                         label: "Ubuntu2404".to_string(),
-                        ty: DeclarationId(2409),
+                        ty: DeclarationId(2410),
                     },
                     Field {
                         label: "Ubuntu2204".to_string(),
-                        ty: DeclarationId(2410),
+                        ty: DeclarationId(2411),
                     },
                     Field {
                         label: "MacosLatest".to_string(),
-                        ty: DeclarationId(2411),
+                        ty: DeclarationId(2412),
                     },
                     Field {
                         label: "Macos14".to_string(),
-                        ty: DeclarationId(2412),
+                        ty: DeclarationId(2413),
                     },
                     Field {
                         label: "WindowsLatest".to_string(),
-                        ty: DeclarationId(2413),
+                        ty: DeclarationId(2414),
                     },
                 ],
             },
@@ -45097,17 +45133,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10242, 10351),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1374),
+            id: DeclarationId(1375),
             name: Some("Step".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "RunStep".to_string(),
-                        ty: DeclarationId(2421),
+                        ty: DeclarationId(2422),
                     },
                     Field {
                         label: "UsesStep".to_string(),
-                        ty: DeclarationId(2430),
+                        ty: DeclarationId(2431),
                     },
                 ],
             },
@@ -45122,29 +45158,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10496, 11091),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1375),
+            id: DeclarationId(1376),
             name: Some("ShellType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Bash".to_string(),
-                        ty: DeclarationId(2431),
+                        ty: DeclarationId(2432),
                     },
                     Field {
                         label: "Sh".to_string(),
-                        ty: DeclarationId(2432),
+                        ty: DeclarationId(2433),
                     },
                     Field {
                         label: "Pwsh".to_string(),
-                        ty: DeclarationId(2433),
+                        ty: DeclarationId(2434),
                     },
                     Field {
                         label: "Python".to_string(),
-                        ty: DeclarationId(2434),
+                        ty: DeclarationId(2435),
                     },
                     Field {
                         label: "Cmd".to_string(),
-                        ty: DeclarationId(2435),
+                        ty: DeclarationId(2436),
                     },
                 ],
             },
@@ -45159,7 +45195,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11093, 11141),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1376),
+            id: DeclarationId(1377),
             name: Some("ActionRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -45188,41 +45224,41 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11143, 11206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1377),
+            id: DeclarationId(1378),
             name: Some("LogAnnotation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "AnnotationError".to_string(),
-                        ty: DeclarationId(2439),
+                        ty: DeclarationId(2440),
                     },
                     Field {
                         label: "AnnotationWarning".to_string(),
-                        ty: DeclarationId(2443),
+                        ty: DeclarationId(2444),
                     },
                     Field {
                         label: "AnnotationNotice".to_string(),
-                        ty: DeclarationId(2447),
+                        ty: DeclarationId(2448),
                     },
                     Field {
                         label: "AnnotationGroup".to_string(),
-                        ty: DeclarationId(2448),
+                        ty: DeclarationId(2449),
                     },
                     Field {
                         label: "AnnotationEndGroup".to_string(),
-                        ty: DeclarationId(2449),
+                        ty: DeclarationId(2450),
                     },
                     Field {
                         label: "SetOutput".to_string(),
-                        ty: DeclarationId(2450),
+                        ty: DeclarationId(2451),
                     },
                     Field {
                         label: "AddMask".to_string(),
-                        ty: DeclarationId(2451),
+                        ty: DeclarationId(2452),
                     },
                     Field {
                         label: "StopCommands".to_string(),
-                        ty: DeclarationId(2452),
+                        ty: DeclarationId(2453),
                     },
                 ],
             },
@@ -45237,7 +45273,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11440, 11867),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1378),
+            id: DeclarationId(1379),
             name: Some("annotation_error_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45256,7 +45292,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11933, 11982),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1379),
+            id: DeclarationId(1380),
             name: Some("annotation_warning_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45275,7 +45311,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11983, 12036),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1380),
+            id: DeclarationId(1381),
             name: Some("annotation_notice_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45294,7 +45330,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12037, 12088),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1381),
+            id: DeclarationId(1382),
             name: Some("annotation_group_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45313,7 +45349,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12089, 12139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1382),
+            id: DeclarationId(1383),
             name: Some("annotation_endgroup".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45332,7 +45368,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12140, 12189),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1383),
+            id: DeclarationId(1384),
             name: Some("annotation_set_output_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45351,7 +45387,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12190, 12254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1384),
+            id: DeclarationId(1385),
             name: Some("annotation_add_mask_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45370,7 +45406,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12255, 12311),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1385),
+            id: DeclarationId(1386),
             name: Some("annotation_stop_commands_prefix".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45389,17 +45425,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12312, 12378),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1386),
+            id: DeclarationId(1387),
             name: Some("ArtifactOp".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Upload".to_string(),
-                        ty: DeclarationId(2454),
+                        ty: DeclarationId(2455),
                     },
                     Field {
                         label: "Download".to_string(),
-                        ty: DeclarationId(2456),
+                        ty: DeclarationId(2457),
                     },
                 ],
             },
@@ -45414,21 +45450,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12600, 12765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1387),
+            id: DeclarationId(1388),
             name: Some("MissingFilesBehavior".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Warn".to_string(),
-                        ty: DeclarationId(2457),
+                        ty: DeclarationId(2458),
                     },
                     Field {
                         label: "ErrorOut".to_string(),
-                        ty: DeclarationId(2458),
+                        ty: DeclarationId(2459),
                     },
                     Field {
                         label: "Ignore".to_string(),
-                        ty: DeclarationId(2459),
+                        ty: DeclarationId(2460),
                     },
                 ],
             },
@@ -45443,15 +45479,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12767, 12819),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1388),
+            id: DeclarationId(1389),
             name: Some("upload_artifact_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1376),
+                template: DeclarationId(1377),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1376)),
+            meta_tag: Some(DeclarationId(1377)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -45464,15 +45500,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12870, 12979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1389),
+            id: DeclarationId(1390),
             name: Some("download_artifact_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1376),
+                template: DeclarationId(1377),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1376)),
+            meta_tag: Some(DeclarationId(1377)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -45485,21 +45521,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12981, 13094),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1390),
+            id: DeclarationId(1391),
             name: Some("MatrixStrategy".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "dimensions".to_string(),
-                        ty: DeclarationId(2461),
+                        ty: DeclarationId(2462),
                     },
                     Field {
                         label: "include".to_string(),
-                        ty: DeclarationId(2463),
+                        ty: DeclarationId(2464),
                     },
                     Field {
                         label: "exclude".to_string(),
-                        ty: DeclarationId(2465),
+                        ty: DeclarationId(2466),
                     },
                     Field {
                         label: "fail_fast".to_string(),
@@ -45507,7 +45543,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "max_parallel".to_string(),
-                        ty: DeclarationId(2466),
+                        ty: DeclarationId(2467),
                     },
                 ],
             },
@@ -45522,33 +45558,33 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13233, 13409),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1391),
+            id: DeclarationId(1392),
             name: Some("CheckConclusion".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Success".to_string(),
-                        ty: DeclarationId(2467),
+                        ty: DeclarationId(2468),
                     },
                     Field {
                         label: "Failure".to_string(),
-                        ty: DeclarationId(2468),
+                        ty: DeclarationId(2469),
                     },
                     Field {
                         label: "Cancelled".to_string(),
-                        ty: DeclarationId(2469),
+                        ty: DeclarationId(2470),
                     },
                     Field {
                         label: "Skipped".to_string(),
-                        ty: DeclarationId(2470),
+                        ty: DeclarationId(2471),
                     },
                     Field {
                         label: "TimedOut".to_string(),
-                        ty: DeclarationId(2471),
+                        ty: DeclarationId(2472),
                     },
                     Field {
                         label: "ActionRequired".to_string(),
-                        ty: DeclarationId(2472),
+                        ty: DeclarationId(2473),
                     },
                 ],
             },
@@ -45563,15 +45599,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13538, 13640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1392),
+            id: DeclarationId(1393),
             name: Some("checkout_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1376),
+                template: DeclarationId(1377),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1376)),
+            meta_tag: Some(DeclarationId(1377)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -45584,15 +45620,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13766, 13861),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1393),
+            id: DeclarationId(1394),
             name: Some("setup_rust_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1376),
+                template: DeclarationId(1377),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1376)),
+            meta_tag: Some(DeclarationId(1377)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -45605,15 +45641,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13863, 13987),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1394),
+            id: DeclarationId(1395),
             name: Some("cache_action".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1376),
+                template: DeclarationId(1377),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1376)),
+            meta_tag: Some(DeclarationId(1377)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -45626,7 +45662,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13989, 14078),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1395),
+            id: DeclarationId(1396),
             name: Some("max_job_timeout_minutes".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -45643,7 +45679,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14154, 14193),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1396),
+            id: DeclarationId(1397),
             name: Some("default_job_timeout_minutes".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -45660,7 +45696,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14195, 14238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1397),
+            id: DeclarationId(1398),
             name: Some("max_matrix_combinations".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(93),
@@ -45677,7 +45713,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14240, 14279),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1398),
+            id: DeclarationId(1399),
             name: Some("github_actions_workflows_dir".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(230),
@@ -45696,17 +45732,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1207, 1270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1399),
+            id: DeclarationId(1400),
             name: Some("GitHubActionsWorkflowExtension".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "GitHubActionsWorkflowYml".to_string(),
-                        ty: DeclarationId(2473),
+                        ty: DeclarationId(2474),
                     },
                     Field {
                         label: "GitHubActionsWorkflowYaml".to_string(),
-                        ty: DeclarationId(2474),
+                        ty: DeclarationId(2475),
                     },
                 ],
             },
@@ -45721,7 +45757,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1895, 1989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1400),
+            id: DeclarationId(1401),
             name: Some("GitHubActionsWorkflowStemSegment".to_string()),
             connective: TypeConnective::Atom(AtomPayload::ResolvedByStructure(DeclarationId(151))),
             type_params: vec![],
@@ -45730,17 +45766,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             specialization_parent: None,
             inhabits: None,
             value_body: None,
-            refinement: Some(DeclarationId(2475)),
+            refinement: Some(DeclarationId(2476)),
             nominal_opacity: None,
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2615, 2714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1401),
+            id: DeclarationId(1402),
             name: Some("GitHubActionsWorkflowStem".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "segment".to_string(),
-                    ty: DeclarationId(1400),
+                    ty: DeclarationId(1401),
                 }],
             },
             type_params: vec![],
@@ -45754,17 +45790,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2916, 2994),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1402),
+            id: DeclarationId(1403),
             name: Some("GitHubActionsWorkflowFileRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "stem".to_string(),
-                        ty: DeclarationId(1401),
+                        ty: DeclarationId(1402),
                     },
                     Field {
                         label: "extension".to_string(),
-                        ty: DeclarationId(1399),
+                        ty: DeclarationId(1400),
                     },
                 ],
             },
@@ -45779,7 +45815,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 3398, 3513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1403),
+            id: DeclarationId(1404),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45799,7 +45835,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(1404),
+            id: DeclarationId(1405),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45819,7 +45855,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(1405),
+            id: DeclarationId(1406),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45839,7 +45875,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(1406),
+            id: DeclarationId(1407),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45859,7 +45895,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(1407),
+            id: DeclarationId(1408),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45879,7 +45915,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(1408),
+            id: DeclarationId(1409),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(695), DeclarationId(694)],
@@ -45897,7 +45933,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(1409),
+            id: DeclarationId(1410),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45917,7 +45953,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(1410),
+            id: DeclarationId(1411),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(697), DeclarationId(698)],
@@ -45935,7 +45971,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(1411),
+            id: DeclarationId(1412),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45955,7 +45991,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(1412),
+            id: DeclarationId(1413),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45975,7 +46011,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(1413),
+            id: DeclarationId(1414),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -45995,7 +46031,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(1414),
+            id: DeclarationId(1415),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46015,7 +46051,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(1415),
+            id: DeclarationId(1416),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(702)],
@@ -46033,7 +46069,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(1416),
+            id: DeclarationId(1417),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46053,7 +46089,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(1417),
+            id: DeclarationId(1418),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46073,7 +46109,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(1418),
+            id: DeclarationId(1419),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(705)],
@@ -46091,7 +46127,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(1419),
+            id: DeclarationId(1420),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46111,7 +46147,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(1420),
+            id: DeclarationId(1421),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46131,7 +46167,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(1421),
+            id: DeclarationId(1422),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46151,11 +46187,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(1422),
+            id: DeclarationId(1423),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(707)],
-                output: DeclarationId(1421),
+                output: DeclarationId(1422),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -46169,7 +46205,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(1423),
+            id: DeclarationId(1424),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46189,7 +46225,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(1424),
+            id: DeclarationId(1425),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46209,7 +46245,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(1425),
+            id: DeclarationId(1426),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46229,7 +46265,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(1426),
+            id: DeclarationId(1427),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46249,7 +46285,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(1427),
+            id: DeclarationId(1428),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(713),
@@ -46269,13 +46305,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(1428),
+            id: DeclarationId(1429),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1427),
+                    value: DeclarationId(1428),
                 }],
             },
             type_params: vec![],
@@ -46289,7 +46325,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(1429),
+            id: DeclarationId(1430),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46309,7 +46345,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(1430),
+            id: DeclarationId(1431),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(713),
@@ -46329,13 +46365,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(1431),
+            id: DeclarationId(1432),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1430),
+                    value: DeclarationId(1431),
                 }],
             },
             type_params: vec![],
@@ -46349,7 +46385,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(1432),
+            id: DeclarationId(1433),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46369,7 +46405,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(1433),
+            id: DeclarationId(1434),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -46383,7 +46419,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(1434),
+            id: DeclarationId(1435),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46403,7 +46439,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(1435),
+            id: DeclarationId(1436),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -46413,7 +46449,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "tail".to_string(),
-                        ty: DeclarationId(1434),
+                        ty: DeclarationId(1435),
                     },
                 ],
             },
@@ -46428,7 +46464,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(1436),
+            id: DeclarationId(1437),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46448,7 +46484,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(1437),
+            id: DeclarationId(1438),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46468,7 +46504,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(1438),
+            id: DeclarationId(1439),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -46487,7 +46523,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(1439),
+            id: DeclarationId(1440),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -46504,10 +46540,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/effects.dag", 20916, 20943),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20914, 20941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1440),
+            id: DeclarationId(1441),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(713),
@@ -46524,10 +46560,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/effects.dag", 20995, 21026),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20993, 21024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1441),
+            id: DeclarationId(1442),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -46544,14 +46580,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/effects.dag", 21031, 21058),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21056),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1442),
+            id: DeclarationId(1443),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1441),
+                    DeclarationId(1442),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -46563,10 +46599,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/effects.dag", 21031, 21059),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1443),
+            id: DeclarationId(1444),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46583,10 +46619,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/effects.dag", 21185, 21206),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21183, 21204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1444),
+            id: DeclarationId(1445),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -46603,14 +46639,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/effects.dag", 21211, 21238),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21236),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1445),
+            id: DeclarationId(1446),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1444),
+                    DeclarationId(1445),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -46622,10 +46658,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/effects.dag", 21211, 21239),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1446),
+            id: DeclarationId(1447),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46642,10 +46678,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/effects.dag", 22268, 22289),
+            span: SourceSpan::new("src/v3/std/effects.dag", 22266, 22287),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1447),
+            id: DeclarationId(1448),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -46661,10 +46697,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/effects.dag", 29695, 29706),
+            span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1448),
+            id: DeclarationId(1449),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -46680,10 +46716,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/effects.dag", 30432, 30439),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1449),
+            id: DeclarationId(1450),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -46699,10 +46735,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/effects.dag", 30662, 30669),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30660, 30667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1450),
+            id: DeclarationId(1451),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46719,10 +46755,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/effects.dag", 36581, 36602),
+            span: SourceSpan::new("src/v3/std/effects.dag", 36579, 36600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1451),
+            id: DeclarationId(1452),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46739,10 +46775,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/effects.dag", 36608, 36639),
+            span: SourceSpan::new("src/v3/std/effects.dag", 36606, 36637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1452),
+            id: DeclarationId(1453),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -46761,7 +46797,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(1453),
+            id: DeclarationId(1454),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -46780,7 +46816,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(1454),
+            id: DeclarationId(1455),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46800,7 +46836,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(1455),
+            id: DeclarationId(1456),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -46820,12 +46856,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(1456),
+            id: DeclarationId(1457),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tokens".to_string(),
-                    ty: DeclarationId(1455),
+                    ty: DeclarationId(1456),
                 }],
             },
             type_params: vec![],
@@ -46839,7 +46875,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(1457),
+            id: DeclarationId(1458),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -46864,7 +46900,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(1458),
+            id: DeclarationId(1459),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -46883,7 +46919,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(1459),
+            id: DeclarationId(1460),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -46912,7 +46948,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(1460),
+            id: DeclarationId(1461),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -46923,10 +46959,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/effects.dag", 14355, 14365),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14353, 14363),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1461),
+            id: DeclarationId(1462),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -46942,10 +46978,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/effects.dag", 14370, 14408),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14368, 14406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1462),
+            id: DeclarationId(1463),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -46961,10 +46997,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/effects.dag", 14413, 14451),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14411, 14449),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1463),
+            id: DeclarationId(1464),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -46980,10 +47016,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/effects.dag", 14697, 14732),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14695, 14730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1464),
+            id: DeclarationId(1465),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -46994,10 +47030,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/effects.dag", 14737, 14749),
+            span: SourceSpan::new("src/v3/std/effects.dag", 14735, 14747),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1465),
+            id: DeclarationId(1466),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47013,10 +47049,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/effects.dag", 15171, 15200),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15169, 15198),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1466),
+            id: DeclarationId(1467),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47032,10 +47068,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/effects.dag", 15205, 15230),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15203, 15228),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1467),
+            id: DeclarationId(1468),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47046,10 +47082,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/effects.dag", 15743, 15753),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15741, 15751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1468),
+            id: DeclarationId(1469),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47065,10 +47101,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/effects.dag", 15758, 15796),
+            span: SourceSpan::new("src/v3/std/effects.dag", 15756, 15794),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1469),
+            id: DeclarationId(1470),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47084,10 +47120,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/effects.dag", 16501, 16528),
+            span: SourceSpan::new("src/v3/std/effects.dag", 16499, 16526),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1470),
+            id: DeclarationId(1471),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47103,10 +47139,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/effects.dag", 16533, 16561),
+            span: SourceSpan::new("src/v3/std/effects.dag", 16531, 16559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1471),
+            id: DeclarationId(1472),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -47123,15 +47159,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 16589, 16601),
+            span: SourceSpan::new("src/v3/std/effects.dag", 16587, 16599),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1472),
+            id: DeclarationId(1473),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "fields".to_string(),
-                    ty: DeclarationId(1471),
+                    ty: DeclarationId(1472),
                 }],
             },
             type_params: vec![],
@@ -47142,10 +47178,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/effects.dag", 16566, 16603),
+            span: SourceSpan::new("src/v3/std/effects.dag", 16564, 16601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1473),
+            id: DeclarationId(1474),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47156,10 +47192,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/effects.dag", 17280, 17293),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17278, 17291),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1474),
+            id: DeclarationId(1475),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47170,10 +47206,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/effects.dag", 17298, 17312),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17296, 17310),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1475),
+            id: DeclarationId(1476),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47189,10 +47225,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/effects.dag", 17317, 17349),
+            span: SourceSpan::new("src/v3/std/effects.dag", 17315, 17347),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1476),
+            id: DeclarationId(1477),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47208,10 +47244,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/effects.dag", 19519, 19560),
+            span: SourceSpan::new("src/v3/std/effects.dag", 19517, 19558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1477),
+            id: DeclarationId(1478),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -47233,10 +47269,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/effects.dag", 19565, 19634),
+            span: SourceSpan::new("src/v3/std/effects.dag", 19563, 19632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1478),
+            id: DeclarationId(1479),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -47270,10 +47306,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/effects.dag", 19639, 19789),
+            span: SourceSpan::new("src/v3/std/effects.dag", 19637, 19787),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1479),
+            id: DeclarationId(1480),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47284,10 +47320,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/effects.dag", 20538, 20559),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20536, 20557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1480),
+            id: DeclarationId(1481),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(813),
@@ -47304,15 +47340,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 20590, 20617),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20588, 20615),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1481),
+            id: DeclarationId(1482),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "first_breaker".to_string(),
-                    ty: DeclarationId(1480),
+                    ty: DeclarationId(1481),
                 }],
             },
             type_params: vec![],
@@ -47323,10 +47359,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/effects.dag", 20564, 20619),
+            span: SourceSpan::new("src/v3/std/effects.dag", 20562, 20617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1482),
+            id: DeclarationId(1483),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -47343,15 +47379,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 24543, 24564),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24541, 24562),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1483),
+            id: DeclarationId(1484),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "ops".to_string(),
-                    ty: DeclarationId(1482),
+                    ty: DeclarationId(1483),
                 }],
             },
             type_params: vec![],
@@ -47362,10 +47398,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/effects.dag", 24523, 24566),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24521, 24564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1484),
+            id: DeclarationId(1485),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -47382,15 +47418,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 24592, 24619),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24590, 24617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1485),
+            id: DeclarationId(1486),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "arms".to_string(),
-                    ty: DeclarationId(1484),
+                    ty: DeclarationId(1485),
                 }],
             },
             type_params: vec![],
@@ -47401,10 +47437,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/effects.dag", 24571, 24621),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24569, 24619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1486),
+            id: DeclarationId(1487),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47420,10 +47456,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/effects.dag", 24626, 24661),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24624, 24659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1487),
+            id: DeclarationId(1488),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -47440,15 +47476,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 24693, 24725),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24691, 24723),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1488),
+            id: DeclarationId(1489),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "branches".to_string(),
-                    ty: DeclarationId(1487),
+                    ty: DeclarationId(1488),
                 }],
             },
             type_params: vec![],
@@ -47459,10 +47495,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/effects.dag", 24666, 24727),
+            span: SourceSpan::new("src/v3/std/effects.dag", 24664, 24725),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1489),
+            id: DeclarationId(1490),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47478,10 +47514,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/effects.dag", 25364, 25410),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25362, 25408),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1490),
+            id: DeclarationId(1491),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47497,10 +47533,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/effects.dag", 25415, 25467),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25413, 25465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1491),
+            id: DeclarationId(1492),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47511,10 +47547,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/effects.dag", 25964, 25984),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25962, 25982),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1492),
+            id: DeclarationId(1493),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47525,10 +47561,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/effects.dag", 25989, 26010),
+            span: SourceSpan::new("src/v3/std/effects.dag", 25987, 26008),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1493),
+            id: DeclarationId(1494),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47539,10 +47575,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/effects.dag", 26015, 26038),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26013, 26036),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1494),
+            id: DeclarationId(1495),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47553,10 +47589,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/effects.dag", 26043, 26061),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26041, 26059),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1495),
+            id: DeclarationId(1496),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47567,10 +47603,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/effects.dag", 26066, 26084),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26064, 26082),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1496),
+            id: DeclarationId(1497),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47586,10 +47622,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/effects.dag", 26401, 26447),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26399, 26445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1497),
+            id: DeclarationId(1498),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47605,10 +47641,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/effects.dag", 26452, 26504),
+            span: SourceSpan::new("src/v3/std/effects.dag", 26450, 26502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1498),
+            id: DeclarationId(1499),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47619,10 +47655,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/effects.dag", 32458, 32464),
+            span: SourceSpan::new("src/v3/std/effects.dag", 32456, 32462),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1499),
+            id: DeclarationId(1500),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47638,10 +47674,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/effects.dag", 32469, 32506),
+            span: SourceSpan::new("src/v3/std/effects.dag", 32467, 32504),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1500),
+            id: DeclarationId(1501),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47657,10 +47693,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/effects.dag", 32511, 32548),
+            span: SourceSpan::new("src/v3/std/effects.dag", 32509, 32546),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1501),
+            id: DeclarationId(1502),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47671,10 +47707,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/effects.dag", 33022, 33041),
+            span: SourceSpan::new("src/v3/std/effects.dag", 33020, 33039),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1502),
+            id: DeclarationId(1503),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47690,10 +47726,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/effects.dag", 33046, 33095),
+            span: SourceSpan::new("src/v3/std/effects.dag", 33044, 33093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1503),
+            id: DeclarationId(1504),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -47712,7 +47748,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1504),
+            id: DeclarationId(1505),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -47731,7 +47767,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1505),
+            id: DeclarationId(1506),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -47750,7 +47786,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1506),
+            id: DeclarationId(1507),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -47769,7 +47805,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1507),
+            id: DeclarationId(1508),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -47788,7 +47824,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1508),
+            id: DeclarationId(1509),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -47807,7 +47843,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1509),
+            id: DeclarationId(1510),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -47827,7 +47863,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 28003, 28024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1510),
+            id: DeclarationId(1511),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -47847,7 +47883,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 28088, 28109),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1511),
+            id: DeclarationId(1512),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47861,7 +47897,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 754, 764),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1512),
+            id: DeclarationId(1513),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47880,7 +47916,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 769, 788),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1513),
+            id: DeclarationId(1514),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -47894,7 +47930,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 793, 803),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1514),
+            id: DeclarationId(1515),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -47913,7 +47949,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1515),
+            id: DeclarationId(1516),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47932,7 +47968,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 1379, 1393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1516),
+            id: DeclarationId(1517),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47951,7 +47987,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 1398, 1411),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1517),
+            id: DeclarationId(1518),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47970,7 +48006,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 1416, 1433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1518),
+            id: DeclarationId(1519),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47989,7 +48025,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 3566, 3586),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1519),
+            id: DeclarationId(1520),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48008,7 +48044,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 3591, 3619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1520),
+            id: DeclarationId(1521),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48027,7 +48063,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 3624, 3658),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1521),
+            id: DeclarationId(1522),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48046,7 +48082,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 3663, 3692),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1522),
+            id: DeclarationId(1523),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48065,7 +48101,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 3697, 3714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1523),
+            id: DeclarationId(1524),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48079,7 +48115,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 4338, 4345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1524),
+            id: DeclarationId(1525),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48098,7 +48134,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 4350, 4400),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1525),
+            id: DeclarationId(1526),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48117,7 +48153,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 5964, 5988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1526),
+            id: DeclarationId(1527),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48131,7 +48167,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6013, 6022),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1527),
+            id: DeclarationId(1528),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48150,7 +48186,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6027, 6063),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1528),
+            id: DeclarationId(1529),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -48175,7 +48211,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6375, 6425),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1529),
+            id: DeclarationId(1530),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48189,7 +48225,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6430, 6439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1530),
+            id: DeclarationId(1531),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(786),
@@ -48209,12 +48245,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7015, 7028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1531),
+            id: DeclarationId(1532),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1530),
+                    ty: DeclarationId(1531),
                 }],
             },
             type_params: vec![],
@@ -48228,7 +48264,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7003, 7029),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1532),
+            id: DeclarationId(1533),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48242,7 +48278,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7034, 7051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1533),
+            id: DeclarationId(1534),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48261,7 +48297,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7302, 7312),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1534),
+            id: DeclarationId(1535),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48275,7 +48311,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7317, 7326),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1535),
+            id: DeclarationId(1536),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48289,7 +48325,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7331, 7340),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1536),
+            id: DeclarationId(1537),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48308,7 +48344,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7767, 7787),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1537),
+            id: DeclarationId(1538),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48327,7 +48363,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7792, 7816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1538),
+            id: DeclarationId(1539),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48347,12 +48383,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7828, 7844),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1539),
+            id: DeclarationId(1540),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1538),
+                    ty: DeclarationId(1539),
                 }],
             },
             type_params: vec![],
@@ -48366,7 +48402,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7821, 7845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1540),
+            id: DeclarationId(1541),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48386,12 +48422,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7855, 7871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1541),
+            id: DeclarationId(1542),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1540),
+                    ty: DeclarationId(1541),
                 }],
             },
             type_params: vec![],
@@ -48405,7 +48441,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7850, 7872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1542),
+            id: DeclarationId(1543),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48425,12 +48461,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7881, 7897),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1543),
+            id: DeclarationId(1544),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1542),
+                    ty: DeclarationId(1543),
                 }],
             },
             type_params: vec![],
@@ -48444,7 +48480,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7877, 7898),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1544),
+            id: DeclarationId(1545),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48464,7 +48500,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7961, 7977),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1545),
+            id: DeclarationId(1546),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -48474,7 +48510,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "payload".to_string(),
-                        ty: DeclarationId(1544),
+                        ty: DeclarationId(1545),
                     },
                 ],
             },
@@ -48489,7 +48525,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7903, 7983),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1546),
+            id: DeclarationId(1547),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48508,7 +48544,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9596, 9625),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1547),
+            id: DeclarationId(1548),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48528,12 +48564,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9660, 9676),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1548),
+            id: DeclarationId(1549),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "fields".to_string(),
-                    ty: DeclarationId(1547),
+                    ty: DeclarationId(1548),
                 }],
             },
             type_params: vec![],
@@ -48547,7 +48583,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9630, 9678),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1549),
+            id: DeclarationId(1550),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48566,7 +48602,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9683, 9711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1550),
+            id: DeclarationId(1551),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48586,12 +48622,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9730, 9746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1551),
+            id: DeclarationId(1552),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1550),
+                    ty: DeclarationId(1551),
                 }],
             },
             type_params: vec![],
@@ -48605,7 +48641,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9716, 9747),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1552),
+            id: DeclarationId(1553),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48625,12 +48661,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9765, 9781),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1553),
+            id: DeclarationId(1554),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1552),
+                    ty: DeclarationId(1553),
                 }],
             },
             type_params: vec![],
@@ -48644,7 +48680,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9752, 9782),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1554),
+            id: DeclarationId(1555),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48663,7 +48699,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11036, 11059),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1555),
+            id: DeclarationId(1556),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48682,7 +48718,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11064, 11098),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1556),
+            id: DeclarationId(1557),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48696,7 +48732,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11103, 11110),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1557),
+            id: DeclarationId(1558),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -48710,7 +48746,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11115, 11121),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1558),
+            id: DeclarationId(1559),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48729,7 +48765,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11126, 11146),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1559),
+            id: DeclarationId(1560),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -48748,7 +48784,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11375, 11392),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1560),
+            id: DeclarationId(1561),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48768,12 +48804,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11414, 11429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1561),
+            id: DeclarationId(1562),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "children".to_string(),
-                    ty: DeclarationId(1560),
+                    ty: DeclarationId(1561),
                 }],
             },
             type_params: vec![],
@@ -48787,7 +48823,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11397, 11431),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1562),
+            id: DeclarationId(1563),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48807,12 +48843,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11453, 11468),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1563),
+            id: DeclarationId(1564),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "variants".to_string(),
-                    ty: DeclarationId(1562),
+                    ty: DeclarationId(1563),
                 }],
             },
             type_params: vec![],
@@ -48826,7 +48862,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11436, 11470),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1564),
+            id: DeclarationId(1565),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48846,13 +48882,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11497, 11516),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1565),
+            id: DeclarationId(1566),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(1564),
+                        ty: DeclarationId(1565),
                     },
                     Field {
                         label: "output".to_string(),
@@ -48875,7 +48911,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11475, 11572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1566),
+            id: DeclarationId(1567),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -48900,7 +48936,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11577, 11655),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1567),
+            id: DeclarationId(1568),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48920,7 +48956,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11723, 11745),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1568),
+            id: DeclarationId(1569),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -48930,7 +48966,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "arguments".to_string(),
-                        ty: DeclarationId(1567),
+                        ty: DeclarationId(1568),
                     },
                 ],
             },
@@ -48945,7 +48981,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11660, 11751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1569),
+            id: DeclarationId(1570),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -48964,7 +49000,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1570),
+            id: DeclarationId(1571),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -48984,7 +49020,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11852, 11871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1571),
+            id: DeclarationId(1572),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49004,7 +49040,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11890, 11912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1572),
+            id: DeclarationId(1573),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49023,7 +49059,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1573),
+            id: DeclarationId(1574),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49042,7 +49078,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1574),
+            id: DeclarationId(1575),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49061,7 +49097,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1575),
+            id: DeclarationId(1576),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49080,7 +49116,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1576),
+            id: DeclarationId(1577),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49100,7 +49136,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13149, 13168),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1577),
+            id: DeclarationId(1578),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49114,7 +49150,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13449, 13452),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1578),
+            id: DeclarationId(1579),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49128,7 +49164,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13457, 13460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1579),
+            id: DeclarationId(1580),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49142,7 +49178,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13465, 13468),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1580),
+            id: DeclarationId(1581),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49156,7 +49192,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13473, 13476),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1581),
+            id: DeclarationId(1582),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49170,7 +49206,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13600, 13602),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1582),
+            id: DeclarationId(1583),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49184,7 +49220,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13607, 13609),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1583),
+            id: DeclarationId(1584),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49198,7 +49234,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13614, 13616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1584),
+            id: DeclarationId(1585),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49212,7 +49248,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13621, 13623),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1585),
+            id: DeclarationId(1586),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49226,7 +49262,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13628, 13630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1586),
+            id: DeclarationId(1587),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49240,7 +49276,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 13635, 13637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1587),
+            id: DeclarationId(1588),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49254,7 +49290,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14414, 14417),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1588),
+            id: DeclarationId(1589),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49268,7 +49304,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14422, 14424),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1589),
+            id: DeclarationId(1590),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49287,7 +49323,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14660, 14684),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1590),
+            id: DeclarationId(1591),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49306,7 +49342,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14689, 14713),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1591),
+            id: DeclarationId(1592),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49325,7 +49361,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14718, 14736),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1592),
+            id: DeclarationId(1593),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49344,7 +49380,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14923, 14946),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1593),
+            id: DeclarationId(1594),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49363,7 +49399,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14951, 15007),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1594),
+            id: DeclarationId(1595),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49382,7 +49418,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15012, 15066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1595),
+            id: DeclarationId(1596),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49401,7 +49437,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15071, 15093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1596),
+            id: DeclarationId(1597),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -49426,7 +49462,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15218, 15270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1597),
+            id: DeclarationId(1598),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49445,7 +49481,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15275, 15305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1598),
+            id: DeclarationId(1599),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49464,7 +49500,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1599),
+            id: DeclarationId(1600),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -49484,7 +49520,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 17460, 17491),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1600),
+            id: DeclarationId(1601),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(725),
@@ -49504,7 +49540,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 17515, 17545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1601),
+            id: DeclarationId(1602),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49523,7 +49559,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18168, 18197),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1602),
+            id: DeclarationId(1603),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -49548,7 +49584,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18202, 18249),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1603),
+            id: DeclarationId(1604),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49567,7 +49603,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1604),
+            id: DeclarationId(1605),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49587,7 +49623,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18607, 18619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1605),
+            id: DeclarationId(1606),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49601,7 +49637,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18860, 18869),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1606),
+            id: DeclarationId(1607),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49621,7 +49657,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18927, 18943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1607),
+            id: DeclarationId(1608),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49640,7 +49676,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1608),
+            id: DeclarationId(1609),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49654,7 +49690,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19445, 19457),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1609),
+            id: DeclarationId(1610),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49674,7 +49710,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19535, 19547),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1610),
+            id: DeclarationId(1611),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49693,7 +49729,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1611),
+            id: DeclarationId(1612),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49712,7 +49748,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1612),
+            id: DeclarationId(1613),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49731,7 +49767,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19737, 19753),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1613),
+            id: DeclarationId(1614),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49750,7 +49786,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19758, 19782),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1614),
+            id: DeclarationId(1615),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49769,7 +49805,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19787, 19805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1615),
+            id: DeclarationId(1616),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49788,7 +49824,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19810, 19824),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1616),
+            id: DeclarationId(1617),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49807,7 +49843,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19829, 19843),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1617),
+            id: DeclarationId(1618),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49827,7 +49863,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19872, 19889),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1618),
+            id: DeclarationId(1619),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49847,7 +49883,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19899, 19913),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1619),
+            id: DeclarationId(1620),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49867,7 +49903,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19923, 19936),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1620),
+            id: DeclarationId(1621),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -49887,7 +49923,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19949, 19962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1621),
+            id: DeclarationId(1622),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49906,7 +49942,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 26045, 26063),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1622),
+            id: DeclarationId(1623),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49920,7 +49956,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 26068, 26074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1623),
+            id: DeclarationId(1624),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -49940,12 +49976,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 26107, 26131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1624),
+            id: DeclarationId(1625),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "candidates".to_string(),
-                    ty: DeclarationId(1623),
+                    ty: DeclarationId(1624),
                 }],
             },
             type_params: vec![],
@@ -49959,7 +49995,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 26079, 26133),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1625),
+            id: DeclarationId(1626),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -49979,7 +50015,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 10942, 10962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1626),
+            id: DeclarationId(1627),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -49999,7 +50035,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11026, 11046),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1627),
+            id: DeclarationId(1628),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -50019,7 +50055,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11114, 11144),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1628),
+            id: DeclarationId(1629),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50039,7 +50075,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11611, 11629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1629),
+            id: DeclarationId(1630),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -50059,7 +50095,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11635, 11665),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1630),
+            id: DeclarationId(1631),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50079,7 +50115,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 14162, 14180),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1631),
+            id: DeclarationId(1632),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -50099,7 +50135,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22217, 22247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1632),
+            id: DeclarationId(1633),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50119,7 +50155,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22252, 22270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1633),
+            id: DeclarationId(1634),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50139,7 +50175,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22530, 22548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1634),
+            id: DeclarationId(1635),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50159,7 +50195,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22553, 22571),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1635),
+            id: DeclarationId(1636),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50179,7 +50215,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23044, 23062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1636),
+            id: DeclarationId(1637),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50199,7 +50235,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23067, 23085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1637),
+            id: DeclarationId(1638),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50219,7 +50255,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23186, 23204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1638),
+            id: DeclarationId(1639),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50239,7 +50275,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23524, 23542),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1639),
+            id: DeclarationId(1640),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50259,7 +50295,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23547, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1640),
+            id: DeclarationId(1641),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50279,7 +50315,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 25113, 25131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1641),
+            id: DeclarationId(1642),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50299,7 +50335,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 25384, 25402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1642),
+            id: DeclarationId(1643),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50319,7 +50355,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 25850, 25868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1643),
+            id: DeclarationId(1644),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50339,7 +50375,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 27885, 27903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1644),
+            id: DeclarationId(1645),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50359,7 +50395,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 27933, 27951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1645),
+            id: DeclarationId(1646),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50379,7 +50415,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28238, 28256),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1646),
+            id: DeclarationId(1647),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50399,7 +50435,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28284, 28302),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1647),
+            id: DeclarationId(1648),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50419,7 +50455,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28662, 28680),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1648),
+            id: DeclarationId(1649),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -50439,7 +50475,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28685, 28703),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1649),
+            id: DeclarationId(1650),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50453,7 +50489,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 4953, 4965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1650),
+            id: DeclarationId(1651),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50467,7 +50503,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 4970, 4986),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1651),
+            id: DeclarationId(1652),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50481,7 +50517,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 4991, 5005),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1652),
+            id: DeclarationId(1653),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50495,7 +50531,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 5855, 5868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1653),
+            id: DeclarationId(1654),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50509,7 +50545,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 5873, 5888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1654),
+            id: DeclarationId(1655),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50523,7 +50559,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 5893, 5909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1655),
+            id: DeclarationId(1656),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50537,7 +50573,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 5914, 5927),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1656),
+            id: DeclarationId(1657),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -50556,7 +50592,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1657),
+            id: DeclarationId(1658),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -50575,7 +50611,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1658),
+            id: DeclarationId(1659),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -50594,7 +50630,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1659),
+            id: DeclarationId(1660),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -50613,7 +50649,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1660),
+            id: DeclarationId(1661),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50627,7 +50663,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 8405, 8414),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1661),
+            id: DeclarationId(1662),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50646,7 +50682,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 8419, 8465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1662),
+            id: DeclarationId(1663),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50665,7 +50701,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9506, 9523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1663),
+            id: DeclarationId(1664),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50684,7 +50720,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9528, 9552),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1664),
+            id: DeclarationId(1665),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -50709,7 +50745,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9557, 9619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1665),
+            id: DeclarationId(1666),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -50729,12 +50765,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9636, 9666),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1666),
+            id: DeclarationId(1667),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1665),
+                    ty: DeclarationId(1666),
                 }],
             },
             type_params: vec![],
@@ -50748,7 +50784,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9624, 9667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1667),
+            id: DeclarationId(1668),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(727),
@@ -50768,12 +50804,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9680, 9710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1668),
+            id: DeclarationId(1669),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1667),
+                    ty: DeclarationId(1668),
                 }],
             },
             type_params: vec![],
@@ -50787,7 +50823,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9672, 9711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1669),
+            id: DeclarationId(1670),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50806,7 +50842,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9716, 9737),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1670),
+            id: DeclarationId(1671),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50825,7 +50861,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9742, 9761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1671),
+            id: DeclarationId(1672),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(31),
@@ -50845,7 +50881,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9479, 9501),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1672),
+            id: DeclarationId(1673),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50859,7 +50895,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18143, 18156),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1673),
+            id: DeclarationId(1674),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50873,7 +50909,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18161, 18169),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1674),
+            id: DeclarationId(1675),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50887,7 +50923,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18174, 18185),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1675),
+            id: DeclarationId(1676),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50901,7 +50937,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18190, 18207),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1676),
+            id: DeclarationId(1677),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50915,7 +50951,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18212, 18226),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1677),
+            id: DeclarationId(1678),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50934,7 +50970,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18231, 18280),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1678),
+            id: DeclarationId(1679),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50948,7 +50984,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18285, 18301),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1679),
+            id: DeclarationId(1680),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50962,7 +50998,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18306, 18318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1680),
+            id: DeclarationId(1681),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(43),
@@ -50982,7 +51018,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18107, 18138),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1681),
+            id: DeclarationId(1682),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(691),
@@ -51002,7 +51038,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11495, 11507),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1682),
+            id: DeclarationId(1683),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(728)],
@@ -51020,7 +51056,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(1683),
+            id: DeclarationId(1684),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(704),
@@ -51030,7 +51066,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         value: DeclarationId(849),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1418),
+                        parameter: DeclarationId(1419),
                         value: DeclarationId(856),
                     },
                 ],
@@ -51046,7 +51082,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11488, 11535),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1684),
+            id: DeclarationId(1685),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(691),
@@ -51066,7 +51102,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11795, 11810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1685),
+            id: DeclarationId(1686),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(849), DeclarationId(849)],
@@ -51084,7 +51120,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(1686),
+            id: DeclarationId(1687),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
@@ -51098,7 +51134,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         value: DeclarationId(849),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1408),
+                        parameter: DeclarationId(1409),
                         value: DeclarationId(860),
                     },
                 ],
@@ -51114,7 +51150,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 14202, 14245),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1687),
+            id: DeclarationId(1688),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(850), DeclarationId(694)],
@@ -51132,7 +51168,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(1688),
+            id: DeclarationId(1689),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
@@ -51142,7 +51178,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         value: DeclarationId(850),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1408),
+                        parameter: DeclarationId(1409),
                         value: DeclarationId(886),
                     },
                     TemplateArgument {
@@ -51162,7 +51198,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 16911, 17021),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1689),
+            id: DeclarationId(1690),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(850), DeclarationId(694)],
@@ -51180,7 +51216,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(1690),
+            id: DeclarationId(1691),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
@@ -51190,7 +51226,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         value: DeclarationId(850),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1408),
+                        parameter: DeclarationId(1409),
                         value: DeclarationId(886),
                     },
                     TemplateArgument {
@@ -51210,7 +51246,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 17076, 17186),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1691),
+            id: DeclarationId(1692),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -51230,7 +51266,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22293, 22323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1692),
+            id: DeclarationId(1693),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -51250,7 +51286,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22275, 22324),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1693),
+            id: DeclarationId(1694),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -51270,7 +51306,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22603, 22610),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1694),
+            id: DeclarationId(1695),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -51290,7 +51326,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22737, 22789),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1695),
+            id: DeclarationId(1696),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -51310,7 +51346,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23140, 23147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1696),
+            id: DeclarationId(1697),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -51330,7 +51366,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23118, 23148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1697),
+            id: DeclarationId(1698),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -51350,7 +51386,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23597, 23604),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1698),
+            id: DeclarationId(1699),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -51370,7 +51406,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 23735, 23792),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1699),
+            id: DeclarationId(1700),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -51390,7 +51426,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 25317, 25349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1700),
+            id: DeclarationId(1701),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -51410,7 +51446,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 27988, 27995),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1701),
+            id: DeclarationId(1702),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -51430,7 +51466,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28136, 28201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1702),
+            id: DeclarationId(1703),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(850), DeclarationId(849)],
@@ -51448,7 +51484,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(1703),
+            id: DeclarationId(1704),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
@@ -51462,7 +51498,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         value: DeclarationId(849),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1408),
+                        parameter: DeclarationId(1409),
                         value: DeclarationId(886),
                     },
                 ],
@@ -51478,7 +51514,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28319, 28377),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1704),
+            id: DeclarationId(1705),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(689),
@@ -51498,7 +51534,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28403, 28449),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1705),
+            id: DeclarationId(1706),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(687),
@@ -51518,11 +51554,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28720, 28727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1706),
+            id: DeclarationId(1707),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1648), DeclarationId(849)],
-                output: DeclarationId(1648),
+                inputs: vec![DeclarationId(1649), DeclarationId(849)],
+                output: DeclarationId(1649),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -51536,21 +51572,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(1707),
+            id: DeclarationId(1708),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(693),
                 arguments: vec![
                     TemplateArgument {
                         parameter: DeclarationId(695),
-                        value: DeclarationId(1648),
+                        value: DeclarationId(1649),
                     },
                     TemplateArgument {
                         parameter: DeclarationId(694),
                         value: DeclarationId(849),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1408),
+                        parameter: DeclarationId(1409),
                         value: DeclarationId(889),
                     },
                 ],
@@ -51566,7 +51602,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 28708, 28749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1708),
+            id: DeclarationId(1709),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -51586,7 +51622,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(1709),
+            id: DeclarationId(1710),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -51605,7 +51641,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(1710),
+            id: DeclarationId(1711),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -51624,7 +51660,7 @@ 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(1711),
+            id: DeclarationId(1712),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -51644,7 +51680,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_operations.dag", 6546, 6561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1712),
+            id: DeclarationId(1713),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -51664,12 +51700,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2718, 2749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1713),
+            id: DeclarationId(1714),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "content".to_string(),
-                    ty: DeclarationId(1712),
+                    ty: DeclarationId(1713),
                 }],
             },
             type_params: vec![],
@@ -51683,7 +51719,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2690, 2751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1714),
+            id: DeclarationId(1715),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -51703,12 +51739,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2784, 2820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1715),
+            id: DeclarationId(1716),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "content".to_string(),
-                    ty: DeclarationId(1714),
+                    ty: DeclarationId(1715),
                 }],
             },
             type_params: vec![],
@@ -51722,7 +51758,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2756, 2822),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1716),
+            id: DeclarationId(1717),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -51747,7 +51783,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3211, 3276),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1717),
+            id: DeclarationId(1718),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51766,7 +51802,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3281, 3305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1718),
+            id: DeclarationId(1719),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51785,7 +51821,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3568, 3596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1719),
+            id: DeclarationId(1720),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51804,7 +51840,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3601, 3637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1720),
+            id: DeclarationId(1721),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51823,7 +51859,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4332, 4354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1721),
+            id: DeclarationId(1722),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -51843,12 +51879,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4376, 4406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1722),
+            id: DeclarationId(1723),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1721),
+                    ty: DeclarationId(1722),
                 }],
             },
             type_params: vec![],
@@ -51862,7 +51898,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4359, 4407),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1723),
+            id: DeclarationId(1724),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51876,7 +51912,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5616, 5623),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1724),
+            id: DeclarationId(1725),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51890,7 +51926,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5749, 5761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1725),
+            id: DeclarationId(1726),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51909,7 +51945,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5979, 6014),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1726),
+            id: DeclarationId(1727),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51928,7 +51964,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6019, 6062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1727),
+            id: DeclarationId(1728),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51947,7 +51983,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6067, 6144),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1728),
+            id: DeclarationId(1729),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -51967,7 +52003,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6234, 6268),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1729),
+            id: DeclarationId(1730),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -51986,7 +52022,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1730),
+            id: DeclarationId(1731),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52005,7 +52041,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1731),
+            id: DeclarationId(1732),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52019,15 +52055,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(1728),
+                        ty: DeclarationId(1729),
                     },
                     Field {
                         label: "citations".to_string(),
-                        ty: DeclarationId(1729),
+                        ty: DeclarationId(1730),
                     },
                     Field {
                         label: "cache_control".to_string(),
-                        ty: DeclarationId(1730),
+                        ty: DeclarationId(1731),
                     },
                 ],
             },
@@ -52042,7 +52078,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6149, 6364),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1732),
+            id: DeclarationId(1733),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52061,7 +52097,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6369, 6418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1733),
+            id: DeclarationId(1734),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52080,7 +52116,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6926, 6962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1734),
+            id: DeclarationId(1735),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52099,7 +52135,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1735),
+            id: DeclarationId(1736),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52118,7 +52154,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1736),
+            id: DeclarationId(1737),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52128,11 +52164,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(1734),
+                        ty: DeclarationId(1735),
                     },
                     Field {
                         label: "is_error".to_string(),
-                        ty: DeclarationId(1735),
+                        ty: DeclarationId(1736),
                     },
                 ],
             },
@@ -52147,7 +52183,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6967, 7085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1737),
+            id: DeclarationId(1738),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52166,7 +52202,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7532, 7570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1738),
+            id: DeclarationId(1739),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52195,7 +52231,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7575, 7658),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1739),
+            id: DeclarationId(1740),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52209,7 +52245,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8016, 8023),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1740),
+            id: DeclarationId(1741),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52223,7 +52259,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8028, 8037),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1741),
+            id: DeclarationId(1742),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52237,7 +52273,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8042, 8054),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1742),
+            id: DeclarationId(1743),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52251,7 +52287,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8059, 8066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1743),
+            id: DeclarationId(1744),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52265,7 +52301,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8071, 8080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1744),
+            id: DeclarationId(1745),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52279,7 +52315,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8085, 8092),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1745),
+            id: DeclarationId(1746),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52293,7 +52329,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8097, 8123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1746),
+            id: DeclarationId(1747),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52312,7 +52348,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1747),
+            id: DeclarationId(1748),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52331,7 +52367,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1748),
+            id: DeclarationId(1749),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52345,11 +52381,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "document_title".to_string(),
-                        ty: DeclarationId(1746),
+                        ty: DeclarationId(1747),
                     },
                     Field {
                         label: "file_id".to_string(),
-                        ty: DeclarationId(1747),
+                        ty: DeclarationId(1748),
                     },
                     Field {
                         label: "start_char_index".to_string(),
@@ -52372,7 +52408,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8363, 8506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1749),
+            id: DeclarationId(1750),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52391,7 +52427,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1750),
+            id: DeclarationId(1751),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52410,7 +52446,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1751),
+            id: DeclarationId(1752),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52424,11 +52460,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "document_title".to_string(),
-                        ty: DeclarationId(1749),
+                        ty: DeclarationId(1750),
                     },
                     Field {
                         label: "file_id".to_string(),
-                        ty: DeclarationId(1750),
+                        ty: DeclarationId(1751),
                     },
                     Field {
                         label: "start_page_number".to_string(),
@@ -52451,7 +52487,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8511, 8656),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1752),
+            id: DeclarationId(1753),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52470,7 +52506,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1753),
+            id: DeclarationId(1754),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52489,7 +52525,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1754),
+            id: DeclarationId(1755),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52503,11 +52539,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "document_title".to_string(),
-                        ty: DeclarationId(1752),
+                        ty: DeclarationId(1753),
                     },
                     Field {
                         label: "file_id".to_string(),
-                        ty: DeclarationId(1753),
+                        ty: DeclarationId(1754),
                     },
                     Field {
                         label: "start_block_index".to_string(),
@@ -52530,7 +52566,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8661, 8814),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1755),
+            id: DeclarationId(1756),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52549,7 +52585,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1756),
+            id: DeclarationId(1757),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52563,7 +52599,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "title".to_string(),
-                        ty: DeclarationId(1755),
+                        ty: DeclarationId(1756),
                     },
                     Field {
                         label: "url".to_string(),
@@ -52582,7 +52618,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8819, 8919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1757),
+            id: DeclarationId(1758),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52601,7 +52637,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1758),
+            id: DeclarationId(1759),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52615,7 +52651,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "title".to_string(),
-                        ty: DeclarationId(1757),
+                        ty: DeclarationId(1758),
                     },
                     Field {
                         label: "search_result_index".to_string(),
@@ -52642,7 +52678,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8924, 9071),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1759),
+            id: DeclarationId(1760),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -52662,11 +52698,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1760),
+            id: DeclarationId(1761),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1759),
+                    DeclarationId(1760),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -52681,7 +52717,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1761),
+            id: DeclarationId(1762),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52691,7 +52727,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "citations".to_string(),
-                        ty: DeclarationId(1760),
+                        ty: DeclarationId(1761),
                     },
                 ],
             },
@@ -52706,7 +52742,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9650, 9732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1762),
+            id: DeclarationId(1763),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52731,7 +52767,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9737, 9798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1763),
+            id: DeclarationId(1764),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52750,7 +52786,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9803, 9858),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1764),
+            id: DeclarationId(1765),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52769,7 +52805,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1765),
+            id: DeclarationId(1766),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52787,7 +52823,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "caller".to_string(),
-                        ty: DeclarationId(1764),
+                        ty: DeclarationId(1765),
                     },
                 ],
             },
@@ -52802,7 +52838,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9863, 9940),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1766),
+            id: DeclarationId(1767),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52821,7 +52857,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1767),
+            id: DeclarationId(1768),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52839,7 +52875,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "caller".to_string(),
-                        ty: DeclarationId(1766),
+                        ty: DeclarationId(1767),
                     },
                 ],
             },
@@ -52854,7 +52890,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9945, 10045),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1768),
+            id: DeclarationId(1769),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52873,7 +52909,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1769),
+            id: DeclarationId(1770),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52887,7 +52923,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "caller".to_string(),
-                        ty: DeclarationId(1768),
+                        ty: DeclarationId(1769),
                     },
                 ],
             },
@@ -52902,7 +52938,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10050, 10136),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1770),
+            id: DeclarationId(1771),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52916,7 +52952,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10357, 10366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1771),
+            id: DeclarationId(1772),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52930,7 +52966,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10371, 10379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1772),
+            id: DeclarationId(1773),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52944,7 +52980,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10384, 10397),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1773),
+            id: DeclarationId(1774),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52958,7 +52994,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10402, 10419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1774),
+            id: DeclarationId(1775),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52972,7 +53008,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10424, 10447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1775),
+            id: DeclarationId(1776),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52986,7 +53022,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10452, 10471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1776),
+            id: DeclarationId(1777),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53000,7 +53036,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10476, 10494),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1777),
+            id: DeclarationId(1778),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53014,7 +53050,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10499, 10506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1778),
+            id: DeclarationId(1779),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53033,7 +53069,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1779),
+            id: DeclarationId(1780),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53052,7 +53088,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1780),
+            id: DeclarationId(1781),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53071,7 +53107,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1781),
+            id: DeclarationId(1782),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53085,7 +53121,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11192, 11201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1782),
+            id: DeclarationId(1783),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -53105,7 +53141,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11687, 11725),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1783),
+            id: DeclarationId(1784),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53124,7 +53160,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1784),
+            id: DeclarationId(1785),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53143,7 +53179,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1785),
+            id: DeclarationId(1786),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53157,7 +53193,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1013, 1025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1786),
+            id: DeclarationId(1787),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53171,7 +53207,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1030, 1044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1787),
+            id: DeclarationId(1788),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53185,7 +53221,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1049, 1064),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1788),
+            id: DeclarationId(1789),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53199,7 +53235,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1069, 1086),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1789),
+            id: DeclarationId(1790),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53213,7 +53249,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1091, 1114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1790),
+            id: DeclarationId(1791),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53227,7 +53263,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4719, 4726),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1791),
+            id: DeclarationId(1792),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53241,7 +53277,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4731, 4735),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1792),
+            id: DeclarationId(1793),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -53261,7 +53297,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6983, 7004),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1793),
+            id: DeclarationId(1794),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53275,7 +53311,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(1794),
+            id: DeclarationId(1795),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53289,7 +53325,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(1795),
+            id: DeclarationId(1796),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53303,7 +53339,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(1796),
+            id: DeclarationId(1797),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53317,7 +53353,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(1797),
+            id: DeclarationId(1798),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53331,7 +53367,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(1798),
+            id: DeclarationId(1799),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53345,7 +53381,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(1799),
+            id: DeclarationId(1800),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53359,7 +53395,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(1800),
+            id: DeclarationId(1801),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53373,7 +53409,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(1801),
+            id: DeclarationId(1802),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53387,7 +53423,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(1802),
+            id: DeclarationId(1803),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53401,7 +53437,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(1803),
+            id: DeclarationId(1804),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53415,7 +53451,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(1804),
+            id: DeclarationId(1805),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53429,7 +53465,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(1805),
+            id: DeclarationId(1806),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53443,7 +53479,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(1806),
+            id: DeclarationId(1807),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53457,7 +53493,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(1807),
+            id: DeclarationId(1808),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53471,7 +53507,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(1808),
+            id: DeclarationId(1809),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53485,7 +53521,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(1809),
+            id: DeclarationId(1810),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53499,7 +53535,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(1810),
+            id: DeclarationId(1811),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53513,7 +53549,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(1811),
+            id: DeclarationId(1812),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53527,7 +53563,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(1812),
+            id: DeclarationId(1813),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53541,7 +53577,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(1813),
+            id: DeclarationId(1814),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53555,7 +53591,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(1814),
+            id: DeclarationId(1815),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -53575,7 +53611,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(1815),
+            id: DeclarationId(1816),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53589,7 +53625,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(1816),
+            id: DeclarationId(1817),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53603,7 +53639,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(1817),
+            id: DeclarationId(1818),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53617,7 +53653,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(1818),
+            id: DeclarationId(1819),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53631,7 +53667,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(1819),
+            id: DeclarationId(1820),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53650,7 +53686,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1820),
+            id: DeclarationId(1821),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53669,7 +53705,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1821),
+            id: DeclarationId(1822),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53688,7 +53724,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1822),
+            id: DeclarationId(1823),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53707,7 +53743,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1823),
+            id: DeclarationId(1824),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53726,7 +53762,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1824),
+            id: DeclarationId(1825),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53745,7 +53781,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1825),
+            id: DeclarationId(1826),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53764,7 +53800,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1430, 1462),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1826),
+            id: DeclarationId(1827),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53783,7 +53819,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1467, 1503),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1827),
+            id: DeclarationId(1828),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53802,7 +53838,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1508, 1545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1828),
+            id: DeclarationId(1829),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53821,7 +53857,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1550, 1576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1829),
+            id: DeclarationId(1830),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53840,7 +53876,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1581, 1614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1830),
+            id: DeclarationId(1831),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53854,7 +53890,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1619, 1636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1831),
+            id: DeclarationId(1832),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53873,7 +53909,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1641, 1695),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1832),
+            id: DeclarationId(1833),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53887,7 +53923,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1700, 1707),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1833),
+            id: DeclarationId(1834),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53906,7 +53942,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2059, 2097),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1834),
+            id: DeclarationId(1835),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -53931,7 +53967,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2102, 2176),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1835),
+            id: DeclarationId(1836),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -53956,7 +53992,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2181, 2256),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1836),
+            id: DeclarationId(1837),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -53981,7 +54017,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2261, 2334),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1837),
+            id: DeclarationId(1838),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54000,7 +54036,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2339, 2376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1838),
+            id: DeclarationId(1839),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54019,7 +54055,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2381, 2418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1839),
+            id: DeclarationId(1840),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54038,7 +54074,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2423, 2464),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1840),
+            id: DeclarationId(1841),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54052,7 +54088,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2469, 2485),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1841),
+            id: DeclarationId(1842),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54066,7 +54102,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3221, 3231),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1842),
+            id: DeclarationId(1843),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54085,7 +54121,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3236, 3283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1843),
+            id: DeclarationId(1844),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54104,7 +54140,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3288, 3339),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1844),
+            id: DeclarationId(1845),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54118,7 +54154,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3529, 3533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1845),
+            id: DeclarationId(1846),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54132,7 +54168,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3538, 3545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1846),
+            id: DeclarationId(1847),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54146,7 +54182,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3550, 3556),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1847),
+            id: DeclarationId(1848),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54165,7 +54201,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1848),
+            id: DeclarationId(1849),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54179,7 +54215,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7493, 7504),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1849),
+            id: DeclarationId(1850),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54193,7 +54229,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7553, 7567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1850),
+            id: DeclarationId(1851),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54207,7 +54243,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7632, 7648),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1851),
+            id: DeclarationId(1852),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54221,7 +54257,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(1852),
+            id: DeclarationId(1853),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54235,7 +54271,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(1853),
+            id: DeclarationId(1854),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54249,7 +54285,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(1854),
+            id: DeclarationId(1855),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54263,7 +54299,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(1855),
+            id: DeclarationId(1856),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54277,7 +54313,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(1856),
+            id: DeclarationId(1857),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54291,7 +54327,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(1857),
+            id: DeclarationId(1858),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54305,7 +54341,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(1858),
+            id: DeclarationId(1859),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54319,7 +54355,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(1859),
+            id: DeclarationId(1860),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54333,7 +54369,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(1860),
+            id: DeclarationId(1861),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54347,7 +54383,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(1861),
+            id: DeclarationId(1862),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54361,7 +54397,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(1862),
+            id: DeclarationId(1863),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54375,7 +54411,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(1863),
+            id: DeclarationId(1864),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54389,7 +54425,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(1864),
+            id: DeclarationId(1865),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54403,7 +54439,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(1865),
+            id: DeclarationId(1866),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -54423,7 +54459,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(1866),
+            id: DeclarationId(1867),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -54443,7 +54479,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(1867),
+            id: DeclarationId(1868),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54457,7 +54493,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(1868),
+            id: DeclarationId(1869),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54471,7 +54507,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(1869),
+            id: DeclarationId(1870),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54490,7 +54526,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 6759, 6786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1870),
+            id: DeclarationId(1871),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54504,7 +54540,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7611, 7616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1871),
+            id: DeclarationId(1872),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54518,7 +54554,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7621, 7630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1872),
+            id: DeclarationId(1873),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -54544,7 +54580,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 9513, 9555),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1873),
+            id: DeclarationId(1874),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54558,7 +54594,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3853, 3857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1874),
+            id: DeclarationId(1875),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54572,7 +54608,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3860, 3864),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1875),
+            id: DeclarationId(1876),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54586,7 +54622,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3867, 3871),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1876),
+            id: DeclarationId(1877),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54600,7 +54636,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3874, 3879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1877),
+            id: DeclarationId(1878),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54614,7 +54650,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3882, 3893),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1878),
+            id: DeclarationId(1879),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54628,7 +54664,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3896, 3909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1879),
+            id: DeclarationId(1880),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54642,7 +54678,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4489, 4494),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1880),
+            id: DeclarationId(1881),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54656,7 +54692,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4497, 4506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1881),
+            id: DeclarationId(1882),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54670,7 +54706,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4509, 4515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1882),
+            id: DeclarationId(1883),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54684,7 +54720,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4518, 4522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1883),
+            id: DeclarationId(1884),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54698,7 +54734,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4525, 4529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1884),
+            id: DeclarationId(1885),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -54718,7 +54754,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5923, 5941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1885),
+            id: DeclarationId(1886),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -54738,7 +54774,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6396, 6424),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1886),
+            id: DeclarationId(1887),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54752,7 +54788,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1099, 1113),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1887),
+            id: DeclarationId(1888),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54766,7 +54802,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1118, 1128),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1888),
+            id: DeclarationId(1889),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54780,7 +54816,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1133, 1145),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1889),
+            id: DeclarationId(1890),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54794,7 +54830,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1150, 1163),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1890),
+            id: DeclarationId(1891),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54808,7 +54844,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1168, 1180),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1891),
+            id: DeclarationId(1892),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54822,7 +54858,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1185, 1197),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1892),
+            id: DeclarationId(1893),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54836,7 +54872,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1202, 1224),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1893),
+            id: DeclarationId(1894),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54850,7 +54886,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1229, 1248),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1894),
+            id: DeclarationId(1895),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54864,7 +54900,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1253, 1278),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1895),
+            id: DeclarationId(1896),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54878,7 +54914,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1283, 1306),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1896),
+            id: DeclarationId(1897),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54897,7 +54933,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5506, 5542),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1897),
+            id: DeclarationId(1898),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54916,7 +54952,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5547, 5588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1898),
+            id: DeclarationId(1899),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -54936,7 +54972,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 6047, 6063),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1899),
+            id: DeclarationId(1900),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54955,7 +54991,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9175, 9216),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1900),
+            id: DeclarationId(1901),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54969,7 +55005,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9513, 9525),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1901),
+            id: DeclarationId(1902),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -54989,7 +55025,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9795, 9807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1902),
+            id: DeclarationId(1903),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -54999,7 +55035,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "sites".to_string(),
-                        ty: DeclarationId(1901),
+                        ty: DeclarationId(1902),
                     },
                 ],
             },
@@ -55014,7 +55050,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9752, 9809),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1903),
+            id: DeclarationId(1904),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55033,7 +55069,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10119, 10153),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1904),
+            id: DeclarationId(1905),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55052,7 +55088,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10556, 10607),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1905),
+            id: DeclarationId(1906),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55066,7 +55102,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10950, 10968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1906),
+            id: DeclarationId(1907),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -55095,7 +55131,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 11357, 11469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1907),
+            id: DeclarationId(1908),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -55115,7 +55151,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(1908),
+            id: DeclarationId(1909),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -55141,7 +55177,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(1909),
+            id: DeclarationId(1910),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -55167,7 +55203,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(1910),
+            id: DeclarationId(1911),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -55193,7 +55229,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(1911),
+            id: DeclarationId(1912),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -55213,7 +55249,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(1912),
+            id: DeclarationId(1913),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -55239,7 +55275,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(1913),
+            id: DeclarationId(1914),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -55265,7 +55301,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(1914),
+            id: DeclarationId(1915),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -55291,7 +55327,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(1915),
+            id: DeclarationId(1916),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -55311,7 +55347,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(1916),
+            id: DeclarationId(1917),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -55337,7 +55373,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(1917),
+            id: DeclarationId(1918),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -55363,7 +55399,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(1918),
+            id: DeclarationId(1919),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
@@ -55383,7 +55419,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(1919),
+            id: DeclarationId(1920),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -55409,7 +55445,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(1920),
+            id: DeclarationId(1921),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(991),
@@ -55435,7 +55471,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(1921),
+            id: DeclarationId(1922),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55454,7 +55490,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(1922),
+            id: DeclarationId(1923),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -55479,7 +55515,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(1923),
+            id: DeclarationId(1924),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55493,7 +55529,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(1924),
+            id: DeclarationId(1925),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55512,7 +55548,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(1925),
+            id: DeclarationId(1926),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -55532,13 +55568,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(1926),
+            id: DeclarationId(1927),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1925),
+                    value: DeclarationId(1926),
                 }],
             },
             type_params: vec![],
@@ -55552,7 +55588,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(1927),
+            id: DeclarationId(1928),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -55566,7 +55602,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "witnesses".to_string(),
-                        ty: DeclarationId(1926),
+                        ty: DeclarationId(1927),
                     },
                 ],
             },
@@ -55581,7 +55617,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(1928),
+            id: DeclarationId(1929),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -55601,7 +55637,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(1929),
+            id: DeclarationId(1930),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -55621,13 +55657,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(1930),
+            id: DeclarationId(1931),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1929),
+                    value: DeclarationId(1930),
                 }],
             },
             type_params: vec![],
@@ -55641,7 +55677,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(1931),
+            id: DeclarationId(1932),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -55651,11 +55687,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "violations".to_string(),
-                        ty: DeclarationId(1928),
+                        ty: DeclarationId(1929),
                     },
                     Field {
                         label: "witnesses".to_string(),
-                        ty: DeclarationId(1930),
+                        ty: DeclarationId(1931),
                     },
                 ],
             },
@@ -55670,7 +55706,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(1932),
+            id: DeclarationId(1933),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -55690,11 +55726,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(1933),
+            id: DeclarationId(1934),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(1932),
+                output: DeclarationId(1933),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -55708,7 +55744,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(1934),
+            id: DeclarationId(1935),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
@@ -55728,7 +55764,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(1935),
+            id: DeclarationId(1936),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(827), DeclarationId(990)],
@@ -55746,7 +55782,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(1936),
+            id: DeclarationId(1937),
             name: Some("DimensionUnitAbelianGroup".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(25),
@@ -55766,7 +55802,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(1937),
+            id: DeclarationId(1938),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55780,7 +55816,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3709, 3721),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1938),
+            id: DeclarationId(1939),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55799,7 +55835,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3726, 3762),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1939),
+            id: DeclarationId(1940),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -55819,7 +55855,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(1940),
+            id: DeclarationId(1941),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55833,7 +55869,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4373, 4389),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1941),
+            id: DeclarationId(1942),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55852,7 +55888,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4394, 4422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1942),
+            id: DeclarationId(1943),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55866,7 +55902,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4665, 4686),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1943),
+            id: DeclarationId(1944),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55885,7 +55921,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5176, 5195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1944),
+            id: DeclarationId(1945),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55904,7 +55940,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5200, 5222),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1945),
+            id: DeclarationId(1946),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -55924,7 +55960,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5591, 5614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1946),
+            id: DeclarationId(1947),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55938,7 +55974,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6611, 6619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1947),
+            id: DeclarationId(1948),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55952,7 +55988,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6624, 6632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1948),
+            id: DeclarationId(1949),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55966,7 +56002,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7073, 7078),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1949),
+            id: DeclarationId(1950),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55980,7 +56016,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7083, 7091),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1950),
+            id: DeclarationId(1951),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55994,7 +56030,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7427, 7440),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1951),
+            id: DeclarationId(1952),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56008,7 +56044,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7445, 7451),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1952),
+            id: DeclarationId(1953),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56022,7 +56058,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7709, 7717),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1953),
+            id: DeclarationId(1954),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56036,7 +56072,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7722, 7727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1954),
+            id: DeclarationId(1955),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56050,7 +56086,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7732, 7745),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1955),
+            id: DeclarationId(1956),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56064,7 +56100,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8082, 8100),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1956),
+            id: DeclarationId(1957),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56078,7 +56114,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9475, 9484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1957),
+            id: DeclarationId(1958),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56092,7 +56128,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9489, 9502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1958),
+            id: DeclarationId(1959),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56106,7 +56142,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9507, 9515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1959),
+            id: DeclarationId(1960),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56120,7 +56156,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9520, 9530),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1960),
+            id: DeclarationId(1961),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56134,7 +56170,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9535, 9545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1961),
+            id: DeclarationId(1962),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56148,7 +56184,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9550, 9561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1962),
+            id: DeclarationId(1963),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56162,7 +56198,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9566, 9574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1963),
+            id: DeclarationId(1964),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56176,7 +56212,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9579, 9586),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1964),
+            id: DeclarationId(1965),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56190,7 +56226,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9591, 9601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1965),
+            id: DeclarationId(1966),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56204,7 +56240,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9606, 9618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1966),
+            id: DeclarationId(1967),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56218,7 +56254,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12311, 12337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1967),
+            id: DeclarationId(1968),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56232,7 +56268,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12342, 12352),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1968),
+            id: DeclarationId(1969),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56246,7 +56282,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17117, 17123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1969),
+            id: DeclarationId(1970),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56260,7 +56296,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17128, 17139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1970),
+            id: DeclarationId(1971),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56274,7 +56310,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17459, 17470),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1971),
+            id: DeclarationId(1972),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56288,7 +56324,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17475, 17486),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1972),
+            id: DeclarationId(1973),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56302,7 +56338,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 19419, 19430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1973),
+            id: DeclarationId(1974),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56316,7 +56352,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 19435, 19443),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1974),
+            id: DeclarationId(1975),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56335,7 +56371,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 20606, 20641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1975),
+            id: DeclarationId(1976),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56360,7 +56396,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 20646, 20734),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1976),
+            id: DeclarationId(1977),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -56380,7 +56416,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6894, 6922),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1977),
+            id: DeclarationId(1978),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56399,7 +56435,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1978),
+            id: DeclarationId(1979),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56418,7 +56454,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1979),
+            id: DeclarationId(1980),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -56438,7 +56474,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27850, 27865),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1980),
+            id: DeclarationId(1981),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -56458,7 +56494,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 29879, 29895),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1981),
+            id: DeclarationId(1982),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -56478,7 +56514,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 29988, 30004),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1982),
+            id: DeclarationId(1983),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -56498,13 +56534,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 30102, 30118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1983),
+            id: DeclarationId(1984),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1982),
+                    value: DeclarationId(1983),
                 }],
             },
             type_params: vec![],
@@ -56518,7 +56554,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 30097, 30119),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1984),
+            id: DeclarationId(1985),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56537,7 +56573,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1985),
+            id: DeclarationId(1986),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56556,7 +56592,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1986),
+            id: DeclarationId(1987),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56575,7 +56611,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1987),
+            id: DeclarationId(1988),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56594,7 +56630,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1988),
+            id: DeclarationId(1989),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56613,7 +56649,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1989),
+            id: DeclarationId(1990),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56632,7 +56668,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1990),
+            id: DeclarationId(1991),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56646,7 +56682,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5629, 5644),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1991),
+            id: DeclarationId(1992),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56660,7 +56696,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5684, 5697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1992),
+            id: DeclarationId(1993),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56674,7 +56710,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5745, 5762),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1993),
+            id: DeclarationId(1994),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56688,7 +56724,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5801, 5813),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1994),
+            id: DeclarationId(1995),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56702,7 +56738,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5861, 5878),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1995),
+            id: DeclarationId(1996),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56727,7 +56763,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 9971, 10033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1996),
+            id: DeclarationId(1997),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56746,7 +56782,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10038, 10080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1997),
+            id: DeclarationId(1998),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56771,7 +56807,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10085, 10142),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1998),
+            id: DeclarationId(1999),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56785,7 +56821,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10147, 10161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1999),
+            id: DeclarationId(2000),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56799,7 +56835,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10166, 10181),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2000),
+            id: DeclarationId(2001),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56813,7 +56849,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24135, 24149),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2001),
+            id: DeclarationId(2002),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56832,7 +56868,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24154, 24201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2002),
+            id: DeclarationId(2003),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56857,7 +56893,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24206, 24283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2003),
+            id: DeclarationId(2004),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56882,7 +56918,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24288, 24362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2004),
+            id: DeclarationId(2005),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56907,7 +56943,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24982, 25038),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2005),
+            id: DeclarationId(2006),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56926,7 +56962,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 25054, 25079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2006),
+            id: DeclarationId(2007),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56940,7 +56976,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26728, 26741),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2007),
+            id: DeclarationId(2008),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56959,7 +56995,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26785, 26817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2008),
+            id: DeclarationId(2009),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -56979,12 +57015,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26880, 26896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2009),
+            id: DeclarationId(2010),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "factors".to_string(),
-                    ty: DeclarationId(2008),
+                    ty: DeclarationId(2009),
                 }],
             },
             type_params: vec![],
@@ -56998,7 +57034,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26856, 26898),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2010),
+            id: DeclarationId(2011),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57018,13 +57054,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26960, 26976),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2011),
+            id: DeclarationId(2012),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2010),
+                    value: DeclarationId(2011),
                 }],
             },
             type_params: vec![],
@@ -57038,12 +57074,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26955, 26977),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2012),
+            id: DeclarationId(2013),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-                    ty: DeclarationId(2011),
+                    ty: DeclarationId(2012),
                 }],
             },
             type_params: vec![],
@@ -57057,7 +57093,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26927, 26979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2013),
+            id: DeclarationId(2014),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57077,12 +57113,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27277, 27292),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2014),
+            id: DeclarationId(2015),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-                    ty: DeclarationId(2013),
+                    ty: DeclarationId(2014),
                 }],
             },
             type_params: vec![],
@@ -57096,7 +57132,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27259, 27294),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2015),
+            id: DeclarationId(2016),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57110,7 +57146,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27377, 27389),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2016),
+            id: DeclarationId(2017),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57124,7 +57160,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27459, 27469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2017),
+            id: DeclarationId(2018),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57144,7 +57180,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(2018),
+            id: DeclarationId(2019),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57164,7 +57200,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(2019),
+            id: DeclarationId(2020),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -57184,11 +57220,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(2020),
+            id: DeclarationId(2021),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(827)],
-                output: DeclarationId(2019),
+                output: DeclarationId(2020),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -57202,7 +57238,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(2021),
+            id: DeclarationId(2022),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
@@ -57222,7 +57258,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(2022),
+            id: DeclarationId(2023),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1129), DeclarationId(1129)],
@@ -57240,7 +57276,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(2023),
+            id: DeclarationId(2024),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1129), DeclarationId(818)],
@@ -57258,7 +57294,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(2024),
+            id: DeclarationId(2025),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(828), DeclarationId(1129)],
@@ -57276,7 +57312,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(2025),
+            id: DeclarationId(2026),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57295,7 +57331,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 3305, 3352),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2026),
+            id: DeclarationId(2027),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -57320,7 +57356,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 3357, 3418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2027),
+            id: DeclarationId(2028),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57334,7 +57370,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 4297, 4302),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2028),
+            id: DeclarationId(2029),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1133)],
@@ -57352,7 +57388,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 5301, 5321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2029),
+            id: DeclarationId(2030),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(1134), DeclarationId(1134)],
@@ -57370,7 +57406,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 5334, 5360),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2030),
+            id: DeclarationId(2031),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1128),
@@ -57390,7 +57426,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 7360, 7372),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2031),
+            id: DeclarationId(2032),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1132),
@@ -57416,7 +57452,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 7388, 7419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2032),
+            id: DeclarationId(2033),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1135),
@@ -57442,7 +57478,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 9093, 9124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2033),
+            id: DeclarationId(2034),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1128),
@@ -57462,7 +57498,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens_application.dag", 10144, 10156),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2034),
+            id: DeclarationId(2035),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -57482,7 +57518,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4589, 4600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2035),
+            id: DeclarationId(2036),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(1143),
@@ -57502,7 +57538,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4642, 4653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2036),
+            id: DeclarationId(2037),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57516,7 +57552,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4544, 4548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2037),
+            id: DeclarationId(2038),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57535,7 +57571,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4553, 4563),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2038),
+            id: DeclarationId(2039),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57559,7 +57595,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2039),
+            id: DeclarationId(2040),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57579,7 +57615,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 11243, 11254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2040),
+            id: DeclarationId(2041),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57598,7 +57634,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2137, 2162),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2041),
+            id: DeclarationId(2042),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57618,12 +57654,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2179, 2195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2042),
+            id: DeclarationId(2043),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2041),
+                    ty: DeclarationId(2042),
                 }],
             },
             type_params: vec![],
@@ -57637,7 +57673,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2167, 2196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2043),
+            id: DeclarationId(2044),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -57662,7 +57698,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2201, 2252),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2044),
+            id: DeclarationId(2045),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57681,7 +57717,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2257, 2272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2045),
+            id: DeclarationId(2046),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57700,7 +57736,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2277, 2304),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2046),
+            id: DeclarationId(2047),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -57726,7 +57762,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 3936, 3954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2047),
+            id: DeclarationId(2048),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57746,7 +57782,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 4542, 4557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2048),
+            id: DeclarationId(2049),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57765,7 +57801,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 5388, 5442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2049),
+            id: DeclarationId(2050),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57779,7 +57815,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 5682, 5691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2050),
+            id: DeclarationId(2051),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57793,7 +57829,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 5694, 5704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2051),
+            id: DeclarationId(2052),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57813,7 +57849,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5769, 5797),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2052),
+            id: DeclarationId(2053),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -57836,10 +57872,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/services.dag", 6785, 6808),
+            span: SourceSpan::new("src/v3/std/services.dag", 6784, 6807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2053),
+            id: DeclarationId(2054),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -57859,7 +57895,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2054),
+            id: DeclarationId(2055),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -57879,7 +57915,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4626, 4652),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2055),
+            id: DeclarationId(2056),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57899,7 +57935,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4920, 4937),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2056),
+            id: DeclarationId(2057),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57919,7 +57955,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4988, 5002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2057),
+            id: DeclarationId(2058),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57939,7 +57975,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5052, 5065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2058),
+            id: DeclarationId(2059),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57959,7 +57995,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5115, 5128),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2059),
+            id: DeclarationId(2060),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -57979,7 +58015,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5176, 5192),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2060),
+            id: DeclarationId(2061),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -57999,13 +58035,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5245, 5271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2061),
+            id: DeclarationId(2062),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2060),
+                    value: DeclarationId(2061),
                 }],
             },
             type_params: vec![],
@@ -58019,7 +58055,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5240, 5272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2062),
+            id: DeclarationId(2063),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -58039,13 +58075,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5346, 5372),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2063),
+            id: DeclarationId(2064),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2062),
+                    value: DeclarationId(2063),
                 }],
             },
             type_params: vec![],
@@ -58059,7 +58095,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5341, 5373),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2064),
+            id: DeclarationId(2065),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -58079,7 +58115,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5498, 5514),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2065),
+            id: DeclarationId(2066),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -58099,7 +58135,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5639, 5673),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2066),
+            id: DeclarationId(2067),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -58119,7 +58155,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5885, 5919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2067),
+            id: DeclarationId(2068),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -58139,7 +58175,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6404, 6438),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2068),
+            id: DeclarationId(2069),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -58159,7 +58195,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6665, 6699),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2069),
+            id: DeclarationId(2070),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -58179,7 +58215,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6955, 6989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2070),
+            id: DeclarationId(2071),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -58199,7 +58235,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7169, 7195),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2071),
+            id: DeclarationId(2072),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -58219,7 +58255,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7200, 7234),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2072),
+            id: DeclarationId(2073),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(987),
@@ -58239,10 +58275,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8469, 8503),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2073),
+            id: DeclarationId(2074),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1921),
+                template: DeclarationId(1922),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58259,10 +58295,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2074),
+            id: DeclarationId(2075),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1921),
+                template: DeclarationId(1922),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58279,10 +58315,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2075),
+            id: DeclarationId(2076),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1921),
+                template: DeclarationId(1922),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58299,10 +58335,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2076),
+            id: DeclarationId(2077),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1921),
+                template: DeclarationId(1922),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58319,10 +58355,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2077),
+            id: DeclarationId(2078),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1921),
+                template: DeclarationId(1922),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58339,10 +58375,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2078),
+            id: DeclarationId(2079),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1921),
+                template: DeclarationId(1922),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58359,10 +58395,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2079),
+            id: DeclarationId(2080),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1921),
+                template: DeclarationId(1922),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58379,10 +58415,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2080),
+            id: DeclarationId(2081),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1921),
+                template: DeclarationId(1922),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58399,10 +58435,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2081),
+            id: DeclarationId(2082),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1921),
+                template: DeclarationId(1922),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58419,10 +58455,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2082),
+            id: DeclarationId(2083),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1921),
+                template: DeclarationId(1922),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58439,10 +58475,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2083),
+            id: DeclarationId(2084),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1433),
+                template: DeclarationId(1434),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(799),
@@ -58459,10 +58495,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4920, 4937),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2084),
+            id: DeclarationId(2085),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1433),
+                template: DeclarationId(1434),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(827),
@@ -58479,10 +58515,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4988, 5002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2085),
+            id: DeclarationId(2086),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1433),
+                template: DeclarationId(1434),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(781),
@@ -58499,10 +58535,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5052, 5065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2086),
+            id: DeclarationId(2087),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1433),
+                template: DeclarationId(1434),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(817),
@@ -58519,10 +58555,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5115, 5128),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2087),
+            id: DeclarationId(2088),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1433),
+                template: DeclarationId(1434),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(982),
@@ -58539,13 +58575,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5176, 5192),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2088),
+            id: DeclarationId(2089),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1433),
+                template: DeclarationId(1434),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2060),
+                    value: DeclarationId(2061),
                 }],
             },
             type_params: vec![],
@@ -58559,13 +58595,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5240, 5272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2089),
+            id: DeclarationId(2090),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1435),
+                template: DeclarationId(1436),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2062),
+                    value: DeclarationId(2063),
                 }],
             },
             type_params: vec![],
@@ -58579,10 +58615,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5341, 5373),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2090),
+            id: DeclarationId(2091),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1921),
+                template: DeclarationId(1922),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -58599,10 +58635,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5346, 5372),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2091),
+            id: DeclarationId(2092),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1435),
+                template: DeclarationId(1436),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(982),
@@ -58619,10 +58655,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5498, 5514),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2092),
+            id: DeclarationId(2093),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1927),
+                template: DeclarationId(1928),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(988),
                     value: DeclarationId(1222),
@@ -58639,10 +58675,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5639, 5673),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2093),
+            id: DeclarationId(2094),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1931),
+                template: DeclarationId(1932),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(988),
                     value: DeclarationId(1222),
@@ -58659,7 +58695,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5885, 5919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2094),
+            id: DeclarationId(2095),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -58678,7 +58714,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2095),
+            id: DeclarationId(2096),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -58697,7 +58733,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2096),
+            id: DeclarationId(2097),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -58715,32 +58751,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
-        declarations.push(Declaration {
-            id: DeclarationId(2097),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(137),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(138),
-                        value: DeclarationId(230),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(139),
-                        value: DeclarationId(1197),
-                    },
-                ],
-            },
-            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/termination.dag", 2732, 2760),
-        });
         declarations.push(Declaration {
             id: DeclarationId(2098),
             name: None,
@@ -58765,11 +58775,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/termination.dag", 2804, 2832),
+            span: SourceSpan::new("src/v3/std/termination.dag", 2732, 2760),
         });
         declarations.push(Declaration {
             id: DeclarationId(2099),
             name: None,
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(137),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(1197),
+                    },
+                ],
+            },
+            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/termination.dag", 2804, 2832),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2100),
+            name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
                     DeclarationId(1205),
@@ -58787,7 +58823,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2100),
+            id: DeclarationId(2101),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -58806,7 +58842,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2101),
+            id: DeclarationId(2102),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(11),
@@ -58832,7 +58868,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 12353, 12399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2102),
+            id: DeclarationId(2103),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58846,7 +58882,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 767, 773),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2103),
+            id: DeclarationId(2104),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58860,7 +58896,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 778, 791),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2104),
+            id: DeclarationId(2105),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58874,7 +58910,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 796, 810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2105),
+            id: DeclarationId(2106),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58893,7 +58929,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3332, 3358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2106),
+            id: DeclarationId(2107),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58912,7 +58948,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3363, 3391),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2107),
+            id: DeclarationId(2108),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58931,7 +58967,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3396, 3429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2108),
+            id: DeclarationId(2109),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58950,7 +58986,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3434, 3465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2109),
+            id: DeclarationId(2110),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58969,7 +59005,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3470, 3502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2110),
+            id: DeclarationId(2111),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58983,7 +59019,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 4509, 4516),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2111),
+            id: DeclarationId(2112),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59002,7 +59038,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 4521, 4571),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2112),
+            id: DeclarationId(2113),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59016,7 +59052,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 5484, 5495),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2113),
+            id: DeclarationId(2114),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59035,7 +59071,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 5500, 5545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2114),
+            id: DeclarationId(2115),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59054,7 +59090,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7649, 7683),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2115),
+            id: DeclarationId(2116),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59073,7 +59109,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7688, 7732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2116),
+            id: DeclarationId(2117),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59092,7 +59128,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7737, 7795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2117),
+            id: DeclarationId(2118),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59111,7 +59147,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7800, 7856),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2118),
+            id: DeclarationId(2119),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59130,7 +59166,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7861, 7894),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2119),
+            id: DeclarationId(2120),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59149,7 +59185,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7899, 7929),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2120),
+            id: DeclarationId(2121),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59163,7 +59199,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7934, 7947),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2121),
+            id: DeclarationId(2122),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -59183,7 +59219,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7987, 8009),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2122),
+            id: DeclarationId(2123),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -59203,7 +59239,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 8219, 8240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2123),
+            id: DeclarationId(2124),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59217,7 +59253,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 8740, 8746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2124),
+            id: DeclarationId(2125),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59231,7 +59267,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 9139, 9152),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2125),
+            id: DeclarationId(2126),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59245,7 +59281,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 9157, 9171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2126),
+            id: DeclarationId(2127),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59264,7 +59300,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 10263, 10297),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2127),
+            id: DeclarationId(2128),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59278,7 +59314,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 10302, 10320),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2128),
+            id: DeclarationId(2129),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -59304,7 +59340,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 11234, 11261),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2129),
+            id: DeclarationId(2130),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -59324,7 +59360,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9931, 9947),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2130),
+            id: DeclarationId(2131),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(984),
@@ -59344,7 +59380,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2131),
+            id: DeclarationId(2132),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59363,7 +59399,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4032, 4066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2132),
+            id: DeclarationId(2133),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59377,7 +59413,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4071, 4081),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2133),
+            id: DeclarationId(2134),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59391,7 +59427,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4086, 4095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2134),
+            id: DeclarationId(2135),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59405,7 +59441,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 4100, 4105),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2135),
+            id: DeclarationId(2136),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -59425,10 +59461,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 7603, 7631),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2136),
+            id: DeclarationId(2137),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1433),
+                template: DeclarationId(1434),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
                     value: DeclarationId(978),
@@ -59445,10 +59481,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 9931, 9947),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2137),
+            id: DeclarationId(2138),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1921),
+                template: DeclarationId(1922),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -59465,10 +59501,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2138),
+            id: DeclarationId(2139),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1921),
+                template: DeclarationId(1922),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -59485,10 +59521,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2139),
+            id: DeclarationId(2140),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1921),
+                template: DeclarationId(1922),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -59505,10 +59541,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2140),
+            id: DeclarationId(2141),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1921),
+                template: DeclarationId(1922),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -59525,10 +59561,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2141),
+            id: DeclarationId(2142),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1921),
+                template: DeclarationId(1922),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -59545,10 +59581,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2142),
+            id: DeclarationId(2143),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1921),
+                template: DeclarationId(1922),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -59565,10 +59601,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2143),
+            id: DeclarationId(2144),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1921),
+                template: DeclarationId(1922),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -59585,10 +59621,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2144),
+            id: DeclarationId(2145),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1921),
+                template: DeclarationId(1922),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -59605,10 +59641,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2145),
+            id: DeclarationId(2146),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1921),
+                template: DeclarationId(1922),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -59625,10 +59661,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2146),
+            id: DeclarationId(2147),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1921),
+                template: DeclarationId(1922),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(985),
                     value: DeclarationId(1222),
@@ -59645,7 +59681,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/timing_lens.dag", 13840, 13866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2147),
+            id: DeclarationId(2148),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59659,7 +59695,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(2148),
+            id: DeclarationId(2149),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59673,7 +59709,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(2149),
+            id: DeclarationId(2150),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59687,7 +59723,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(2150),
+            id: DeclarationId(2151),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59701,7 +59737,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(2151),
+            id: DeclarationId(2152),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59715,7 +59751,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(2152),
+            id: DeclarationId(2153),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59729,7 +59765,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(2153),
+            id: DeclarationId(2154),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59743,7 +59779,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(2154),
+            id: DeclarationId(2155),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59757,7 +59793,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(2155),
+            id: DeclarationId(2156),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59771,7 +59807,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(2156),
+            id: DeclarationId(2157),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59785,7 +59821,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(2157),
+            id: DeclarationId(2158),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59799,7 +59835,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(2158),
+            id: DeclarationId(2159),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59813,7 +59849,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(2159),
+            id: DeclarationId(2160),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59827,7 +59863,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(2160),
+            id: DeclarationId(2161),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59846,7 +59882,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(2161),
+            id: DeclarationId(2162),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59865,7 +59901,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 889, 903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2162),
+            id: DeclarationId(2163),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59884,7 +59920,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 908, 925),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2163),
+            id: DeclarationId(2164),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59898,7 +59934,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 930, 932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2164),
+            id: DeclarationId(2165),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59912,7 +59948,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 937, 941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2165),
+            id: DeclarationId(2166),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59926,7 +59962,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 946, 951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2166),
+            id: DeclarationId(2167),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59940,7 +59976,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 956, 958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2167),
+            id: DeclarationId(2168),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59954,7 +59990,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 963, 965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2168),
+            id: DeclarationId(2169),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59968,7 +60004,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 970, 972),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2169),
+            id: DeclarationId(2170),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59982,7 +60018,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 977, 979),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2170),
+            id: DeclarationId(2171),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59996,7 +60032,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 984, 988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2171),
+            id: DeclarationId(2172),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60010,7 +60046,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 993, 998),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2172),
+            id: DeclarationId(2173),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60024,7 +60060,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1003, 1007),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2173),
+            id: DeclarationId(2174),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60038,7 +60074,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1012, 1017),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2174),
+            id: DeclarationId(2175),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60052,7 +60088,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1022, 1028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2175),
+            id: DeclarationId(2176),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60066,7 +60102,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1033, 1041),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2176),
+            id: DeclarationId(2177),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60080,7 +60116,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1046, 1051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2177),
+            id: DeclarationId(2178),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60094,7 +60130,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1056, 1061),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2178),
+            id: DeclarationId(2179),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60108,7 +60144,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1066, 1074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2179),
+            id: DeclarationId(2180),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60122,7 +60158,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1079, 1088),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2180),
+            id: DeclarationId(2181),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60136,7 +60172,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1093, 1096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2181),
+            id: DeclarationId(2182),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60150,7 +60186,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1101, 1107),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2182),
+            id: DeclarationId(2183),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60164,7 +60200,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1112, 1118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2183),
+            id: DeclarationId(2184),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60178,7 +60214,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1123, 1129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2184),
+            id: DeclarationId(2185),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60192,7 +60228,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1134, 1140),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2185),
+            id: DeclarationId(2186),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60206,7 +60242,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1145, 1153),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2186),
+            id: DeclarationId(2187),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60220,7 +60256,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1158, 1166),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2187),
+            id: DeclarationId(2188),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60234,7 +60270,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1171, 1176),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2188),
+            id: DeclarationId(2189),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60248,7 +60284,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1181, 1190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2189),
+            id: DeclarationId(2190),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60262,7 +60298,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1195, 1199),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2190),
+            id: DeclarationId(2191),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60276,7 +60312,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1204, 1212),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2191),
+            id: DeclarationId(2192),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60290,7 +60326,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1217, 1220),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2192),
+            id: DeclarationId(2193),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60304,7 +60340,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1791, 1796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2193),
+            id: DeclarationId(2194),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60318,7 +60354,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1801, 1805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2194),
+            id: DeclarationId(2195),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60332,7 +60368,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1810, 1816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2195),
+            id: DeclarationId(2196),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60346,7 +60382,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1821, 1827),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2196),
+            id: DeclarationId(2197),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60360,7 +60396,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1832, 1836),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2197),
+            id: DeclarationId(2198),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60374,7 +60410,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1841, 1847),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2198),
+            id: DeclarationId(2199),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60388,7 +60424,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1852, 1860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2199),
+            id: DeclarationId(2200),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60402,7 +60438,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1865, 1873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2200),
+            id: DeclarationId(2201),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60416,7 +60452,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1878, 1885),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2201),
+            id: DeclarationId(2202),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60430,7 +60466,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1890, 1896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2202),
+            id: DeclarationId(2203),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60444,7 +60480,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1901, 1908),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2203),
+            id: DeclarationId(2204),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60458,7 +60494,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1913, 1919),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2204),
+            id: DeclarationId(2205),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60472,7 +60508,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1924, 1931),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2205),
+            id: DeclarationId(2206),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60486,7 +60522,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2371, 2373),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2206),
+            id: DeclarationId(2207),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60500,7 +60536,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2378, 2382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2207),
+            id: DeclarationId(2208),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60514,7 +60550,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2387, 2392),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2208),
+            id: DeclarationId(2209),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60528,7 +60564,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2397, 2399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2209),
+            id: DeclarationId(2210),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60542,7 +60578,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2404, 2406),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2210),
+            id: DeclarationId(2211),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60556,7 +60592,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2411, 2413),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2211),
+            id: DeclarationId(2212),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60570,7 +60606,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2418, 2420),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2212),
+            id: DeclarationId(2213),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60584,7 +60620,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2425, 2429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2213),
+            id: DeclarationId(2214),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60598,7 +60634,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2434, 2439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2214),
+            id: DeclarationId(2215),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60612,7 +60648,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2444, 2448),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2215),
+            id: DeclarationId(2216),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60626,7 +60662,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2453, 2458),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2216),
+            id: DeclarationId(2217),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60640,7 +60676,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2463, 2469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2217),
+            id: DeclarationId(2218),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60654,7 +60690,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2474, 2482),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2218),
+            id: DeclarationId(2219),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60668,7 +60704,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2487, 2492),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2219),
+            id: DeclarationId(2220),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60682,7 +60718,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2497, 2502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2220),
+            id: DeclarationId(2221),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60696,7 +60732,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2507, 2515),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2221),
+            id: DeclarationId(2222),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60710,7 +60746,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2520, 2529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2222),
+            id: DeclarationId(2223),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60724,7 +60760,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2534, 2537),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2223),
+            id: DeclarationId(2224),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60738,7 +60774,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2542, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2224),
+            id: DeclarationId(2225),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60752,7 +60788,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2553, 2559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2225),
+            id: DeclarationId(2226),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60766,7 +60802,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2564, 2570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2226),
+            id: DeclarationId(2227),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60780,7 +60816,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2575, 2581),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2227),
+            id: DeclarationId(2228),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60794,7 +60830,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2586, 2594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2228),
+            id: DeclarationId(2229),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60808,7 +60844,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2599, 2607),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2229),
+            id: DeclarationId(2230),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60822,7 +60858,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2612, 2617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2230),
+            id: DeclarationId(2231),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60836,7 +60872,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2622, 2631),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2231),
+            id: DeclarationId(2232),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60850,7 +60886,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2636, 2640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2232),
+            id: DeclarationId(2233),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60864,7 +60900,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2645, 2653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2233),
+            id: DeclarationId(2234),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -60881,10 +60917,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", 27581, 27604),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27585, 27608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2234),
+            id: DeclarationId(2235),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -60901,10 +60937,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", 28673, 28689),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28677, 28693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2235),
+            id: DeclarationId(2236),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -60921,10 +60957,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", 28694, 28714),
+            span: SourceSpan::new("src/v3/std/verification.dag", 28698, 28718),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2236),
+            id: DeclarationId(2237),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60938,7 +60974,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2826, 2840),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2237),
+            id: DeclarationId(2238),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60952,7 +60988,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2845, 2855),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2238),
+            id: DeclarationId(2239),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60966,7 +61002,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2860, 2872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2239),
+            id: DeclarationId(2240),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60980,7 +61016,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2877, 2890),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2240),
+            id: DeclarationId(2241),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60994,7 +61030,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2895, 2907),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2241),
+            id: DeclarationId(2242),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61008,7 +61044,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2912, 2924),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2242),
+            id: DeclarationId(2243),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61022,7 +61058,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2929, 2951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2243),
+            id: DeclarationId(2244),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61036,7 +61072,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2956, 2975),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2244),
+            id: DeclarationId(2245),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61050,7 +61086,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 2980, 3005),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2245),
+            id: DeclarationId(2246),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61064,7 +61100,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 3010, 3033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2246),
+            id: DeclarationId(2247),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61078,7 +61114,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 3439, 3448),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2247),
+            id: DeclarationId(2248),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61097,7 +61133,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 3453, 3469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2248),
+            id: DeclarationId(2249),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61111,7 +61147,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4128, 4136),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2249),
+            id: DeclarationId(2250),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61125,7 +61161,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4141, 4151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2250),
+            id: DeclarationId(2251),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61139,7 +61175,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4376, 4388),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2251),
+            id: DeclarationId(2252),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61153,7 +61189,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5203, 5216),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2252),
+            id: DeclarationId(2253),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61167,7 +61203,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5221, 5234),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2253),
+            id: DeclarationId(2254),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61181,7 +61217,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5239, 5247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2254),
+            id: DeclarationId(2255),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61206,7 +61242,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5792, 5859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2255),
+            id: DeclarationId(2256),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61225,7 +61261,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5900, 5953),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2256),
+            id: DeclarationId(2257),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61239,7 +61275,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5986, 6015),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2257),
+            id: DeclarationId(2258),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61253,7 +61289,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6617, 6649),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2258),
+            id: DeclarationId(2259),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61267,7 +61303,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6654, 6685),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2259),
+            id: DeclarationId(2260),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61281,7 +61317,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6727, 6759),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2260),
+            id: DeclarationId(2261),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61295,7 +61331,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6764, 6795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2261),
+            id: DeclarationId(2262),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61309,7 +61345,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6800, 6828),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2262),
+            id: DeclarationId(2263),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61323,7 +61359,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6833, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2263),
+            id: DeclarationId(2264),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61337,7 +61373,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6898, 6920),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2264),
+            id: DeclarationId(2265),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61351,7 +61387,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6925, 6953),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2265),
+            id: DeclarationId(2266),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61365,7 +61401,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6958, 6987),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2266),
+            id: DeclarationId(2267),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61376,10 +61412,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", 9793, 9801),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9797, 9805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2267),
+            id: DeclarationId(2268),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61395,10 +61431,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", 9806, 9846),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9810, 9850),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2268),
+            id: DeclarationId(2269),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61414,10 +61450,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", 9851, 9884),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9855, 9888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2269),
+            id: DeclarationId(2270),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61439,10 +61475,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", 9889, 9967),
+            span: SourceSpan::new("src/v3/std/verification.dag", 9893, 9971),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2270),
+            id: DeclarationId(2271),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61458,10 +61494,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", 10133, 10196),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10137, 10200),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2271),
+            id: DeclarationId(2272),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61487,10 +61523,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", 10201, 10292),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10205, 10296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2272),
+            id: DeclarationId(2273),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61516,10 +61552,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", 10297, 10429),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10301, 10433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2273),
+            id: DeclarationId(2274),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61541,10 +61577,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", 10644, 10733),
+            span: SourceSpan::new("src/v3/std/verification.dag", 10648, 10737),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2274),
+            id: DeclarationId(2275),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -61561,10 +61597,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", 11533, 11545),
+            span: SourceSpan::new("src/v3/std/verification.dag", 11537, 11549),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2275),
+            id: DeclarationId(2276),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61574,7 +61610,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2274),
+                        ty: DeclarationId(2275),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -61590,10 +61626,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", 11482, 11579),
+            span: SourceSpan::new("src/v3/std/verification.dag", 11486, 11583),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2276),
+            id: DeclarationId(2277),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -61610,10 +61646,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", 12294, 12306),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12298, 12310),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2277),
+            id: DeclarationId(2278),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61623,7 +61659,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2276),
+                        ty: DeclarationId(2277),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -61643,10 +61679,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", 12244, 12372),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12248, 12376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2278),
+            id: DeclarationId(2279),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61672,10 +61708,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", 12670, 12792),
+            span: SourceSpan::new("src/v3/std/verification.dag", 12674, 12796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2279),
+            id: DeclarationId(2280),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61701,10 +61737,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", 13054, 13179),
+            span: SourceSpan::new("src/v3/std/verification.dag", 13058, 13183),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2280),
+            id: DeclarationId(2281),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61720,10 +61756,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", 15232, 15293),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15236, 15297),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2281),
+            id: DeclarationId(2282),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61745,10 +61781,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", 15298, 15397),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15302, 15401),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2282),
+            id: DeclarationId(2283),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61774,10 +61810,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", 15751, 15883),
+            span: SourceSpan::new("src/v3/std/verification.dag", 15755, 15887),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2283),
+            id: DeclarationId(2284),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61799,10 +61835,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", 16450, 16562),
+            span: SourceSpan::new("src/v3/std/verification.dag", 16454, 16566),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2284),
+            id: DeclarationId(2285),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61824,10 +61860,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", 17259, 17338),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17263, 17342),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2285),
+            id: DeclarationId(2286),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61853,10 +61889,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", 17558, 17671),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17562, 17675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2286),
+            id: DeclarationId(2287),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61882,10 +61918,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", 17676, 17812),
+            span: SourceSpan::new("src/v3/std/verification.dag", 17680, 17816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2287),
+            id: DeclarationId(2288),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61907,10 +61943,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", 18298, 18380),
+            span: SourceSpan::new("src/v3/std/verification.dag", 18302, 18384),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2288),
+            id: DeclarationId(2289),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61932,10 +61968,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", 18385, 18471),
+            span: SourceSpan::new("src/v3/std/verification.dag", 18389, 18475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2289),
+            id: DeclarationId(2290),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -61952,10 +61988,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", 18550, 18560),
+            span: SourceSpan::new("src/v3/std/verification.dag", 18554, 18564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2290),
+            id: DeclarationId(2291),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61965,7 +62001,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "generated_paths".to_string(),
-                        ty: DeclarationId(2289),
+                        ty: DeclarationId(2290),
                     },
                 ],
             },
@@ -61977,10 +62013,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", 18476, 18566),
+            span: SourceSpan::new("src/v3/std/verification.dag", 18480, 18570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2291),
+            id: DeclarationId(2292),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62002,10 +62038,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", 19780, 19905),
+            span: SourceSpan::new("src/v3/std/verification.dag", 19784, 19909),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2292),
+            id: DeclarationId(2293),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62031,10 +62067,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", 20847, 20981),
+            span: SourceSpan::new("src/v3/std/verification.dag", 20851, 20985),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2293),
+            id: DeclarationId(2294),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62060,10 +62096,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", 21620, 21764),
+            span: SourceSpan::new("src/v3/std/verification.dag", 21624, 21768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2294),
+            id: DeclarationId(2295),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62079,10 +62115,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", 22609, 22663),
+            span: SourceSpan::new("src/v3/std/verification.dag", 22613, 22667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2295),
+            id: DeclarationId(2296),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -62099,10 +62135,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", 23707, 23730),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23711, 23734),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2296),
+            id: DeclarationId(2297),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62113,10 +62149,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", 23933, 23939),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23937, 23943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2297),
+            id: DeclarationId(2298),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62127,10 +62163,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", 23944, 23950),
+            span: SourceSpan::new("src/v3/std/verification.dag", 23948, 23954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2298),
+            id: DeclarationId(2299),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -62147,10 +62183,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", 24088, 24111),
+            span: SourceSpan::new("src/v3/std/verification.dag", 24092, 24115),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2299),
+            id: DeclarationId(2300),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62166,10 +62202,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", 25834, 25863),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25838, 25867),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2300),
+            id: DeclarationId(2301),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62185,10 +62221,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", 25868, 25907),
+            span: SourceSpan::new("src/v3/std/verification.dag", 25872, 25911),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2301),
+            id: DeclarationId(2302),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62204,10 +62240,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", 26765, 26786),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26769, 26790),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2302),
+            id: DeclarationId(2303),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62223,10 +62259,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", 26791, 26822),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26795, 26826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2303),
+            id: DeclarationId(2304),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -62243,10 +62279,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", 26866, 26882),
+            span: SourceSpan::new("src/v3/std/verification.dag", 26870, 26886),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2304),
+            id: DeclarationId(2305),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -62263,10 +62299,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", 27138, 27161),
+            span: SourceSpan::new("src/v3/std/verification.dag", 27142, 27165),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2305),
+            id: DeclarationId(2306),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -62286,7 +62322,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 7221, 7252),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2306),
+            id: DeclarationId(2307),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -62306,7 +62342,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(2307),
+            id: DeclarationId(2308),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62320,7 +62356,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(2308),
+            id: DeclarationId(2309),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62334,7 +62370,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(2309),
+            id: DeclarationId(2310),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62348,7 +62384,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(2310),
+            id: DeclarationId(2311),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -62367,7 +62403,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(2311),
+            id: DeclarationId(2312),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62381,7 +62417,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6428, 6446),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2312),
+            id: DeclarationId(2313),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62395,7 +62431,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6451, 6466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2313),
+            id: DeclarationId(2314),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62409,7 +62445,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6495, 6518),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2314),
+            id: DeclarationId(2315),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62423,7 +62459,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6523, 6544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2315),
+            id: DeclarationId(2316),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62437,7 +62473,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6549, 6564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2316),
+            id: DeclarationId(2317),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62451,7 +62487,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8177, 8187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2317),
+            id: DeclarationId(2318),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62465,7 +62501,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8192, 8203),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2318),
+            id: DeclarationId(2319),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62479,7 +62515,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8208, 8221),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2319),
+            id: DeclarationId(2320),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62493,7 +62529,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8226, 8239),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2320),
+            id: DeclarationId(2321),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62507,7 +62543,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8244, 8257),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2321),
+            id: DeclarationId(2322),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62521,7 +62557,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8262, 8276),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2322),
+            id: DeclarationId(2323),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62535,7 +62571,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8281, 8296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2323),
+            id: DeclarationId(2324),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62549,7 +62585,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9038, 9055),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2324),
+            id: DeclarationId(2325),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62563,7 +62599,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9060, 9070),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2325),
+            id: DeclarationId(2326),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62577,7 +62613,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9075, 9079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2326),
+            id: DeclarationId(2327),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62587,11 +62623,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1337),
+                        ty: DeclarationId(1338),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(1339),
+                        ty: DeclarationId(1340),
                     },
                     Field {
                         label: "range_min_inclusive".to_string(),
@@ -62607,7 +62643,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "overflow".to_string(),
-                        ty: DeclarationId(1340),
+                        ty: DeclarationId(1341),
                     },
                 ],
             },
@@ -62622,7 +62658,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9857, 10429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2327),
+            id: DeclarationId(2328),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62632,11 +62668,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1338),
+                        ty: DeclarationId(1339),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(1339),
+                        ty: DeclarationId(1340),
                     },
                     Field {
                         label: "is_copy".to_string(),
@@ -62655,13 +62691,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10434, 10616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2328),
+            id: DeclarationId(2329),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1341),
+                    value: DeclarationId(1342),
                 }],
             },
             type_params: vec![],
@@ -62675,7 +62711,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10965, 10984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2329),
+            id: DeclarationId(2330),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62689,7 +62725,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4233, 4241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2330),
+            id: DeclarationId(2331),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62708,7 +62744,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4246, 4277),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2331),
+            id: DeclarationId(2332),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -62728,12 +62764,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4299, 4319),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2332),
+            id: DeclarationId(2333),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "values".to_string(),
-                    ty: DeclarationId(2331),
+                    ty: DeclarationId(2332),
                 }],
             },
             type_params: vec![],
@@ -62747,7 +62783,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4282, 4321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2333),
+            id: DeclarationId(2334),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62772,7 +62808,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4326, 4379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2334),
+            id: DeclarationId(2335),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62797,7 +62833,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4384, 4433),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2335),
+            id: DeclarationId(2336),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62811,7 +62847,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 847, 851),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2336),
+            id: DeclarationId(2337),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62825,7 +62861,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 854, 857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2337),
+            id: DeclarationId(2338),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62839,13 +62875,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 860, 872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2338),
+            id: DeclarationId(2339),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1353),
+                    value: DeclarationId(1354),
                 }],
             },
             type_params: vec![],
@@ -62859,7 +62895,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1242, 1259),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2339),
+            id: DeclarationId(2340),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -62878,7 +62914,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2340),
+            id: DeclarationId(2341),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62892,7 +62928,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1309, 1318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2341),
+            id: DeclarationId(2342),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62906,7 +62942,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1323, 1332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2342),
+            id: DeclarationId(2343),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62920,7 +62956,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1337, 1350),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2343),
+            id: DeclarationId(2344),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62934,7 +62970,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1355, 1367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2344),
+            id: DeclarationId(2345),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62948,7 +62984,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1372, 1385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2345),
+            id: DeclarationId(2346),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -62967,7 +63003,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2346),
+            id: DeclarationId(2347),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62981,7 +63017,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1677, 1685),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2347),
+            id: DeclarationId(2348),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62995,7 +63031,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1688, 1697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2348),
+            id: DeclarationId(2349),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63009,13 +63045,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1700, 1709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2349),
+            id: DeclarationId(2350),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1362),
+                    value: DeclarationId(1363),
                 }],
             },
             type_params: vec![],
@@ -63029,11 +63065,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1521, 1542),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2350),
+            id: DeclarationId(2351),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1371),
+                    DeclarationId(1372),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63048,13 +63084,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2351),
+            id: DeclarationId(2352),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1368),
+                    value: DeclarationId(1369),
                 }],
             },
             type_params: vec![],
@@ -63068,7 +63104,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1583, 1592),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2352),
+            id: DeclarationId(2353),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -63094,11 +63130,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2353),
+            id: DeclarationId(2354),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2352),
+                    DeclarationId(2353),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63113,11 +63149,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2354),
+            id: DeclarationId(2355),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1360),
+                    DeclarationId(1361),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63132,7 +63168,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2355),
+            id: DeclarationId(2356),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63146,7 +63182,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1917, 1925),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2356),
+            id: DeclarationId(2357),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63160,7 +63196,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1928, 1937),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2357),
+            id: DeclarationId(2358),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63174,7 +63210,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1940, 1948),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2358),
+            id: DeclarationId(2359),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -63194,7 +63230,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2106, 2118),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2359),
+            id: DeclarationId(2360),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -63214,17 +63250,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2127, 2139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2360),
+            id: DeclarationId(2361),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "branches".to_string(),
-                        ty: DeclarationId(2358),
+                        ty: DeclarationId(2359),
                     },
                     Field {
                         label: "paths".to_string(),
-                        ty: DeclarationId(2359),
+                        ty: DeclarationId(2360),
                     },
                 ],
             },
@@ -63239,7 +63275,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2089, 2141),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2361),
+            id: DeclarationId(2362),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -63259,13 +63295,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2170, 2182),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2362),
+            id: DeclarationId(2363),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1363),
+                    value: DeclarationId(1364),
                 }],
             },
             type_params: vec![],
@@ -63279,17 +63315,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2191, 2216),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2363),
+            id: DeclarationId(2364),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "branches".to_string(),
-                        ty: DeclarationId(2361),
+                        ty: DeclarationId(2362),
                     },
                     Field {
                         label: "types".to_string(),
-                        ty: DeclarationId(2362),
+                        ty: DeclarationId(2363),
                     },
                 ],
             },
@@ -63304,12 +63340,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2146, 2218),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2364),
+            id: DeclarationId(2365),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "cron".to_string(),
-                    ty: DeclarationId(1344),
+                    ty: DeclarationId(1345),
                 }],
             },
             type_params: vec![],
@@ -63323,13 +63359,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2223, 2254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2365),
+            id: DeclarationId(2366),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1364),
+                    value: DeclarationId(1365),
                 }],
             },
             type_params: vec![],
@@ -63343,12 +63379,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2286, 2305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2366),
+            id: DeclarationId(2367),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "inputs".to_string(),
-                    ty: DeclarationId(2365),
+                    ty: DeclarationId(2366),
                 }],
             },
             type_params: vec![],
@@ -63362,13 +63398,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2259, 2307),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2367),
+            id: DeclarationId(2368),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1364),
+                    value: DeclarationId(1365),
                 }],
             },
             type_params: vec![],
@@ -63382,12 +63418,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2335, 2354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2368),
+            id: DeclarationId(2369),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "inputs".to_string(),
-                    ty: DeclarationId(2367),
+                    ty: DeclarationId(2368),
                 }],
             },
             type_params: vec![],
@@ -63401,7 +63437,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2312, 2356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2369),
+            id: DeclarationId(2370),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63415,7 +63451,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2387, 2393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2370),
+            id: DeclarationId(2371),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63429,7 +63465,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2398, 2409),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2371),
+            id: DeclarationId(2372),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63443,7 +63479,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2414, 2422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2372),
+            id: DeclarationId(2373),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63457,7 +63493,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2427, 2441),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2373),
+            id: DeclarationId(2374),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63471,7 +63507,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2446, 2452),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2374),
+            id: DeclarationId(2375),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -63490,7 +63526,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2375),
+            id: DeclarationId(2376),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -63509,7 +63545,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2376),
+            id: DeclarationId(2377),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63523,7 +63559,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2603, 2614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2377),
+            id: DeclarationId(2378),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63537,7 +63573,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2617, 2629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2378),
+            id: DeclarationId(2379),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63551,7 +63587,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2632, 2643),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2379),
+            id: DeclarationId(2380),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63565,7 +63601,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2646, 2662),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2380),
+            id: DeclarationId(2381),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63579,7 +63615,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4784, 4793),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2381),
+            id: DeclarationId(2382),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63593,7 +63629,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4796, 4804),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2382),
+            id: DeclarationId(2383),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63607,7 +63643,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4807, 4820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2383),
+            id: DeclarationId(2384),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -63626,13 +63662,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2384),
+            id: DeclarationId(2385),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(1374),
+                    value: DeclarationId(1375),
                 }],
             },
             type_params: vec![],
@@ -63646,7 +63682,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5372, 5382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2385),
+            id: DeclarationId(2386),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -63666,7 +63702,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5392, 5404),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2386),
+            id: DeclarationId(2387),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -63692,11 +63728,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2387),
+            id: DeclarationId(2388),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2386),
+                    DeclarationId(2387),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63711,7 +63747,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2388),
+            id: DeclarationId(2389),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -63737,11 +63773,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2389),
+            id: DeclarationId(2390),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2388),
+                    DeclarationId(2389),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63756,7 +63792,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2390),
+            id: DeclarationId(2391),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -63775,11 +63811,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2391),
+            id: DeclarationId(2392),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1390),
+                    DeclarationId(1391),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63794,7 +63830,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2392),
+            id: DeclarationId(2393),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -63813,11 +63849,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2393),
+            id: DeclarationId(2394),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1371),
+                    DeclarationId(1372),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63832,7 +63868,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2394),
+            id: DeclarationId(2395),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63851,7 +63887,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6619, 6655),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2395),
+            id: DeclarationId(2396),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63870,7 +63906,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6660, 6709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2396),
+            id: DeclarationId(2397),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63884,7 +63920,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7555, 7584),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2397),
+            id: DeclarationId(2398),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63903,7 +63939,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7589, 7646),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2398),
+            id: DeclarationId(2399),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63922,11 +63958,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8224, 8259),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2399),
+            id: DeclarationId(2400),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1370),
+                    DeclarationId(1371),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63941,7 +63977,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2400),
+            id: DeclarationId(2401),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -63951,7 +63987,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "cancel_in_progress".to_string(),
-                        ty: DeclarationId(2399),
+                        ty: DeclarationId(2400),
                     },
                 ],
             },
@@ -63966,11 +64002,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8264, 8453),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2401),
+            id: DeclarationId(2402),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1369),
+                    DeclarationId(1370),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63985,7 +64021,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2402),
+            id: DeclarationId(2403),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64004,7 +64040,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2403),
+            id: DeclarationId(2404),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64014,11 +64050,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "cancel_in_progress".to_string(),
-                        ty: DeclarationId(2401),
+                        ty: DeclarationId(2402),
                     },
                     Field {
                         label: "explicit_single".to_string(),
-                        ty: DeclarationId(2402),
+                        ty: DeclarationId(2403),
                     },
                 ],
             },
@@ -64033,12 +64069,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8458, 8845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2404),
+            id: DeclarationId(2405),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "label".to_string(),
-                    ty: DeclarationId(1373),
+                    ty: DeclarationId(1374),
                 }],
             },
             type_params: vec![],
@@ -64052,7 +64088,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10037, 10072),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2405),
+            id: DeclarationId(2406),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -64072,12 +64108,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10098, 10110),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2406),
+            id: DeclarationId(2407),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "labels".to_string(),
-                    ty: DeclarationId(2405),
+                    ty: DeclarationId(2406),
                 }],
             },
             type_params: vec![],
@@ -64091,7 +64127,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10077, 10112),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2407),
+            id: DeclarationId(2408),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -64110,7 +64146,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10201, 10240),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2408),
+            id: DeclarationId(2409),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64124,7 +64160,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10263, 10275),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2409),
+            id: DeclarationId(2410),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64138,7 +64174,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10280, 10290),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2410),
+            id: DeclarationId(2411),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64152,7 +64188,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10295, 10305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2411),
+            id: DeclarationId(2412),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64166,7 +64202,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10310, 10321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2412),
+            id: DeclarationId(2413),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64180,7 +64216,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10326, 10333),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2413),
+            id: DeclarationId(2414),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64194,7 +64230,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10338, 10351),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2414),
+            id: DeclarationId(2415),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64213,7 +64249,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2415),
+            id: DeclarationId(2416),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64231,202 +64267,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
-        declarations.push(Declaration {
-            id: DeclarationId(2416),
-            name: None,
-            connective: TypeConnective::Instantiation {
-                template: DeclarationId(137),
-                arguments: vec![
-                    TemplateArgument {
-                        parameter: DeclarationId(138),
-                        value: DeclarationId(230),
-                    },
-                    TemplateArgument {
-                        parameter: DeclarationId(139),
-                        value: DeclarationId(230),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/actions.dag", 10614, 10633),
-        });
         declarations.push(Declaration {
             id: DeclarationId(2417),
             name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2416),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 10614, 10634),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2418),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 10661, 10668),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2419),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 10690, 10697),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2420),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(93),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 10753, 10757),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2421),
-            name: None,
-            connective: TypeConnective::Conj {
-                children: vec![
-                    Field {
-                        label: "name".to_string(),
-                        ty: DeclarationId(2414),
-                    },
-                    Field {
-                        label: "id".to_string(),
-                        ty: DeclarationId(2415),
-                    },
-                    Field {
-                        label: "run".to_string(),
-                        ty: DeclarationId(230),
-                    },
-                    Field {
-                        label: "shell".to_string(),
-                        ty: DeclarationId(1375),
-                    },
-                    Field {
-                        label: "env".to_string(),
-                        ty: DeclarationId(2417),
-                    },
-                    Field {
-                        label: "working_directory".to_string(),
-                        ty: DeclarationId(2418),
-                    },
-                    Field {
-                        label: "if_condition".to_string(),
-                        ty: DeclarationId(2419),
-                    },
-                    Field {
-                        label: "continue_on_error".to_string(),
-                        ty: DeclarationId(128),
-                    },
-                    Field {
-                        label: "timeout_minutes".to_string(),
-                        ty: DeclarationId(2420),
-                    },
-                ],
-            },
-            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("dsl/extdeps/github/actions.dag", 10510, 10763),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2422),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 10791, 10798),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2423),
-            name: None,
-            connective: TypeConnective::Cardinality(
-                CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(230),
-                    CardinalityBound::AtMostOne,
-                ),
-            ),
-            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("dsl/extdeps/github/actions.dag", 10810, 10817),
-        });
-        declarations.push(Declaration {
-            id: DeclarationId(2424),
-            name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
                 arguments: vec![
@@ -64448,14 +64291,207 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10962),
+            span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10633),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2418),
+            name: None,
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(2417),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
+            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("dsl/extdeps/github/actions.dag", 10614, 10634),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2419),
+            name: None,
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
+            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("dsl/extdeps/github/actions.dag", 10661, 10668),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2420),
+            name: None,
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
+            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("dsl/extdeps/github/actions.dag", 10690, 10697),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2421),
+            name: None,
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(93),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
+            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("dsl/extdeps/github/actions.dag", 10753, 10757),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2422),
+            name: None,
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "name".to_string(),
+                        ty: DeclarationId(2415),
+                    },
+                    Field {
+                        label: "id".to_string(),
+                        ty: DeclarationId(2416),
+                    },
+                    Field {
+                        label: "run".to_string(),
+                        ty: DeclarationId(230),
+                    },
+                    Field {
+                        label: "shell".to_string(),
+                        ty: DeclarationId(1376),
+                    },
+                    Field {
+                        label: "env".to_string(),
+                        ty: DeclarationId(2418),
+                    },
+                    Field {
+                        label: "working_directory".to_string(),
+                        ty: DeclarationId(2419),
+                    },
+                    Field {
+                        label: "if_condition".to_string(),
+                        ty: DeclarationId(2420),
+                    },
+                    Field {
+                        label: "continue_on_error".to_string(),
+                        ty: DeclarationId(128),
+                    },
+                    Field {
+                        label: "timeout_minutes".to_string(),
+                        ty: DeclarationId(2421),
+                    },
+                ],
+            },
+            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("dsl/extdeps/github/actions.dag", 10510, 10763),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2423),
+            name: None,
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
+            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("dsl/extdeps/github/actions.dag", 10791, 10798),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2424),
+            name: None,
+            connective: TypeConnective::Cardinality(
+                CardinalityPayload::new_unchecked_bypassing_idempotence(
+                    DeclarationId(230),
+                    CardinalityBound::AtMostOne,
+                ),
+            ),
+            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("dsl/extdeps/github/actions.dag", 10810, 10817),
         });
         declarations.push(Declaration {
             id: DeclarationId(2425),
             name: None,
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(137),
+                arguments: vec![
+                    TemplateArgument {
+                        parameter: DeclarationId(138),
+                        value: DeclarationId(230),
+                    },
+                    TemplateArgument {
+                        parameter: DeclarationId(139),
+                        value: DeclarationId(230),
+                    },
+                ],
+            },
+            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("dsl/extdeps/github/actions.dag", 10943, 10962),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(2426),
+            name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2424),
+                    DeclarationId(2425),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -64470,7 +64506,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2426),
+            id: DeclarationId(2427),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -64496,11 +64532,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10995),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2427),
+            id: DeclarationId(2428),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(2426),
+                    DeclarationId(2427),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -64515,7 +64551,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10996),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2428),
+            id: DeclarationId(2429),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64534,7 +64570,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2429),
+            id: DeclarationId(2430),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64553,33 +64589,33 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2430),
+            id: DeclarationId(2431),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(2422),
+                        ty: DeclarationId(2423),
                     },
                     Field {
                         label: "id".to_string(),
-                        ty: DeclarationId(2423),
+                        ty: DeclarationId(2424),
                     },
                     Field {
                         label: "uses".to_string(),
-                        ty: DeclarationId(1376),
+                        ty: DeclarationId(1377),
                     },
                     Field {
                         label: "with".to_string(),
-                        ty: DeclarationId(2425),
+                        ty: DeclarationId(2426),
                     },
                     Field {
                         label: "env".to_string(),
-                        ty: DeclarationId(2427),
+                        ty: DeclarationId(2428),
                     },
                     Field {
                         label: "if_condition".to_string(),
-                        ty: DeclarationId(2428),
+                        ty: DeclarationId(2429),
                     },
                     Field {
                         label: "continue_on_error".to_string(),
@@ -64587,7 +64623,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "timeout_minutes".to_string(),
-                        ty: DeclarationId(2429),
+                        ty: DeclarationId(2430),
                     },
                 ],
             },
@@ -64602,7 +64638,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10768, 11091),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2431),
+            id: DeclarationId(2432),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64616,7 +64652,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11110, 11114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2432),
+            id: DeclarationId(2433),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64630,7 +64666,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11117, 11119),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2433),
+            id: DeclarationId(2434),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64644,7 +64680,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11122, 11126),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2434),
+            id: DeclarationId(2435),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64658,7 +64694,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11129, 11135),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2435),
+            id: DeclarationId(2436),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64672,7 +64708,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11138, 11141),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2436),
+            id: DeclarationId(2437),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64691,7 +64727,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2437),
+            id: DeclarationId(2438),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64710,7 +64746,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2438),
+            id: DeclarationId(2439),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64729,7 +64765,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11530, 11534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2439),
+            id: DeclarationId(2440),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64739,15 +64775,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "file".to_string(),
-                        ty: DeclarationId(2436),
+                        ty: DeclarationId(2437),
                     },
                     Field {
                         label: "line".to_string(),
-                        ty: DeclarationId(2437),
+                        ty: DeclarationId(2438),
                     },
                     Field {
                         label: "col".to_string(),
-                        ty: DeclarationId(2438),
+                        ty: DeclarationId(2439),
                     },
                 ],
             },
@@ -64762,7 +64798,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11463, 11536),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2440),
+            id: DeclarationId(2441),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64781,7 +64817,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11584, 11591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2441),
+            id: DeclarationId(2442),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64800,7 +64836,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2442),
+            id: DeclarationId(2443),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64819,7 +64855,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11610, 11614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2443),
+            id: DeclarationId(2444),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64829,15 +64865,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "file".to_string(),
-                        ty: DeclarationId(2440),
+                        ty: DeclarationId(2441),
                     },
                     Field {
                         label: "line".to_string(),
-                        ty: DeclarationId(2441),
+                        ty: DeclarationId(2442),
                     },
                     Field {
                         label: "col".to_string(),
-                        ty: DeclarationId(2442),
+                        ty: DeclarationId(2443),
                     },
                 ],
             },
@@ -64852,7 +64888,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11541, 11616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2444),
+            id: DeclarationId(2445),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64871,7 +64907,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11663, 11670),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2445),
+            id: DeclarationId(2446),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64890,7 +64926,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11678, 11682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2446),
+            id: DeclarationId(2447),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -64909,7 +64945,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11689, 11693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2447),
+            id: DeclarationId(2448),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -64919,15 +64955,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "file".to_string(),
-                        ty: DeclarationId(2444),
+                        ty: DeclarationId(2445),
                     },
                     Field {
                         label: "line".to_string(),
-                        ty: DeclarationId(2445),
+                        ty: DeclarationId(2446),
                     },
                     Field {
                         label: "col".to_string(),
-                        ty: DeclarationId(2446),
+                        ty: DeclarationId(2447),
                     },
                 ],
             },
@@ -64942,7 +64978,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11621, 11695),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2448),
+            id: DeclarationId(2449),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -64961,7 +64997,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11700, 11733),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2449),
+            id: DeclarationId(2450),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64975,7 +65011,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11738, 11756),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2450),
+            id: DeclarationId(2451),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65000,7 +65036,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11761, 11802),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2451),
+            id: DeclarationId(2452),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65019,7 +65055,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11807, 11832),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2452),
+            id: DeclarationId(2453),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65038,7 +65074,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11837, 11867),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2453),
+            id: DeclarationId(2454),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -65057,7 +65093,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12673, 12677),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2454),
+            id: DeclarationId(2455),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65071,11 +65107,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "retention_days".to_string(),
-                        ty: DeclarationId(2453),
+                        ty: DeclarationId(2454),
                     },
                     Field {
                         label: "if_no_files_found".to_string(),
-                        ty: DeclarationId(1387),
+                        ty: DeclarationId(1388),
                     },
                 ],
             },
@@ -65090,7 +65126,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12620, 12720),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2455),
+            id: DeclarationId(2456),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -65109,7 +65145,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12756, 12763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2456),
+            id: DeclarationId(2457),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65119,7 +65155,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(2455),
+                        ty: DeclarationId(2456),
                     },
                 ],
             },
@@ -65134,7 +65170,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12725, 12765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2457),
+            id: DeclarationId(2458),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65148,7 +65184,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12795, 12799),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2458),
+            id: DeclarationId(2459),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65162,7 +65198,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12802, 12810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2459),
+            id: DeclarationId(2460),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65176,7 +65212,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12813, 12819),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2460),
+            id: DeclarationId(2461),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
@@ -65196,7 +65232,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13281, 13293),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2461),
+            id: DeclarationId(2462),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -65207,7 +65243,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     TemplateArgument {
                         parameter: DeclarationId(139),
-                        value: DeclarationId(2460),
+                        value: DeclarationId(2461),
                     },
                 ],
             },
@@ -65222,7 +65258,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13269, 13294),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2462),
+            id: DeclarationId(2463),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -65248,13 +65284,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13311, 13330),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2463),
+            id: DeclarationId(2464),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2462),
+                    value: DeclarationId(2463),
                 }],
             },
             type_params: vec![],
@@ -65268,7 +65304,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13306, 13331),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2464),
+            id: DeclarationId(2465),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(137),
@@ -65294,13 +65330,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13348, 13367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2465),
+            id: DeclarationId(2466),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(685),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(686),
-                    value: DeclarationId(2464),
+                    value: DeclarationId(2465),
                 }],
             },
             type_params: vec![],
@@ -65314,7 +65350,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13343, 13368),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2466),
+            id: DeclarationId(2467),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -65333,7 +65369,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13403, 13407),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2467),
+            id: DeclarationId(2468),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65347,7 +65383,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13563, 13570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2468),
+            id: DeclarationId(2469),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65361,7 +65397,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13575, 13582),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2469),
+            id: DeclarationId(2470),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65375,7 +65411,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13587, 13596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2470),
+            id: DeclarationId(2471),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65389,7 +65425,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13601, 13608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2471),
+            id: DeclarationId(2472),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65403,7 +65439,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13613, 13621),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2472),
+            id: DeclarationId(2473),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65417,7 +65453,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13626, 13640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2473),
+            id: DeclarationId(2474),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65431,7 +65467,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1935, 1959),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2474),
+            id: DeclarationId(2475),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65445,7 +65481,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1964, 1989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2475),
+            id: DeclarationId(2476),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(151)],
@@ -65463,7 +65499,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2673, 2714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2476),
+            id: DeclarationId(2477),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65482,7 +65518,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2477),
+            id: DeclarationId(2478),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65496,17 +65532,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2478),
+            id: DeclarationId(2479),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2476),
+                        ty: DeclarationId(2477),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2477),
+                        ty: DeclarationId(2478),
                     },
                 ],
             },
@@ -65521,7 +65557,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2479),
+            id: DeclarationId(2480),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65540,7 +65576,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2480),
+            id: DeclarationId(2481),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65554,17 +65590,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2481),
+            id: DeclarationId(2482),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2479),
+                        ty: DeclarationId(2480),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2480),
+                        ty: DeclarationId(2481),
                     },
                 ],
             },
@@ -65579,7 +65615,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2482),
+            id: DeclarationId(2483),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65598,7 +65634,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2483),
+            id: DeclarationId(2484),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65612,17 +65648,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2484),
+            id: DeclarationId(2485),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2482),
+                        ty: DeclarationId(2483),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2483),
+                        ty: DeclarationId(2484),
                     },
                 ],
             },
@@ -65637,7 +65673,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2485),
+            id: DeclarationId(2486),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65656,7 +65692,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2486),
+            id: DeclarationId(2487),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65670,17 +65706,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2487),
+            id: DeclarationId(2488),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2485),
+                        ty: DeclarationId(2486),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2486),
+                        ty: DeclarationId(2487),
                     },
                 ],
             },
@@ -65695,7 +65731,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2488),
+            id: DeclarationId(2489),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65714,7 +65750,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2489),
+            id: DeclarationId(2490),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65728,17 +65764,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2490),
+            id: DeclarationId(2491),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2488),
+                        ty: DeclarationId(2489),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2489),
+                        ty: DeclarationId(2490),
                     },
                 ],
             },
@@ -65753,7 +65789,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2491),
+            id: DeclarationId(2492),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65772,7 +65808,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2492),
+            id: DeclarationId(2493),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65786,17 +65822,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2493),
+            id: DeclarationId(2494),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2491),
+                        ty: DeclarationId(2492),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2492),
+                        ty: DeclarationId(2493),
                     },
                 ],
             },
@@ -65811,7 +65847,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2494),
+            id: DeclarationId(2495),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65830,7 +65866,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2495),
+            id: DeclarationId(2496),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65844,17 +65880,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2496),
+            id: DeclarationId(2497),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2494),
+                        ty: DeclarationId(2495),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2495),
+                        ty: DeclarationId(2496),
                     },
                 ],
             },
@@ -65869,7 +65905,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2497),
+            id: DeclarationId(2498),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65888,7 +65924,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 3781, 3785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2498),
+            id: DeclarationId(2499),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65902,17 +65938,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 3781, 3785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2499),
+            id: DeclarationId(2500),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2497),
+                        ty: DeclarationId(2498),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2498),
+                        ty: DeclarationId(2499),
                     },
                 ],
             },
@@ -65927,7 +65963,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 3781, 3785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2500),
+            id: DeclarationId(2501),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65946,7 +65982,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 4264, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2501),
+            id: DeclarationId(2502),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65960,17 +65996,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 4264, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2502),
+            id: DeclarationId(2503),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2500),
+                        ty: DeclarationId(2501),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2501),
+                        ty: DeclarationId(2502),
                     },
                 ],
             },
@@ -65985,7 +66021,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 4264, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2503),
+            id: DeclarationId(2504),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66004,7 +66040,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 6172, 6179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2504),
+            id: DeclarationId(2505),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66018,17 +66054,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 6172, 6179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2505),
+            id: DeclarationId(2506),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2503),
+                        ty: DeclarationId(2504),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2504),
+                        ty: DeclarationId(2505),
                     },
                 ],
             },
@@ -66043,7 +66079,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 6172, 6179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2506),
+            id: DeclarationId(2507),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66062,7 +66098,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16964, 16984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2507),
+            id: DeclarationId(2508),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66076,17 +66112,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16964, 16984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2508),
+            id: DeclarationId(2509),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2506),
+                        ty: DeclarationId(2507),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2507),
+                        ty: DeclarationId(2508),
                     },
                 ],
             },
@@ -66101,7 +66137,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 16964, 16984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2509),
+            id: DeclarationId(2510),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66120,7 +66156,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17620, 17627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2510),
+            id: DeclarationId(2511),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66134,17 +66170,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17620, 17627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2511),
+            id: DeclarationId(2512),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2509),
+                        ty: DeclarationId(2510),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2510),
+                        ty: DeclarationId(2511),
                     },
                 ],
             },
@@ -66159,7 +66195,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 17620, 17627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2512),
+            id: DeclarationId(2513),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66178,7 +66214,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21380, 21390),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2513),
+            id: DeclarationId(2514),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66192,17 +66228,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21380, 21390),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2514),
+            id: DeclarationId(2515),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2512),
+                        ty: DeclarationId(2513),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2513),
+                        ty: DeclarationId(2514),
                     },
                 ],
             },
@@ -66217,7 +66253,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21380, 21390),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2515),
+            id: DeclarationId(2516),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66236,7 +66272,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21515, 21522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2516),
+            id: DeclarationId(2517),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66250,17 +66286,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21515, 21522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2517),
+            id: DeclarationId(2518),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2515),
+                        ty: DeclarationId(2516),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2516),
+                        ty: DeclarationId(2517),
                     },
                 ],
             },
@@ -66275,7 +66311,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21515, 21522),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2518),
+            id: DeclarationId(2519),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66294,7 +66330,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21589, 21593),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2519),
+            id: DeclarationId(2520),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66308,17 +66344,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21589, 21593),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2520),
+            id: DeclarationId(2521),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2518),
+                        ty: DeclarationId(2519),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2519),
+                        ty: DeclarationId(2520),
                     },
                 ],
             },
@@ -66333,7 +66369,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 21589, 21593),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2521),
+            id: DeclarationId(2522),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66352,7 +66388,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23360, 23367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2522),
+            id: DeclarationId(2523),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66366,17 +66402,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23360, 23367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2523),
+            id: DeclarationId(2524),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2521),
+                        ty: DeclarationId(2522),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2522),
+                        ty: DeclarationId(2523),
                     },
                 ],
             },
@@ -66391,7 +66427,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23360, 23367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2524),
+            id: DeclarationId(2525),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66410,7 +66446,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23872, 23879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2525),
+            id: DeclarationId(2526),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66424,17 +66460,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23872, 23879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2526),
+            id: DeclarationId(2527),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2524),
+                        ty: DeclarationId(2525),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2525),
+                        ty: DeclarationId(2526),
                     },
                 ],
             },
@@ -66449,7 +66485,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23872, 23879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2527),
+            id: DeclarationId(2528),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66468,7 +66504,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23966, 23973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2528),
+            id: DeclarationId(2529),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66482,17 +66518,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23966, 23973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2529),
+            id: DeclarationId(2530),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2527),
+                        ty: DeclarationId(2528),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2528),
+                        ty: DeclarationId(2529),
                     },
                 ],
             },
@@ -66507,7 +66543,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 23966, 23973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2530),
+            id: DeclarationId(2531),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66526,7 +66562,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24196, 24211),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2531),
+            id: DeclarationId(2532),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66540,17 +66576,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24196, 24211),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2532),
+            id: DeclarationId(2533),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2530),
+                        ty: DeclarationId(2531),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2531),
+                        ty: DeclarationId(2532),
                     },
                 ],
             },
@@ -66565,7 +66601,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24196, 24211),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2533),
+            id: DeclarationId(2534),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66584,7 +66620,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24222, 24235),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2534),
+            id: DeclarationId(2535),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66598,17 +66634,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24222, 24235),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2535),
+            id: DeclarationId(2536),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2533),
+                        ty: DeclarationId(2534),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2534),
+                        ty: DeclarationId(2535),
                     },
                 ],
             },
@@ -66623,7 +66659,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24222, 24235),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2536),
+            id: DeclarationId(2537),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66642,7 +66678,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24251, 24264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2537),
+            id: DeclarationId(2538),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66656,17 +66692,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24251, 24264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2538),
+            id: DeclarationId(2539),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2536),
+                        ty: DeclarationId(2537),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2537),
+                        ty: DeclarationId(2538),
                     },
                 ],
             },
@@ -66681,7 +66717,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24251, 24264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2539),
+            id: DeclarationId(2540),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66700,7 +66736,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24374, 24381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2540),
+            id: DeclarationId(2541),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66714,17 +66750,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24374, 24381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2541),
+            id: DeclarationId(2542),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2539),
+                        ty: DeclarationId(2540),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2540),
+                        ty: DeclarationId(2541),
                     },
                 ],
             },
@@ -66739,7 +66775,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/std/types.dag", 24374, 24381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2542),
+            id: DeclarationId(2543),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66758,7 +66794,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(2543),
+            id: DeclarationId(2544),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66772,17 +66808,17 @@ 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(2544),
+            id: DeclarationId(2545),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2542),
+                        ty: DeclarationId(2543),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2543),
+                        ty: DeclarationId(2544),
                     },
                 ],
             },
@@ -66797,12 +66833,12 @@ 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(2545),
+            id: DeclarationId(2546),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1441),
+                    ty: DeclarationId(1442),
                 }],
             },
             type_params: vec![],
@@ -66813,10 +66849,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/effects.dag", 21031, 21059),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2546),
+            id: DeclarationId(2547),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66827,20 +66863,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2547),
+            id: DeclarationId(2548),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2545),
+                        ty: DeclarationId(2546),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2546),
+                        ty: DeclarationId(2547),
                     },
                 ],
             },
@@ -66852,15 +66888,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21029, 21057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2548),
+            id: DeclarationId(2549),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1444),
+                    ty: DeclarationId(1445),
                 }],
             },
             type_params: vec![],
@@ -66871,10 +66907,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/effects.dag", 21211, 21239),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2549),
+            id: DeclarationId(2550),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66885,20 +66921,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2550),
+            id: DeclarationId(2551),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2548),
+                        ty: DeclarationId(2549),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2549),
+                        ty: DeclarationId(2550),
                     },
                 ],
             },
@@ -66910,10 +66946,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/effects.dag", 21211, 21239),
+            span: SourceSpan::new("src/v3/std/effects.dag", 21209, 21237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2551),
+            id: DeclarationId(2552),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66929,10 +66965,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/effects.dag", 29695, 29706),
+            span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2552),
+            id: DeclarationId(2553),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66943,20 +66979,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706),
+            span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2553),
+            id: DeclarationId(2554),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2551),
+                        ty: DeclarationId(2552),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2552),
+                        ty: DeclarationId(2553),
                     },
                 ],
             },
@@ -66968,10 +67004,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/effects.dag", 29695, 29706),
+            span: SourceSpan::new("src/v3/std/effects.dag", 29693, 29704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2554),
+            id: DeclarationId(2555),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66987,10 +67023,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/effects.dag", 30432, 30439),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2555),
+            id: DeclarationId(2556),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67001,20 +67037,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2556),
+            id: DeclarationId(2557),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2554),
+                        ty: DeclarationId(2555),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2555),
+                        ty: DeclarationId(2556),
                     },
                 ],
             },
@@ -67026,10 +67062,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/effects.dag", 30432, 30439),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30430, 30437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2557),
+            id: DeclarationId(2558),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67045,10 +67081,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/effects.dag", 30662, 30669),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30660, 30667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2558),
+            id: DeclarationId(2559),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67059,20 +67095,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30660, 30667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2559),
+            id: DeclarationId(2560),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2557),
+                        ty: DeclarationId(2558),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2558),
+                        ty: DeclarationId(2559),
                     },
                 ],
             },
@@ -67084,10 +67120,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/effects.dag", 30662, 30669),
+            span: SourceSpan::new("src/v3/std/effects.dag", 30660, 30667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2560),
+            id: DeclarationId(2561),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67106,7 +67142,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2561),
+            id: DeclarationId(2562),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67120,17 +67156,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2562),
+            id: DeclarationId(2563),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2560),
+                        ty: DeclarationId(2561),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2561),
+                        ty: DeclarationId(2562),
                     },
                 ],
             },
@@ -67145,7 +67181,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2563),
+            id: DeclarationId(2564),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67164,7 +67200,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2564),
+            id: DeclarationId(2565),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67178,17 +67214,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2565),
+            id: DeclarationId(2566),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2563),
+                        ty: DeclarationId(2564),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2564),
+                        ty: DeclarationId(2565),
                     },
                 ],
             },
@@ -67203,7 +67239,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2566),
+            id: DeclarationId(2567),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67222,7 +67258,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2567),
+            id: DeclarationId(2568),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67236,17 +67272,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2568),
+            id: DeclarationId(2569),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2566),
+                        ty: DeclarationId(2567),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2567),
+                        ty: DeclarationId(2568),
                     },
                 ],
             },
@@ -67261,7 +67297,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2569),
+            id: DeclarationId(2570),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67280,7 +67316,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2570),
+            id: DeclarationId(2571),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67294,17 +67330,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2571),
+            id: DeclarationId(2572),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2569),
+                        ty: DeclarationId(2570),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2570),
+                        ty: DeclarationId(2571),
                     },
                 ],
             },
@@ -67319,7 +67355,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2572),
+            id: DeclarationId(2573),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67338,7 +67374,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2573),
+            id: DeclarationId(2574),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67352,17 +67388,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2574),
+            id: DeclarationId(2575),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2572),
+                        ty: DeclarationId(2573),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2573),
+                        ty: DeclarationId(2574),
                     },
                 ],
             },
@@ -67377,7 +67413,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2575),
+            id: DeclarationId(2576),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67396,7 +67432,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2576),
+            id: DeclarationId(2577),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67410,17 +67446,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2577),
+            id: DeclarationId(2578),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2575),
+                        ty: DeclarationId(2576),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2576),
+                        ty: DeclarationId(2577),
                     },
                 ],
             },
@@ -67435,7 +67471,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2578),
+            id: DeclarationId(2579),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67454,7 +67490,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2579),
+            id: DeclarationId(2580),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67468,17 +67504,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2580),
+            id: DeclarationId(2581),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2578),
+                        ty: DeclarationId(2579),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2579),
+                        ty: DeclarationId(2580),
                     },
                 ],
             },
@@ -67493,7 +67529,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2581),
+            id: DeclarationId(2582),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67512,7 +67548,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2582),
+            id: DeclarationId(2583),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67526,17 +67562,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2583),
+            id: DeclarationId(2584),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2581),
+                        ty: DeclarationId(2582),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2582),
+                        ty: DeclarationId(2583),
                     },
                 ],
             },
@@ -67551,7 +67587,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2584),
+            id: DeclarationId(2585),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67570,7 +67606,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2585),
+            id: DeclarationId(2586),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67584,17 +67620,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2586),
+            id: DeclarationId(2587),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2584),
+                        ty: DeclarationId(2585),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2585),
+                        ty: DeclarationId(2586),
                     },
                 ],
             },
@@ -67609,7 +67645,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2587),
+            id: DeclarationId(2588),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67628,7 +67664,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2588),
+            id: DeclarationId(2589),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67642,17 +67678,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2589),
+            id: DeclarationId(2590),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2587),
+                        ty: DeclarationId(2588),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2588),
+                        ty: DeclarationId(2589),
                     },
                 ],
             },
@@ -67667,7 +67703,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2590),
+            id: DeclarationId(2591),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67686,7 +67722,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2591),
+            id: DeclarationId(2592),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67700,17 +67736,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2592),
+            id: DeclarationId(2593),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2590),
+                        ty: DeclarationId(2591),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2591),
+                        ty: DeclarationId(2592),
                     },
                 ],
             },
@@ -67725,7 +67761,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2593),
+            id: DeclarationId(2594),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67744,7 +67780,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2594),
+            id: DeclarationId(2595),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67758,17 +67794,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2595),
+            id: DeclarationId(2596),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2593),
+                        ty: DeclarationId(2594),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2594),
+                        ty: DeclarationId(2595),
                     },
                 ],
             },
@@ -67783,7 +67819,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2596),
+            id: DeclarationId(2597),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67802,7 +67838,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2597),
+            id: DeclarationId(2598),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67816,17 +67852,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2598),
+            id: DeclarationId(2599),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2596),
+                        ty: DeclarationId(2597),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2597),
+                        ty: DeclarationId(2598),
                     },
                 ],
             },
@@ -67841,7 +67877,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2599),
+            id: DeclarationId(2600),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67860,7 +67896,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2600),
+            id: DeclarationId(2601),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67874,17 +67910,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2601),
+            id: DeclarationId(2602),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2599),
+                        ty: DeclarationId(2600),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2600),
+                        ty: DeclarationId(2601),
                     },
                 ],
             },
@@ -67899,7 +67935,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2602),
+            id: DeclarationId(2603),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67918,7 +67954,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2603),
+            id: DeclarationId(2604),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67932,17 +67968,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2604),
+            id: DeclarationId(2605),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2602),
+                        ty: DeclarationId(2603),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2603),
+                        ty: DeclarationId(2604),
                     },
                 ],
             },
@@ -67957,7 +67993,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2605),
+            id: DeclarationId(2606),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -67976,7 +68012,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2606),
+            id: DeclarationId(2607),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -67990,17 +68026,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2607),
+            id: DeclarationId(2608),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2605),
+                        ty: DeclarationId(2606),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2606),
+                        ty: DeclarationId(2607),
                     },
                 ],
             },
@@ -68015,7 +68051,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2608),
+            id: DeclarationId(2609),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68034,7 +68070,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2609),
+            id: DeclarationId(2610),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68048,17 +68084,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2610),
+            id: DeclarationId(2611),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2608),
+                        ty: DeclarationId(2609),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2609),
+                        ty: DeclarationId(2610),
                     },
                 ],
             },
@@ -68073,7 +68109,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2611),
+            id: DeclarationId(2612),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68092,7 +68128,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2612),
+            id: DeclarationId(2613),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68106,17 +68142,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2613),
+            id: DeclarationId(2614),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2611),
+                        ty: DeclarationId(2612),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2612),
+                        ty: DeclarationId(2613),
                     },
                 ],
             },
@@ -68131,7 +68167,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2614),
+            id: DeclarationId(2615),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68150,7 +68186,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2615),
+            id: DeclarationId(2616),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68164,17 +68200,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2616),
+            id: DeclarationId(2617),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2614),
+                        ty: DeclarationId(2615),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2615),
+                        ty: DeclarationId(2616),
                     },
                 ],
             },
@@ -68189,7 +68225,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2617),
+            id: DeclarationId(2618),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68208,7 +68244,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2618),
+            id: DeclarationId(2619),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68222,17 +68258,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2619),
+            id: DeclarationId(2620),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2617),
+                        ty: DeclarationId(2618),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2618),
+                        ty: DeclarationId(2619),
                     },
                 ],
             },
@@ -68247,7 +68283,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2620),
+            id: DeclarationId(2621),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68266,7 +68302,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2621),
+            id: DeclarationId(2622),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68280,17 +68316,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2622),
+            id: DeclarationId(2623),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2620),
+                        ty: DeclarationId(2621),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2621),
+                        ty: DeclarationId(2622),
                     },
                 ],
             },
@@ -68305,7 +68341,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2623),
+            id: DeclarationId(2624),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68324,7 +68360,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(2624),
+            id: DeclarationId(2625),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68338,17 +68374,17 @@ 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(2625),
+            id: DeclarationId(2626),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2623),
+                        ty: DeclarationId(2624),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2624),
+                        ty: DeclarationId(2625),
                     },
                 ],
             },
@@ -68363,7 +68399,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(2626),
+            id: DeclarationId(2627),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68382,7 +68418,7 @@ 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(2627),
+            id: DeclarationId(2628),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68396,17 +68432,17 @@ 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(2628),
+            id: DeclarationId(2629),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2626),
+                        ty: DeclarationId(2627),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2627),
+                        ty: DeclarationId(2628),
                     },
                 ],
             },
@@ -68421,7 +68457,7 @@ 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(2629),
+            id: DeclarationId(2630),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68440,7 +68476,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2630),
+            id: DeclarationId(2631),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68454,17 +68490,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2631),
+            id: DeclarationId(2632),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2629),
+                        ty: DeclarationId(2630),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2630),
+                        ty: DeclarationId(2631),
                     },
                 ],
             },
@@ -68479,7 +68515,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2632),
+            id: DeclarationId(2633),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68498,7 +68534,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2633),
+            id: DeclarationId(2634),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68512,17 +68548,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2634),
+            id: DeclarationId(2635),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2632),
+                        ty: DeclarationId(2633),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2633),
+                        ty: DeclarationId(2634),
                     },
                 ],
             },
@@ -68537,7 +68573,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2635),
+            id: DeclarationId(2636),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68556,7 +68592,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2636),
+            id: DeclarationId(2637),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68570,17 +68606,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2637),
+            id: DeclarationId(2638),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2635),
+                        ty: DeclarationId(2636),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2636),
+                        ty: DeclarationId(2637),
                     },
                 ],
             },
@@ -68595,7 +68631,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2638),
+            id: DeclarationId(2639),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68614,7 +68650,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2639),
+            id: DeclarationId(2640),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68628,17 +68664,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2640),
+            id: DeclarationId(2641),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2638),
+                        ty: DeclarationId(2639),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2639),
+                        ty: DeclarationId(2640),
                     },
                 ],
             },
@@ -68653,7 +68689,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2641),
+            id: DeclarationId(2642),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68672,7 +68708,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2642),
+            id: DeclarationId(2643),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68686,17 +68722,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2643),
+            id: DeclarationId(2644),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2641),
+                        ty: DeclarationId(2642),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2642),
+                        ty: DeclarationId(2643),
                     },
                 ],
             },
@@ -68711,7 +68747,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2644),
+            id: DeclarationId(2645),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68730,7 +68766,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2645),
+            id: DeclarationId(2646),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68744,17 +68780,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2646),
+            id: DeclarationId(2647),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2644),
+                        ty: DeclarationId(2645),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2645),
+                        ty: DeclarationId(2646),
                     },
                 ],
             },
@@ -68769,7 +68805,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2647),
+            id: DeclarationId(2648),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68788,7 +68824,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2648),
+            id: DeclarationId(2649),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68802,17 +68838,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2649),
+            id: DeclarationId(2650),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2647),
+                        ty: DeclarationId(2648),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2648),
+                        ty: DeclarationId(2649),
                     },
                 ],
             },
@@ -68827,7 +68863,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2650),
+            id: DeclarationId(2651),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68846,7 +68882,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2651),
+            id: DeclarationId(2652),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68860,17 +68896,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2652),
+            id: DeclarationId(2653),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2650),
+                        ty: DeclarationId(2651),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2651),
+                        ty: DeclarationId(2652),
                     },
                 ],
             },
@@ -68885,7 +68921,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2653),
+            id: DeclarationId(2654),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68904,7 +68940,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2654),
+            id: DeclarationId(2655),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68918,17 +68954,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2655),
+            id: DeclarationId(2656),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2653),
+                        ty: DeclarationId(2654),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2654),
+                        ty: DeclarationId(2655),
                     },
                 ],
             },
@@ -68943,7 +68979,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2656),
+            id: DeclarationId(2657),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -68962,7 +68998,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2657),
+            id: DeclarationId(2658),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -68976,17 +69012,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2658),
+            id: DeclarationId(2659),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2656),
+                        ty: DeclarationId(2657),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2657),
+                        ty: DeclarationId(2658),
                     },
                 ],
             },
@@ -69001,7 +69037,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2659),
+            id: DeclarationId(2660),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69020,7 +69056,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2660),
+            id: DeclarationId(2661),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69034,17 +69070,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2661),
+            id: DeclarationId(2662),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2659),
+                        ty: DeclarationId(2660),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2660),
+                        ty: DeclarationId(2661),
                     },
                 ],
             },
@@ -69059,7 +69095,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2662),
+            id: DeclarationId(2663),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69078,7 +69114,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2663),
+            id: DeclarationId(2664),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69092,17 +69128,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2664),
+            id: DeclarationId(2665),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2662),
+                        ty: DeclarationId(2663),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2663),
+                        ty: DeclarationId(2664),
                     },
                 ],
             },
@@ -69117,12 +69153,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2665),
+            id: DeclarationId(2666),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1759),
+                    ty: DeclarationId(1760),
                 }],
             },
             type_params: vec![],
@@ -69136,7 +69172,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2666),
+            id: DeclarationId(2667),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69150,17 +69186,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2667),
+            id: DeclarationId(2668),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2665),
+                        ty: DeclarationId(2666),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2666),
+                        ty: DeclarationId(2667),
                     },
                 ],
             },
@@ -69175,7 +69211,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2668),
+            id: DeclarationId(2669),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69194,7 +69230,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2669),
+            id: DeclarationId(2670),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69208,17 +69244,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2670),
+            id: DeclarationId(2671),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2668),
+                        ty: DeclarationId(2669),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2669),
+                        ty: DeclarationId(2670),
                     },
                 ],
             },
@@ -69233,7 +69269,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2671),
+            id: DeclarationId(2672),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69252,7 +69288,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2672),
+            id: DeclarationId(2673),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69266,17 +69302,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2673),
+            id: DeclarationId(2674),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2671),
+                        ty: DeclarationId(2672),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2672),
+                        ty: DeclarationId(2673),
                     },
                 ],
             },
@@ -69291,7 +69327,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2674),
+            id: DeclarationId(2675),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69310,7 +69346,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2675),
+            id: DeclarationId(2676),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69324,17 +69360,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2676),
+            id: DeclarationId(2677),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2674),
+                        ty: DeclarationId(2675),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2675),
+                        ty: DeclarationId(2676),
                     },
                 ],
             },
@@ -69349,7 +69385,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2677),
+            id: DeclarationId(2678),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69368,7 +69404,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2678),
+            id: DeclarationId(2679),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69382,17 +69418,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2679),
+            id: DeclarationId(2680),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2677),
+                        ty: DeclarationId(2678),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2678),
+                        ty: DeclarationId(2679),
                     },
                 ],
             },
@@ -69407,7 +69443,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2680),
+            id: DeclarationId(2681),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69426,7 +69462,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2681),
+            id: DeclarationId(2682),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69440,17 +69476,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2682),
+            id: DeclarationId(2683),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2680),
+                        ty: DeclarationId(2681),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2681),
+                        ty: DeclarationId(2682),
                     },
                 ],
             },
@@ -69465,7 +69501,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2683),
+            id: DeclarationId(2684),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69484,7 +69520,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2684),
+            id: DeclarationId(2685),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69498,17 +69534,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2685),
+            id: DeclarationId(2686),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2683),
+                        ty: DeclarationId(2684),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2684),
+                        ty: DeclarationId(2685),
                     },
                 ],
             },
@@ -69523,7 +69559,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2686),
+            id: DeclarationId(2687),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69542,7 +69578,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2687),
+            id: DeclarationId(2688),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69556,17 +69592,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2688),
+            id: DeclarationId(2689),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2686),
+                        ty: DeclarationId(2687),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2687),
+                        ty: DeclarationId(2688),
                     },
                 ],
             },
@@ -69581,7 +69617,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2689),
+            id: DeclarationId(2690),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69600,7 +69636,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2690),
+            id: DeclarationId(2691),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69614,17 +69650,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2691),
+            id: DeclarationId(2692),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2689),
+                        ty: DeclarationId(2690),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2690),
+                        ty: DeclarationId(2691),
                     },
                 ],
             },
@@ -69639,7 +69675,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2692),
+            id: DeclarationId(2693),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69658,7 +69694,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2693),
+            id: DeclarationId(2694),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69672,17 +69708,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2694),
+            id: DeclarationId(2695),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2692),
+                        ty: DeclarationId(2693),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2693),
+                        ty: DeclarationId(2694),
                     },
                 ],
             },
@@ -69697,7 +69733,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2695),
+            id: DeclarationId(2696),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69716,7 +69752,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2696),
+            id: DeclarationId(2697),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69730,17 +69766,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2697),
+            id: DeclarationId(2698),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2695),
+                        ty: DeclarationId(2696),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2696),
+                        ty: DeclarationId(2697),
                     },
                 ],
             },
@@ -69755,7 +69791,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2698),
+            id: DeclarationId(2699),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69774,7 +69810,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2699),
+            id: DeclarationId(2700),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69788,17 +69824,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2700),
+            id: DeclarationId(2701),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2698),
+                        ty: DeclarationId(2699),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2699),
+                        ty: DeclarationId(2700),
                     },
                 ],
             },
@@ -69813,7 +69849,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2701),
+            id: DeclarationId(2702),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69832,7 +69868,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2702),
+            id: DeclarationId(2703),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69846,17 +69882,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2703),
+            id: DeclarationId(2704),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2701),
+                        ty: DeclarationId(2702),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2702),
+                        ty: DeclarationId(2703),
                     },
                 ],
             },
@@ -69871,7 +69907,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2704),
+            id: DeclarationId(2705),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69890,7 +69926,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2705),
+            id: DeclarationId(2706),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69904,17 +69940,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2706),
+            id: DeclarationId(2707),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2704),
+                        ty: DeclarationId(2705),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2705),
+                        ty: DeclarationId(2706),
                     },
                 ],
             },
@@ -69929,7 +69965,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2707),
+            id: DeclarationId(2708),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -69948,7 +69984,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2708),
+            id: DeclarationId(2709),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -69962,17 +69998,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2709),
+            id: DeclarationId(2710),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2707),
+                        ty: DeclarationId(2708),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2708),
+                        ty: DeclarationId(2709),
                     },
                 ],
             },
@@ -69987,7 +70023,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2710),
+            id: DeclarationId(2711),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70006,7 +70042,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2711),
+            id: DeclarationId(2712),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70020,17 +70056,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2712),
+            id: DeclarationId(2713),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2710),
+                        ty: DeclarationId(2711),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2711),
+                        ty: DeclarationId(2712),
                     },
                 ],
             },
@@ -70045,7 +70081,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2713),
+            id: DeclarationId(2714),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70064,7 +70100,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2714),
+            id: DeclarationId(2715),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70078,17 +70114,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2715),
+            id: DeclarationId(2716),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2713),
+                        ty: DeclarationId(2714),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2714),
+                        ty: DeclarationId(2715),
                     },
                 ],
             },
@@ -70103,7 +70139,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2716),
+            id: DeclarationId(2717),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70122,7 +70158,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2717),
+            id: DeclarationId(2718),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70136,17 +70172,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2718),
+            id: DeclarationId(2719),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2716),
+                        ty: DeclarationId(2717),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2717),
+                        ty: DeclarationId(2718),
                     },
                 ],
             },
@@ -70161,7 +70197,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2719),
+            id: DeclarationId(2720),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70180,7 +70216,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2720),
+            id: DeclarationId(2721),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70194,17 +70230,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2721),
+            id: DeclarationId(2722),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2719),
+                        ty: DeclarationId(2720),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2720),
+                        ty: DeclarationId(2721),
                     },
                 ],
             },
@@ -70219,7 +70255,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2722),
+            id: DeclarationId(2723),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70238,7 +70274,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2723),
+            id: DeclarationId(2724),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70252,17 +70288,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2724),
+            id: DeclarationId(2725),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2722),
+                        ty: DeclarationId(2723),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2723),
+                        ty: DeclarationId(2724),
                     },
                 ],
             },
@@ -70277,7 +70313,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2725),
+            id: DeclarationId(2726),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70296,7 +70332,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2726),
+            id: DeclarationId(2727),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70310,17 +70346,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2727),
+            id: DeclarationId(2728),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2725),
+                        ty: DeclarationId(2726),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2726),
+                        ty: DeclarationId(2727),
                     },
                 ],
             },
@@ -70335,7 +70371,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2728),
+            id: DeclarationId(2729),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70354,7 +70390,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2729),
+            id: DeclarationId(2730),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70368,17 +70404,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2730),
+            id: DeclarationId(2731),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2728),
+                        ty: DeclarationId(2729),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2729),
+                        ty: DeclarationId(2730),
                     },
                 ],
             },
@@ -70393,7 +70429,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2731),
+            id: DeclarationId(2732),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70412,7 +70448,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2732),
+            id: DeclarationId(2733),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70426,17 +70462,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2733),
+            id: DeclarationId(2734),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2731),
+                        ty: DeclarationId(2732),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2732),
+                        ty: DeclarationId(2733),
                     },
                 ],
             },
@@ -70451,7 +70487,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2734),
+            id: DeclarationId(2735),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70470,7 +70506,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2735),
+            id: DeclarationId(2736),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70484,17 +70520,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2736),
+            id: DeclarationId(2737),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2734),
+                        ty: DeclarationId(2735),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2735),
+                        ty: DeclarationId(2736),
                     },
                 ],
             },
@@ -70509,7 +70545,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2737),
+            id: DeclarationId(2738),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70528,7 +70564,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2738),
+            id: DeclarationId(2739),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70542,17 +70578,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2739),
+            id: DeclarationId(2740),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2737),
+                        ty: DeclarationId(2738),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2738),
+                        ty: DeclarationId(2739),
                     },
                 ],
             },
@@ -70567,7 +70603,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2740),
+            id: DeclarationId(2741),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70586,7 +70622,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2741),
+            id: DeclarationId(2742),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70600,17 +70636,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2742),
+            id: DeclarationId(2743),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2740),
+                        ty: DeclarationId(2741),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2741),
+                        ty: DeclarationId(2742),
                     },
                 ],
             },
@@ -70625,7 +70661,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2743),
+            id: DeclarationId(2744),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70644,7 +70680,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2744),
+            id: DeclarationId(2745),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70658,17 +70694,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2745),
+            id: DeclarationId(2746),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2743),
+                        ty: DeclarationId(2744),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2744),
+                        ty: DeclarationId(2745),
                     },
                 ],
             },
@@ -70683,7 +70719,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2746),
+            id: DeclarationId(2747),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70702,7 +70738,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2747),
+            id: DeclarationId(2748),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70716,17 +70752,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2748),
+            id: DeclarationId(2749),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2746),
+                        ty: DeclarationId(2747),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2747),
+                        ty: DeclarationId(2748),
                     },
                 ],
             },
@@ -70741,7 +70777,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2749),
+            id: DeclarationId(2750),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70760,7 +70796,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2750),
+            id: DeclarationId(2751),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70774,17 +70810,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2751),
+            id: DeclarationId(2752),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2749),
+                        ty: DeclarationId(2750),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2750),
+                        ty: DeclarationId(2751),
                     },
                 ],
             },
@@ -70799,7 +70835,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2752),
+            id: DeclarationId(2753),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70818,7 +70854,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(2753),
+            id: DeclarationId(2754),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70832,17 +70868,17 @@ 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(2754),
+            id: DeclarationId(2755),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2752),
+                        ty: DeclarationId(2753),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2753),
+                        ty: DeclarationId(2754),
                     },
                 ],
             },
@@ -70857,7 +70893,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(2755),
+            id: DeclarationId(2756),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70876,7 +70912,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2756),
+            id: DeclarationId(2757),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70890,17 +70926,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2757),
+            id: DeclarationId(2758),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2755),
+                        ty: DeclarationId(2756),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2756),
+                        ty: DeclarationId(2757),
                     },
                 ],
             },
@@ -70915,7 +70951,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2758),
+            id: DeclarationId(2759),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -70934,7 +70970,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2759),
+            id: DeclarationId(2760),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -70948,17 +70984,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2760),
+            id: DeclarationId(2761),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2758),
+                        ty: DeclarationId(2759),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2759),
+                        ty: DeclarationId(2760),
                     },
                 ],
             },
@@ -70973,12 +71009,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2761),
+            id: DeclarationId(2762),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1371),
+                    ty: DeclarationId(1372),
                 }],
             },
             type_params: vec![],
@@ -70992,7 +71028,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2762),
+            id: DeclarationId(2763),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71006,17 +71042,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2763),
+            id: DeclarationId(2764),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2761),
+                        ty: DeclarationId(2762),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2762),
+                        ty: DeclarationId(2763),
                     },
                 ],
             },
@@ -71031,12 +71067,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2764),
+            id: DeclarationId(2765),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2352),
+                    ty: DeclarationId(2353),
                 }],
             },
             type_params: vec![],
@@ -71050,7 +71086,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2765),
+            id: DeclarationId(2766),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71064,17 +71100,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2766),
+            id: DeclarationId(2767),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2764),
+                        ty: DeclarationId(2765),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2765),
+                        ty: DeclarationId(2766),
                     },
                 ],
             },
@@ -71089,12 +71125,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2767),
+            id: DeclarationId(2768),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1360),
+                    ty: DeclarationId(1361),
                 }],
             },
             type_params: vec![],
@@ -71108,7 +71144,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2768),
+            id: DeclarationId(2769),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71122,17 +71158,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2769),
+            id: DeclarationId(2770),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2767),
+                        ty: DeclarationId(2768),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2768),
+                        ty: DeclarationId(2769),
                     },
                 ],
             },
@@ -71147,7 +71183,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2770),
+            id: DeclarationId(2771),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71166,7 +71202,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2771),
+            id: DeclarationId(2772),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71180,17 +71216,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2772),
+            id: DeclarationId(2773),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2770),
+                        ty: DeclarationId(2771),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2771),
+                        ty: DeclarationId(2772),
                     },
                 ],
             },
@@ -71205,7 +71241,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2773),
+            id: DeclarationId(2774),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71224,7 +71260,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2774),
+            id: DeclarationId(2775),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71238,17 +71274,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2775),
+            id: DeclarationId(2776),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2773),
+                        ty: DeclarationId(2774),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2774),
+                        ty: DeclarationId(2775),
                     },
                 ],
             },
@@ -71263,7 +71299,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2776),
+            id: DeclarationId(2777),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71282,7 +71318,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2777),
+            id: DeclarationId(2778),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71296,17 +71332,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2778),
+            id: DeclarationId(2779),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2776),
+                        ty: DeclarationId(2777),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2777),
+                        ty: DeclarationId(2778),
                     },
                 ],
             },
@@ -71321,12 +71357,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2779),
+            id: DeclarationId(2780),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2386),
+                    ty: DeclarationId(2387),
                 }],
             },
             type_params: vec![],
@@ -71340,7 +71376,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2780),
+            id: DeclarationId(2781),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71354,17 +71390,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2781),
+            id: DeclarationId(2782),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2779),
+                        ty: DeclarationId(2780),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2780),
+                        ty: DeclarationId(2781),
                     },
                 ],
             },
@@ -71379,12 +71415,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2782),
+            id: DeclarationId(2783),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2388),
+                    ty: DeclarationId(2389),
                 }],
             },
             type_params: vec![],
@@ -71398,7 +71434,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2783),
+            id: DeclarationId(2784),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71412,17 +71448,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2784),
+            id: DeclarationId(2785),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2782),
+                        ty: DeclarationId(2783),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2783),
+                        ty: DeclarationId(2784),
                     },
                 ],
             },
@@ -71437,7 +71473,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2785),
+            id: DeclarationId(2786),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71456,7 +71492,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2786),
+            id: DeclarationId(2787),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71470,17 +71506,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2787),
+            id: DeclarationId(2788),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2785),
+                        ty: DeclarationId(2786),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2786),
+                        ty: DeclarationId(2787),
                     },
                 ],
             },
@@ -71495,12 +71531,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2788),
+            id: DeclarationId(2789),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1390),
+                    ty: DeclarationId(1391),
                 }],
             },
             type_params: vec![],
@@ -71514,7 +71550,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2789),
+            id: DeclarationId(2790),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71528,17 +71564,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2790),
+            id: DeclarationId(2791),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2788),
+                        ty: DeclarationId(2789),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2789),
+                        ty: DeclarationId(2790),
                     },
                 ],
             },
@@ -71553,7 +71589,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2791),
+            id: DeclarationId(2792),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71572,7 +71608,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2792),
+            id: DeclarationId(2793),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71586,17 +71622,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2793),
+            id: DeclarationId(2794),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2791),
+                        ty: DeclarationId(2792),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2792),
+                        ty: DeclarationId(2793),
                     },
                 ],
             },
@@ -71611,12 +71647,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2794),
+            id: DeclarationId(2795),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1371),
+                    ty: DeclarationId(1372),
                 }],
             },
             type_params: vec![],
@@ -71630,7 +71666,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2795),
+            id: DeclarationId(2796),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71644,17 +71680,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2796),
+            id: DeclarationId(2797),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2794),
+                        ty: DeclarationId(2795),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2795),
+                        ty: DeclarationId(2796),
                     },
                 ],
             },
@@ -71669,12 +71705,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2797),
+            id: DeclarationId(2798),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1370),
+                    ty: DeclarationId(1371),
                 }],
             },
             type_params: vec![],
@@ -71688,7 +71724,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2798),
+            id: DeclarationId(2799),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71702,17 +71738,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2799),
+            id: DeclarationId(2800),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2797),
+                        ty: DeclarationId(2798),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2798),
+                        ty: DeclarationId(2799),
                     },
                 ],
             },
@@ -71727,12 +71763,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2800),
+            id: DeclarationId(2801),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1369),
+                    ty: DeclarationId(1370),
                 }],
             },
             type_params: vec![],
@@ -71746,7 +71782,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2801),
+            id: DeclarationId(2802),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71760,17 +71796,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2802),
+            id: DeclarationId(2803),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2800),
+                        ty: DeclarationId(2801),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2801),
+                        ty: DeclarationId(2802),
                     },
                 ],
             },
@@ -71785,7 +71821,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2803),
+            id: DeclarationId(2804),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71804,7 +71840,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2804),
+            id: DeclarationId(2805),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71818,17 +71854,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2805),
+            id: DeclarationId(2806),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2803),
+                        ty: DeclarationId(2804),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2804),
+                        ty: DeclarationId(2805),
                     },
                 ],
             },
@@ -71843,7 +71879,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2806),
+            id: DeclarationId(2807),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71862,7 +71898,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2807),
+            id: DeclarationId(2808),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71876,17 +71912,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2808),
+            id: DeclarationId(2809),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2806),
+                        ty: DeclarationId(2807),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2807),
+                        ty: DeclarationId(2808),
                     },
                 ],
             },
@@ -71901,7 +71937,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2809),
+            id: DeclarationId(2810),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -71920,7 +71956,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2810),
+            id: DeclarationId(2811),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71934,17 +71970,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2811),
+            id: DeclarationId(2812),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2809),
+                        ty: DeclarationId(2810),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2810),
+                        ty: DeclarationId(2811),
                     },
                 ],
             },
@@ -71959,12 +71995,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2812),
+            id: DeclarationId(2813),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2416),
+                    ty: DeclarationId(2417),
                 }],
             },
             type_params: vec![],
@@ -71978,7 +72014,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2813),
+            id: DeclarationId(2814),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -71992,17 +72028,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2814),
+            id: DeclarationId(2815),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2812),
+                        ty: DeclarationId(2813),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2813),
+                        ty: DeclarationId(2814),
                     },
                 ],
             },
@@ -72017,7 +72053,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2815),
+            id: DeclarationId(2816),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72036,7 +72072,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2816),
+            id: DeclarationId(2817),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72050,17 +72086,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2817),
+            id: DeclarationId(2818),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2815),
+                        ty: DeclarationId(2816),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2816),
+                        ty: DeclarationId(2817),
                     },
                 ],
             },
@@ -72075,7 +72111,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2818),
+            id: DeclarationId(2819),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72094,7 +72130,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2819),
+            id: DeclarationId(2820),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72108,17 +72144,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2820),
+            id: DeclarationId(2821),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2818),
+                        ty: DeclarationId(2819),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2819),
+                        ty: DeclarationId(2820),
                     },
                 ],
             },
@@ -72133,7 +72169,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2821),
+            id: DeclarationId(2822),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72152,7 +72188,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2822),
+            id: DeclarationId(2823),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72166,17 +72202,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2823),
+            id: DeclarationId(2824),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2821),
+                        ty: DeclarationId(2822),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2822),
+                        ty: DeclarationId(2823),
                     },
                 ],
             },
@@ -72191,7 +72227,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2824),
+            id: DeclarationId(2825),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72210,7 +72246,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2825),
+            id: DeclarationId(2826),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72224,17 +72260,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2826),
+            id: DeclarationId(2827),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2824),
+                        ty: DeclarationId(2825),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2825),
+                        ty: DeclarationId(2826),
                     },
                 ],
             },
@@ -72249,7 +72285,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2827),
+            id: DeclarationId(2828),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72268,7 +72304,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2828),
+            id: DeclarationId(2829),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72282,17 +72318,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2829),
+            id: DeclarationId(2830),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2827),
+                        ty: DeclarationId(2828),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2828),
+                        ty: DeclarationId(2829),
                     },
                 ],
             },
@@ -72307,12 +72343,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2830),
+            id: DeclarationId(2831),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2424),
+                    ty: DeclarationId(2425),
                 }],
             },
             type_params: vec![],
@@ -72326,7 +72362,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2831),
+            id: DeclarationId(2832),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72340,17 +72376,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2832),
+            id: DeclarationId(2833),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2830),
+                        ty: DeclarationId(2831),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2831),
+                        ty: DeclarationId(2832),
                     },
                 ],
             },
@@ -72365,12 +72401,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2833),
+            id: DeclarationId(2834),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2426),
+                    ty: DeclarationId(2427),
                 }],
             },
             type_params: vec![],
@@ -72384,7 +72420,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10996),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2834),
+            id: DeclarationId(2835),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72398,17 +72434,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10996),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2835),
+            id: DeclarationId(2836),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2833),
+                        ty: DeclarationId(2834),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2834),
+                        ty: DeclarationId(2835),
                     },
                 ],
             },
@@ -72423,7 +72459,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10996),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2836),
+            id: DeclarationId(2837),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72442,7 +72478,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2837),
+            id: DeclarationId(2838),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72456,17 +72492,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2838),
+            id: DeclarationId(2839),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2836),
+                        ty: DeclarationId(2837),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2837),
+                        ty: DeclarationId(2838),
                     },
                 ],
             },
@@ -72481,7 +72517,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2839),
+            id: DeclarationId(2840),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72500,7 +72536,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2840),
+            id: DeclarationId(2841),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72514,17 +72550,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2841),
+            id: DeclarationId(2842),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2839),
+                        ty: DeclarationId(2840),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2840),
+                        ty: DeclarationId(2841),
                     },
                 ],
             },
@@ -72539,7 +72575,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2842),
+            id: DeclarationId(2843),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72558,7 +72594,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2843),
+            id: DeclarationId(2844),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72572,17 +72608,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2844),
+            id: DeclarationId(2845),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2842),
+                        ty: DeclarationId(2843),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2843),
+                        ty: DeclarationId(2844),
                     },
                 ],
             },
@@ -72597,7 +72633,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2845),
+            id: DeclarationId(2846),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72616,7 +72652,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2846),
+            id: DeclarationId(2847),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72630,17 +72666,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2847),
+            id: DeclarationId(2848),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2845),
+                        ty: DeclarationId(2846),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2846),
+                        ty: DeclarationId(2847),
                     },
                 ],
             },
@@ -72655,7 +72691,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2848),
+            id: DeclarationId(2849),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72674,7 +72710,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11530, 11534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2849),
+            id: DeclarationId(2850),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72688,17 +72724,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11530, 11534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2850),
+            id: DeclarationId(2851),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2848),
+                        ty: DeclarationId(2849),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2849),
+                        ty: DeclarationId(2850),
                     },
                 ],
             },
@@ -72713,7 +72749,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11530, 11534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2851),
+            id: DeclarationId(2852),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72732,7 +72768,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11584, 11591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2852),
+            id: DeclarationId(2853),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72746,17 +72782,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11584, 11591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2853),
+            id: DeclarationId(2854),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2851),
+                        ty: DeclarationId(2852),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2852),
+                        ty: DeclarationId(2853),
                     },
                 ],
             },
@@ -72771,7 +72807,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11584, 11591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2854),
+            id: DeclarationId(2855),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72790,7 +72826,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2855),
+            id: DeclarationId(2856),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72804,17 +72840,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2856),
+            id: DeclarationId(2857),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2854),
+                        ty: DeclarationId(2855),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2855),
+                        ty: DeclarationId(2856),
                     },
                 ],
             },
@@ -72829,7 +72865,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2857),
+            id: DeclarationId(2858),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72848,7 +72884,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11610, 11614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2858),
+            id: DeclarationId(2859),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72862,17 +72898,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11610, 11614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2859),
+            id: DeclarationId(2860),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2857),
+                        ty: DeclarationId(2858),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2858),
+                        ty: DeclarationId(2859),
                     },
                 ],
             },
@@ -72887,7 +72923,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11610, 11614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2860),
+            id: DeclarationId(2861),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72906,7 +72942,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11663, 11670),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2861),
+            id: DeclarationId(2862),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72920,17 +72956,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11663, 11670),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2862),
+            id: DeclarationId(2863),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2860),
+                        ty: DeclarationId(2861),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2861),
+                        ty: DeclarationId(2862),
                     },
                 ],
             },
@@ -72945,7 +72981,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11663, 11670),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2863),
+            id: DeclarationId(2864),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -72964,7 +73000,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11678, 11682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2864),
+            id: DeclarationId(2865),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -72978,17 +73014,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11678, 11682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2865),
+            id: DeclarationId(2866),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2863),
+                        ty: DeclarationId(2864),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2864),
+                        ty: DeclarationId(2865),
                     },
                 ],
             },
@@ -73003,7 +73039,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11678, 11682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2866),
+            id: DeclarationId(2867),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -73022,7 +73058,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11689, 11693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2867),
+            id: DeclarationId(2868),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73036,17 +73072,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11689, 11693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2868),
+            id: DeclarationId(2869),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2866),
+                        ty: DeclarationId(2867),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2867),
+                        ty: DeclarationId(2868),
                     },
                 ],
             },
@@ -73061,7 +73097,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11689, 11693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2869),
+            id: DeclarationId(2870),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -73080,7 +73116,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12673, 12677),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2870),
+            id: DeclarationId(2871),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73094,17 +73130,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12673, 12677),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2871),
+            id: DeclarationId(2872),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2869),
+                        ty: DeclarationId(2870),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2870),
+                        ty: DeclarationId(2871),
                     },
                 ],
             },
@@ -73119,7 +73155,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12673, 12677),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2872),
+            id: DeclarationId(2873),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -73138,7 +73174,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12756, 12763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2873),
+            id: DeclarationId(2874),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73152,17 +73188,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12756, 12763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2874),
+            id: DeclarationId(2875),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2872),
+                        ty: DeclarationId(2873),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2873),
+                        ty: DeclarationId(2874),
                     },
                 ],
             },
@@ -73177,7 +73213,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12756, 12763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2875),
+            id: DeclarationId(2876),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -73196,7 +73232,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13403, 13407),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2876),
+            id: DeclarationId(2877),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -73210,17 +73246,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13403, 13407),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2877),
+            id: DeclarationId(2878),
             name: None,
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Some".to_string(),
-                        ty: DeclarationId(2875),
+                        ty: DeclarationId(2876),
                     },
                     Field {
                         label: "None".to_string(),
-                        ty: DeclarationId(2876),
+                        ty: DeclarationId(2877),
                     },
                 ],
             },
@@ -74757,7 +74793,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(189),
             Port {
                 id: PortId(189),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1627))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1628))),
                 produced_by: Some(NodeId(184)),
             },
         );
@@ -74781,7 +74817,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(192),
             Port {
                 id: PortId(192),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1628))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1629))),
                 produced_by: None,
             },
         );
@@ -74789,7 +74825,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(193),
             Port {
                 id: PortId(193),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1629))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1630))),
                 produced_by: Some(NodeId(186)),
             },
         );
@@ -75077,7 +75113,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(229),
             Port {
                 id: PortId(229),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1630))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1631))),
                 produced_by: None,
             },
         );
@@ -76629,7 +76665,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(423),
             Port {
                 id: PortId(423),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1631))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1632))),
                 produced_by: None,
             },
         );
@@ -76653,7 +76689,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(426),
             Port {
                 id: PortId(426),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1628))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1629))),
                 produced_by: Some(NodeId(363)),
             },
         );
@@ -76669,7 +76705,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(428),
             Port {
                 id: PortId(428),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1632))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1633))),
                 produced_by: Some(NodeId(365)),
             },
         );
@@ -76677,7 +76713,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(429),
             Port {
                 id: PortId(429),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1633))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1634))),
                 produced_by: None,
             },
         );
@@ -76781,7 +76817,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(442),
             Port {
                 id: PortId(442),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1634))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1635))),
                 produced_by: Some(NodeId(378)),
             },
         );
@@ -76789,7 +76825,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(443),
             Port {
                 id: PortId(443),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1635))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1636))),
                 produced_by: None,
             },
         );
@@ -76837,7 +76873,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(449),
             Port {
                 id: PortId(449),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1636))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1637))),
                 produced_by: Some(NodeId(385)),
             },
         );
@@ -76845,7 +76881,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(450),
             Port {
                 id: PortId(450),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1637))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1638))),
                 produced_by: None,
             },
         );
@@ -76925,7 +76961,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(460),
             Port {
                 id: PortId(460),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1638))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1639))),
                 produced_by: None,
             },
         );
@@ -77029,7 +77065,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(473),
             Port {
                 id: PortId(473),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1639))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1640))),
                 produced_by: Some(NodeId(407)),
             },
         );
@@ -77309,7 +77345,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(508),
             Port {
                 id: PortId(508),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1640))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1641))),
                 produced_by: None,
             },
         );
@@ -77421,7 +77457,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(522),
             Port {
                 id: PortId(522),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1641))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1642))),
                 produced_by: None,
             },
         );
@@ -77533,7 +77569,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(536),
             Port {
                 id: PortId(536),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1642))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1643))),
                 produced_by: None,
             },
         );
@@ -78149,7 +78185,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(613),
             Port {
                 id: PortId(613),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1643))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1644))),
                 produced_by: None,
             },
         );
@@ -78261,7 +78297,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(627),
             Port {
                 id: PortId(627),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1644))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1645))),
                 produced_by: Some(NodeId(516)),
             },
         );
@@ -78269,7 +78305,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(628),
             Port {
                 id: PortId(628),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1645))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1646))),
                 produced_by: None,
             },
         );
@@ -78325,7 +78361,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(635),
             Port {
                 id: PortId(635),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1646))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1647))),
                 produced_by: Some(NodeId(523)),
             },
         );
@@ -78333,7 +78369,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(636),
             Port {
                 id: PortId(636),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1647))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1648))),
                 produced_by: None,
             },
         );
@@ -78349,7 +78385,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(638),
             Port {
                 id: PortId(638),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1648))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1649))),
                 produced_by: Some(NodeId(526)),
             },
         );
@@ -78613,7 +78649,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(671),
             Port {
                 id: PortId(671),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1981))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1982))),
                 produced_by: None,
             },
         );
@@ -79045,7 +79081,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(725),
             Port {
                 id: PortId(725),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2053))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2054))),
                 produced_by: Some(NodeId(596)),
             },
         );
@@ -79069,7 +79105,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(728),
             Port {
                 id: PortId(728),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2054))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2055))),
                 produced_by: Some(NodeId(598)),
             },
         );
@@ -79077,7 +79113,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(729),
             Port {
                 id: PortId(729),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2055))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2056))),
                 produced_by: Some(NodeId(600)),
             },
         );
@@ -79085,7 +79121,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(730),
             Port {
                 id: PortId(730),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2056))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2057))),
                 produced_by: Some(NodeId(602)),
             },
         );
@@ -79093,7 +79129,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(731),
             Port {
                 id: PortId(731),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2057))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2058))),
                 produced_by: Some(NodeId(604)),
             },
         );
@@ -79101,7 +79137,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(732),
             Port {
                 id: PortId(732),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2058))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2059))),
                 produced_by: Some(NodeId(606)),
             },
         );
@@ -79109,7 +79145,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(733),
             Port {
                 id: PortId(733),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2059))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2060))),
                 produced_by: Some(NodeId(608)),
             },
         );
@@ -79117,7 +79153,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(734),
             Port {
                 id: PortId(734),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2061))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2062))),
                 produced_by: Some(NodeId(610)),
             },
         );
@@ -79149,7 +79185,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(738),
             Port {
                 id: PortId(738),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2063))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2064))),
                 produced_by: Some(NodeId(614)),
             },
         );
@@ -79173,7 +79209,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(741),
             Port {
                 id: PortId(741),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2064))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2065))),
                 produced_by: Some(NodeId(617)),
             },
         );
@@ -79205,7 +79241,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(745),
             Port {
                 id: PortId(745),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2065))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2066))),
                 produced_by: Some(NodeId(621)),
             },
         );
@@ -79253,7 +79289,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(751),
             Port {
                 id: PortId(751),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2066))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2067))),
                 produced_by: Some(NodeId(626)),
             },
         );
@@ -79325,7 +79361,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(760),
             Port {
                 id: PortId(760),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2067))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2068))),
                 produced_by: Some(NodeId(633)),
             },
         );
@@ -79405,7 +79441,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(770),
             Port {
                 id: PortId(770),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2068))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2069))),
                 produced_by: Some(NodeId(640)),
             },
         );
@@ -79469,7 +79505,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(778),
             Port {
                 id: PortId(778),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2069))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2070))),
                 produced_by: Some(NodeId(645)),
             },
         );
@@ -79485,7 +79521,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(780),
             Port {
                 id: PortId(780),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2070))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2071))),
                 produced_by: None,
             },
         );
@@ -79573,7 +79609,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(791),
             Port {
                 id: PortId(791),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2071))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2072))),
                 produced_by: Some(NodeId(655)),
             },
         );
@@ -79645,7 +79681,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(800),
             Port {
                 id: PortId(800),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2072))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2073))),
                 produced_by: Some(NodeId(663)),
             },
         );
@@ -80117,7 +80153,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(859),
             Port {
                 id: PortId(859),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2129))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2130))),
                 produced_by: Some(NodeId(715)),
             },
         );
@@ -80325,7 +80361,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(885),
             Port {
                 id: PortId(885),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1617))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1618))),
                 produced_by: Some(NodeId(735)),
             },
         );
@@ -80893,7 +80929,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(956),
             Port {
                 id: PortId(956),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2130))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2131))),
                 produced_by: Some(NodeId(794)),
             },
         );
@@ -81085,7 +81121,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(980),
             Port {
                 id: PortId(980),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2306))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2307))),
                 produced_by: Some(NodeId(814)),
             },
         );
@@ -81473,140 +81509,140 @@ fn bootstrapped_fixture_without_parse_surface_dag_optional_match_disjs(
 ) -> HashMap<DeclarationId, DeclarationId> {
     {
         let mut map = HashMap::new();
-        map.insert(DeclarationId(389), DeclarationId(2478));
-        map.insert(DeclarationId(391), DeclarationId(2481));
-        map.insert(DeclarationId(423), DeclarationId(2484));
-        map.insert(DeclarationId(426), DeclarationId(2487));
-        map.insert(DeclarationId(471), DeclarationId(2490));
-        map.insert(DeclarationId(472), DeclarationId(2493));
-        map.insert(DeclarationId(473), DeclarationId(2496));
-        map.insert(DeclarationId(513), DeclarationId(2499));
-        map.insert(DeclarationId(515), DeclarationId(2502));
-        map.insert(DeclarationId(516), DeclarationId(2505));
-        map.insert(DeclarationId(539), DeclarationId(2508));
-        map.insert(DeclarationId(582), DeclarationId(2511));
-        map.insert(DeclarationId(602), DeclarationId(2514));
-        map.insert(DeclarationId(603), DeclarationId(2517));
-        map.insert(DeclarationId(605), DeclarationId(2520));
-        map.insert(DeclarationId(608), DeclarationId(2523));
-        map.insert(DeclarationId(613), DeclarationId(2526));
-        map.insert(DeclarationId(614), DeclarationId(2529));
-        map.insert(DeclarationId(618), DeclarationId(2532));
-        map.insert(DeclarationId(619), DeclarationId(2535));
-        map.insert(DeclarationId(620), DeclarationId(2538));
-        map.insert(DeclarationId(625), DeclarationId(2541));
-        map.insert(DeclarationId(1438), DeclarationId(2544));
-        map.insert(DeclarationId(1442), DeclarationId(2547));
-        map.insert(DeclarationId(1445), DeclarationId(2550));
-        map.insert(DeclarationId(1447), DeclarationId(2553));
-        map.insert(DeclarationId(1448), DeclarationId(2556));
-        map.insert(DeclarationId(1449), DeclarationId(2559));
-        map.insert(DeclarationId(1503), DeclarationId(2562));
-        map.insert(DeclarationId(1504), DeclarationId(2565));
-        map.insert(DeclarationId(1505), DeclarationId(2568));
-        map.insert(DeclarationId(1506), DeclarationId(2571));
-        map.insert(DeclarationId(1507), DeclarationId(2574));
-        map.insert(DeclarationId(1508), DeclarationId(2577));
-        map.insert(DeclarationId(1514), DeclarationId(2580));
-        map.insert(DeclarationId(1569), DeclarationId(2583));
-        map.insert(DeclarationId(1572), DeclarationId(2586));
-        map.insert(DeclarationId(1573), DeclarationId(2589));
-        map.insert(DeclarationId(1574), DeclarationId(2592));
-        map.insert(DeclarationId(1575), DeclarationId(2595));
-        map.insert(DeclarationId(1598), DeclarationId(2598));
-        map.insert(DeclarationId(1603), DeclarationId(2601));
-        map.insert(DeclarationId(1607), DeclarationId(2604));
-        map.insert(DeclarationId(1610), DeclarationId(2607));
-        map.insert(DeclarationId(1611), DeclarationId(2610));
-        map.insert(DeclarationId(1656), DeclarationId(2613));
-        map.insert(DeclarationId(1657), DeclarationId(2616));
-        map.insert(DeclarationId(1658), DeclarationId(2619));
-        map.insert(DeclarationId(1659), DeclarationId(2622));
-        map.insert(DeclarationId(1709), DeclarationId(2625));
-        map.insert(DeclarationId(1710), DeclarationId(2628));
-        map.insert(DeclarationId(1729), DeclarationId(2631));
-        map.insert(DeclarationId(1730), DeclarationId(2634));
-        map.insert(DeclarationId(1734), DeclarationId(2637));
-        map.insert(DeclarationId(1735), DeclarationId(2640));
-        map.insert(DeclarationId(1746), DeclarationId(2643));
-        map.insert(DeclarationId(1747), DeclarationId(2646));
-        map.insert(DeclarationId(1749), DeclarationId(2649));
-        map.insert(DeclarationId(1750), DeclarationId(2652));
-        map.insert(DeclarationId(1752), DeclarationId(2655));
-        map.insert(DeclarationId(1753), DeclarationId(2658));
-        map.insert(DeclarationId(1755), DeclarationId(2661));
-        map.insert(DeclarationId(1757), DeclarationId(2664));
-        map.insert(DeclarationId(1760), DeclarationId(2667));
-        map.insert(DeclarationId(1764), DeclarationId(2670));
-        map.insert(DeclarationId(1766), DeclarationId(2673));
-        map.insert(DeclarationId(1768), DeclarationId(2676));
-        map.insert(DeclarationId(1778), DeclarationId(2679));
-        map.insert(DeclarationId(1779), DeclarationId(2682));
-        map.insert(DeclarationId(1780), DeclarationId(2685));
-        map.insert(DeclarationId(1783), DeclarationId(2688));
-        map.insert(DeclarationId(1784), DeclarationId(2691));
-        map.insert(DeclarationId(1819), DeclarationId(2694));
-        map.insert(DeclarationId(1820), DeclarationId(2697));
-        map.insert(DeclarationId(1821), DeclarationId(2700));
-        map.insert(DeclarationId(1822), DeclarationId(2703));
-        map.insert(DeclarationId(1823), DeclarationId(2706));
-        map.insert(DeclarationId(1824), DeclarationId(2709));
-        map.insert(DeclarationId(1847), DeclarationId(2712));
-        map.insert(DeclarationId(1977), DeclarationId(2715));
-        map.insert(DeclarationId(1978), DeclarationId(2718));
-        map.insert(DeclarationId(1984), DeclarationId(2721));
-        map.insert(DeclarationId(1985), DeclarationId(2724));
-        map.insert(DeclarationId(1986), DeclarationId(2727));
-        map.insert(DeclarationId(1987), DeclarationId(2730));
-        map.insert(DeclarationId(1988), DeclarationId(2733));
-        map.insert(DeclarationId(1989), DeclarationId(2736));
-        map.insert(DeclarationId(2094), DeclarationId(2739));
-        map.insert(DeclarationId(2095), DeclarationId(2742));
-        map.insert(DeclarationId(2096), DeclarationId(2745));
-        map.insert(DeclarationId(2099), DeclarationId(2748));
-        map.insert(DeclarationId(2100), DeclarationId(2751));
-        map.insert(DeclarationId(2310), DeclarationId(2754));
-        map.insert(DeclarationId(2339), DeclarationId(2757));
-        map.insert(DeclarationId(2345), DeclarationId(2760));
-        map.insert(DeclarationId(2350), DeclarationId(2763));
-        map.insert(DeclarationId(2353), DeclarationId(2766));
-        map.insert(DeclarationId(2354), DeclarationId(2769));
-        map.insert(DeclarationId(2374), DeclarationId(2772));
-        map.insert(DeclarationId(2375), DeclarationId(2775));
-        map.insert(DeclarationId(2383), DeclarationId(2778));
-        map.insert(DeclarationId(2387), DeclarationId(2781));
-        map.insert(DeclarationId(2389), DeclarationId(2784));
-        map.insert(DeclarationId(2390), DeclarationId(2787));
-        map.insert(DeclarationId(2391), DeclarationId(2790));
-        map.insert(DeclarationId(2392), DeclarationId(2793));
-        map.insert(DeclarationId(2393), DeclarationId(2796));
-        map.insert(DeclarationId(2399), DeclarationId(2799));
-        map.insert(DeclarationId(2401), DeclarationId(2802));
-        map.insert(DeclarationId(2402), DeclarationId(2805));
-        map.insert(DeclarationId(2414), DeclarationId(2808));
-        map.insert(DeclarationId(2415), DeclarationId(2811));
-        map.insert(DeclarationId(2417), DeclarationId(2814));
-        map.insert(DeclarationId(2418), DeclarationId(2817));
-        map.insert(DeclarationId(2419), DeclarationId(2820));
-        map.insert(DeclarationId(2420), DeclarationId(2823));
-        map.insert(DeclarationId(2422), DeclarationId(2826));
-        map.insert(DeclarationId(2423), DeclarationId(2829));
-        map.insert(DeclarationId(2425), DeclarationId(2832));
-        map.insert(DeclarationId(2427), DeclarationId(2835));
-        map.insert(DeclarationId(2428), DeclarationId(2838));
-        map.insert(DeclarationId(2429), DeclarationId(2841));
-        map.insert(DeclarationId(2436), DeclarationId(2844));
-        map.insert(DeclarationId(2437), DeclarationId(2847));
-        map.insert(DeclarationId(2438), DeclarationId(2850));
-        map.insert(DeclarationId(2440), DeclarationId(2853));
-        map.insert(DeclarationId(2441), DeclarationId(2856));
-        map.insert(DeclarationId(2442), DeclarationId(2859));
-        map.insert(DeclarationId(2444), DeclarationId(2862));
-        map.insert(DeclarationId(2445), DeclarationId(2865));
-        map.insert(DeclarationId(2446), DeclarationId(2868));
-        map.insert(DeclarationId(2453), DeclarationId(2871));
-        map.insert(DeclarationId(2455), DeclarationId(2874));
-        map.insert(DeclarationId(2466), DeclarationId(2877));
+        map.insert(DeclarationId(389), DeclarationId(2479));
+        map.insert(DeclarationId(391), DeclarationId(2482));
+        map.insert(DeclarationId(423), DeclarationId(2485));
+        map.insert(DeclarationId(426), DeclarationId(2488));
+        map.insert(DeclarationId(471), DeclarationId(2491));
+        map.insert(DeclarationId(472), DeclarationId(2494));
+        map.insert(DeclarationId(473), DeclarationId(2497));
+        map.insert(DeclarationId(513), DeclarationId(2500));
+        map.insert(DeclarationId(515), DeclarationId(2503));
+        map.insert(DeclarationId(516), DeclarationId(2506));
+        map.insert(DeclarationId(539), DeclarationId(2509));
+        map.insert(DeclarationId(582), DeclarationId(2512));
+        map.insert(DeclarationId(602), DeclarationId(2515));
+        map.insert(DeclarationId(603), DeclarationId(2518));
+        map.insert(DeclarationId(605), DeclarationId(2521));
+        map.insert(DeclarationId(608), DeclarationId(2524));
+        map.insert(DeclarationId(613), DeclarationId(2527));
+        map.insert(DeclarationId(614), DeclarationId(2530));
+        map.insert(DeclarationId(618), DeclarationId(2533));
+        map.insert(DeclarationId(619), DeclarationId(2536));
+        map.insert(DeclarationId(620), DeclarationId(2539));
+        map.insert(DeclarationId(625), DeclarationId(2542));
+        map.insert(DeclarationId(1439), DeclarationId(2545));
+        map.insert(DeclarationId(1443), DeclarationId(2548));
+        map.insert(DeclarationId(1446), DeclarationId(2551));
+        map.insert(DeclarationId(1448), DeclarationId(2554));
+        map.insert(DeclarationId(1449), DeclarationId(2557));
+        map.insert(DeclarationId(1450), DeclarationId(2560));
+        map.insert(DeclarationId(1504), DeclarationId(2563));
+        map.insert(DeclarationId(1505), DeclarationId(2566));
+        map.insert(DeclarationId(1506), DeclarationId(2569));
+        map.insert(DeclarationId(1507), DeclarationId(2572));
+        map.insert(DeclarationId(1508), DeclarationId(2575));
+        map.insert(DeclarationId(1509), DeclarationId(2578));
+        map.insert(DeclarationId(1515), DeclarationId(2581));
+        map.insert(DeclarationId(1570), DeclarationId(2584));
+        map.insert(DeclarationId(1573), DeclarationId(2587));
+        map.insert(DeclarationId(1574), DeclarationId(2590));
+        map.insert(DeclarationId(1575), DeclarationId(2593));
+        map.insert(DeclarationId(1576), DeclarationId(2596));
+        map.insert(DeclarationId(1599), DeclarationId(2599));
+        map.insert(DeclarationId(1604), DeclarationId(2602));
+        map.insert(DeclarationId(1608), DeclarationId(2605));
+        map.insert(DeclarationId(1611), DeclarationId(2608));
+        map.insert(DeclarationId(1612), DeclarationId(2611));
+        map.insert(DeclarationId(1657), DeclarationId(2614));
+        map.insert(DeclarationId(1658), DeclarationId(2617));
+        map.insert(DeclarationId(1659), DeclarationId(2620));
+        map.insert(DeclarationId(1660), DeclarationId(2623));
+        map.insert(DeclarationId(1710), DeclarationId(2626));
+        map.insert(DeclarationId(1711), DeclarationId(2629));
+        map.insert(DeclarationId(1730), DeclarationId(2632));
+        map.insert(DeclarationId(1731), DeclarationId(2635));
+        map.insert(DeclarationId(1735), DeclarationId(2638));
+        map.insert(DeclarationId(1736), DeclarationId(2641));
+        map.insert(DeclarationId(1747), DeclarationId(2644));
+        map.insert(DeclarationId(1748), DeclarationId(2647));
+        map.insert(DeclarationId(1750), DeclarationId(2650));
+        map.insert(DeclarationId(1751), DeclarationId(2653));
+        map.insert(DeclarationId(1753), DeclarationId(2656));
+        map.insert(DeclarationId(1754), DeclarationId(2659));
+        map.insert(DeclarationId(1756), DeclarationId(2662));
+        map.insert(DeclarationId(1758), DeclarationId(2665));
+        map.insert(DeclarationId(1761), DeclarationId(2668));
+        map.insert(DeclarationId(1765), DeclarationId(2671));
+        map.insert(DeclarationId(1767), DeclarationId(2674));
+        map.insert(DeclarationId(1769), DeclarationId(2677));
+        map.insert(DeclarationId(1779), DeclarationId(2680));
+        map.insert(DeclarationId(1780), DeclarationId(2683));
+        map.insert(DeclarationId(1781), DeclarationId(2686));
+        map.insert(DeclarationId(1784), DeclarationId(2689));
+        map.insert(DeclarationId(1785), DeclarationId(2692));
+        map.insert(DeclarationId(1820), DeclarationId(2695));
+        map.insert(DeclarationId(1821), DeclarationId(2698));
+        map.insert(DeclarationId(1822), DeclarationId(2701));
+        map.insert(DeclarationId(1823), DeclarationId(2704));
+        map.insert(DeclarationId(1824), DeclarationId(2707));
+        map.insert(DeclarationId(1825), DeclarationId(2710));
+        map.insert(DeclarationId(1848), DeclarationId(2713));
+        map.insert(DeclarationId(1978), DeclarationId(2716));
+        map.insert(DeclarationId(1979), DeclarationId(2719));
+        map.insert(DeclarationId(1985), DeclarationId(2722));
+        map.insert(DeclarationId(1986), DeclarationId(2725));
+        map.insert(DeclarationId(1987), DeclarationId(2728));
+        map.insert(DeclarationId(1988), DeclarationId(2731));
+        map.insert(DeclarationId(1989), DeclarationId(2734));
+        map.insert(DeclarationId(1990), DeclarationId(2737));
+        map.insert(DeclarationId(2095), DeclarationId(2740));
+        map.insert(DeclarationId(2096), DeclarationId(2743));
+        map.insert(DeclarationId(2097), DeclarationId(2746));
+        map.insert(DeclarationId(2100), DeclarationId(2749));
+        map.insert(DeclarationId(2101), DeclarationId(2752));
+        map.insert(DeclarationId(2311), DeclarationId(2755));
+        map.insert(DeclarationId(2340), DeclarationId(2758));
+        map.insert(DeclarationId(2346), DeclarationId(2761));
+        map.insert(DeclarationId(2351), DeclarationId(2764));
+        map.insert(DeclarationId(2354), DeclarationId(2767));
+        map.insert(DeclarationId(2355), DeclarationId(2770));
+        map.insert(DeclarationId(2375), DeclarationId(2773));
+        map.insert(DeclarationId(2376), DeclarationId(2776));
+        map.insert(DeclarationId(2384), DeclarationId(2779));
+        map.insert(DeclarationId(2388), DeclarationId(2782));
+        map.insert(DeclarationId(2390), DeclarationId(2785));
+        map.insert(DeclarationId(2391), DeclarationId(2788));
+        map.insert(DeclarationId(2392), DeclarationId(2791));
+        map.insert(DeclarationId(2393), DeclarationId(2794));
+        map.insert(DeclarationId(2394), DeclarationId(2797));
+        map.insert(DeclarationId(2400), DeclarationId(2800));
+        map.insert(DeclarationId(2402), DeclarationId(2803));
+        map.insert(DeclarationId(2403), DeclarationId(2806));
+        map.insert(DeclarationId(2415), DeclarationId(2809));
+        map.insert(DeclarationId(2416), DeclarationId(2812));
+        map.insert(DeclarationId(2418), DeclarationId(2815));
+        map.insert(DeclarationId(2419), DeclarationId(2818));
+        map.insert(DeclarationId(2420), DeclarationId(2821));
+        map.insert(DeclarationId(2421), DeclarationId(2824));
+        map.insert(DeclarationId(2423), DeclarationId(2827));
+        map.insert(DeclarationId(2424), DeclarationId(2830));
+        map.insert(DeclarationId(2426), DeclarationId(2833));
+        map.insert(DeclarationId(2428), DeclarationId(2836));
+        map.insert(DeclarationId(2429), DeclarationId(2839));
+        map.insert(DeclarationId(2430), DeclarationId(2842));
+        map.insert(DeclarationId(2437), DeclarationId(2845));
+        map.insert(DeclarationId(2438), DeclarationId(2848));
+        map.insert(DeclarationId(2439), DeclarationId(2851));
+        map.insert(DeclarationId(2441), DeclarationId(2854));
+        map.insert(DeclarationId(2442), DeclarationId(2857));
+        map.insert(DeclarationId(2443), DeclarationId(2860));
+        map.insert(DeclarationId(2445), DeclarationId(2863));
+        map.insert(DeclarationId(2446), DeclarationId(2866));
+        map.insert(DeclarationId(2447), DeclarationId(2869));
+        map.insert(DeclarationId(2454), DeclarationId(2872));
+        map.insert(DeclarationId(2456), DeclarationId(2875));
+        map.insert(DeclarationId(2467), DeclarationId(2878));
         map
     }
 }